s390: add proper __ro_after_init support

On s390 __ro_after_init is currently mapped to __read_mostly which
means that data marked as __ro_after_init will not be protected.

Reason for this is that the common code __ro_after_init implementation
is x86 centric: the ro_after_init data section was added to rodata,
since x86 enables write protection to kernel text and rodata very
late. On s390 we have write protection for these sections enabled with
the initial page tables. So adding the ro_after_init data section to
rodata does not work on s390.

In order to make __ro_after_init work properly on s390 move the
ro_after_init data, right behind rodata. Unlike the rodata section it
will be marked read-only later after all init calls happened.

This s390 specific implementation adds new __start_ro_after_init and
__end_ro_after_init labels. Everything in between will be marked
read-only after the init calls happened. In addition to the
__ro_after_init data move also the exception table there, since from a
practical point of view it fits the __ro_after_init requirements.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index de2cdf4fbb9a..f56a39bd8ba6 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -111,9 +111,10 @@ void __init paging_init(void)
 
 void mark_rodata_ro(void)
 {
-        /* Text and rodata are already protected. Nothing to do here. */
-        pr_info("Write protecting the kernel read-only data: %luk\n",
-                ((unsigned long)&_eshared - (unsigned long)&_stext) >> 10);
+        unsigned long size = __end_ro_after_init - __start_ro_after_init;
+
+        set_memory_ro((unsigned long)__start_ro_after_init, size >> PAGE_SHIFT);
+        pr_info("Write protected read-only-after-init data: %luk\n", size >> 10);
 }
 
 void __init mem_init(void)
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index a1e7c0b207e6..1848292766ef 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -373,14 +373,13 @@ out:
  */
 void __init vmem_map_init(void)
 {
-        unsigned long ro_start, ro_end;
+        unsigned long size = _eshared - _stext;
         struct memblock_region *reg;
 
         for_each_memblock(memory, reg)
                 vmem_add_mem(reg->base, reg->size);
-        ro_start = PFN_ALIGN((unsigned long)&_stext);
-        ro_end = (unsigned long)&_eshared & PAGE_MASK;
-        set_memory_ro(ro_start, (ro_end - ro_start) >> PAGE_SHIFT);
+        set_memory_ro((unsigned long)_stext, size >> PAGE_SHIFT);
+        pr_info("Write protected kernel read-only data: %luk\n", size >> 10);
 }
 
 /*