s390/mm: use set_memory_*() helpers instead of open coding

Given that set_memory_rox() and set_memory_rwnx() exist, it is possible
to get rid of all open coded __set_memory() usages and replace them with
proper helper calls everywhere.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 7b41ceecbb253d730115e4e0de25625f46cafa92..d4b863ed0aa75dd3abf58047b7dbfe17b92633ed 100644 (file)
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -41,7 +41,7 @@ void *alloc_insn_page(void)
        page = module_alloc(PAGE_SIZE);
        if (!page)
                return NULL;
-       __set_memory((unsigned long) page, 1, SET_MEMORY_RO | SET_MEMORY_X);
+       set_memory_rox((unsigned long)page, 1);
        return page;
 }
 

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 144447d5cb4cc41d074a89aba1d55a0aaa7e1890..8d94e29adcdbcbc776d781be7c9bc57321b4fed6 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -176,9 +176,8 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-       __set_memory((unsigned long)_sinittext,
-                    (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT,
-                    SET_MEMORY_RW | SET_MEMORY_NX);
+       set_memory_rwnx((unsigned long)_sinittext,
+                       (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT);
        free_initmem_default(POISON_FREE_INITMEM);
 }
 

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 242f95aa9801cf8329ba050bf42bed9c2d371d07..5b22c6e24528aa2d7a359d9a29182088738975c1 100644 (file)
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -732,30 +732,24 @@ void __init vmem_map_init(void)
             memblock_region_cmp, memblock_region_swap);
        __for_each_mem_range(i, &memblock.memory, &memory_rwx,
                             NUMA_NO_NODE, MEMBLOCK_NONE, &base, &end, NULL) {
-               __set_memory((unsigned long)__va(base),
-                            (end - base) >> PAGE_SHIFT,
-                            SET_MEMORY_RW | SET_MEMORY_NX);
+               set_memory_rwnx((unsigned long)__va(base),
+                               (end - base) >> PAGE_SHIFT);
        }
 
 #ifdef CONFIG_KASAN
-       for_each_mem_range(i, &base, &end)
-               __set_memory(__sha(base),
-                            (__sha(end) - __sha(base)) >> PAGE_SHIFT,
-                            SET_MEMORY_RW | SET_MEMORY_NX);
+       for_each_mem_range(i, &base, &end) {
+               set_memory_rwnx(__sha(base),
+                               (__sha(end) - __sha(base)) >> PAGE_SHIFT);
+       }
 #endif
-
-       __set_memory((unsigned long)_stext,
-                    (unsigned long)(_etext - _stext) >> PAGE_SHIFT,
-                    SET_MEMORY_RO | SET_MEMORY_X);
-       __set_memory((unsigned long)_etext,
-                    (unsigned long)(__end_rodata - _etext) >> PAGE_SHIFT,
-                    SET_MEMORY_RO);
-       __set_memory((unsigned long)_sinittext,
-                    (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT,
-                    SET_MEMORY_RO | SET_MEMORY_X);
-       __set_memory(__stext_amode31,
-                    (__etext_amode31 - __stext_amode31) >> PAGE_SHIFT,
-                    SET_MEMORY_RO | SET_MEMORY_X);
+       set_memory_rox((unsigned long)_stext,
+                      (unsigned long)(_etext - _stext) >> PAGE_SHIFT);
+       set_memory_ro((unsigned long)_etext,
+                     (unsigned long)(__end_rodata - _etext) >> PAGE_SHIFT);
+       set_memory_rox((unsigned long)_sinittext,
+                      (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT);
+       set_memory_rox(__stext_amode31,
+                      (__etext_amode31 - __stext_amode31) >> PAGE_SHIFT);
 
        /* lowcore must be executable for LPSWE */
        if (static_key_enabled(&cpu_has_bear))