powerpc: move __end_rodata to cover arch read-only sections

powerpc has a number of read-only sections and tables that are put after
RO_DATA(). Move the __end_rodata symbol to cover these as well.

Setting memory to read-only at boot is done using __init_begin, change
that to use __end_rodata.

This makes is_kernel_rodata() exactly cover the read-only region, as
well as other things using __end_rodata (e.g., kernel/dma/debug.c).
Boot dmesg also prints the rodata size more accurately.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220916040755.2398112-2-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 29d891329856be11152e961b9db4c0ce4856a9f7..5fe33a65902930c304dd2e2cc1d95f1e9ce28bf7 100644 (file)
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -219,6 +219,7 @@ SECTIONS
         */
        . = ALIGN(STRICT_ALIGN_SIZE);
        __srwx_boundary = .;
+       __end_rodata = .;
        __init_begin = .;
 
 /*

diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c
index 250d174459d4c934b0f6fb9431f0b7277361753d..e5ee05c234c7ab84c166b6835217e950ee1875f2 100644 (file)
--- a/arch/powerpc/mm/book3s32/mmu.c
+++ b/arch/powerpc/mm/book3s32/mmu.c
@@ -240,7 +240,7 @@ void mmu_mark_rodata_ro(void)
        for (i = 0; i < nb; i++) {
                struct ppc_bat *bat = BATS[i];
 
-               if (bat_addrs[i].start < (unsigned long)__init_begin)
+               if (bat_addrs[i].start < (unsigned long)__end_rodata)
                        bat[1].batl = (bat[1].batl & ~BPP_RW) | BPP_RX;
        }
 

diff --git a/arch/powerpc/mm/book3s64/hash_pgtable.c b/arch/powerpc/mm/book3s64/hash_pgtable.c
index ae008b9df0e670ffd7ef3a61dcf27725129c5051..28332001bd87b2bd7548ab8f1246665dd0b4da3a 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_pgtable.c
+++ b/arch/powerpc/mm/book3s64/hash_pgtable.c
@@ -541,7 +541,7 @@ void hash__mark_rodata_ro(void)
        unsigned long start, end, pp;
 
        start = (unsigned long)_stext;
-       end = (unsigned long)__init_begin;
+       end = (unsigned long)__end_rodata;
 
        pp = htab_convert_pte_flags(pgprot_val(PAGE_KERNEL_ROX), HPTE_USE_KERNEL_KEY);
 

diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c
index 9f880f91f584db5b252e3e6cf7b29997b1022e8c..60c277a9b04332b32338dd30a731b20500c67860 100644 (file)
--- a/arch/powerpc/mm/book3s64/radix_pgtable.c
+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c
@@ -228,7 +228,7 @@ void radix__mark_rodata_ro(void)
        unsigned long start, end;
 
        start = (unsigned long)_stext;
-       end = (unsigned long)__init_begin;
+       end = (unsigned long)__end_rodata;
 
        radix__change_memory_range(start, end, _PAGE_WRITE);
 }

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 3ac73f9fb5d59870f91e540f8c186df7033bde6b..5c02fd08d61eff04253b5069a852f4da907348fe 100644 (file)
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -158,10 +158,11 @@ void mark_rodata_ro(void)
        }
 
        /*
-        * mark .text and .rodata as read only. Use __init_begin rather than
-        * __end_rodata to cover NOTES and EXCEPTION_TABLE.
+        * mark text and rodata as read only. __end_rodata is set by
+        * powerpc's linker script and includes tables and data
+        * requiring relocation which are not put in RO_DATA.
         */
-       numpages = PFN_UP((unsigned long)__init_begin) -
+       numpages = PFN_UP((unsigned long)__end_rodata) -
                   PFN_DOWN((unsigned long)_stext);
 
        set_memory_ro((unsigned long)_stext, numpages);