arm64: mm: Defer read-only remap of data/bss linear alias

Since commit

  f2ba877402e5 ("arm64: mm: Map the kernel data/bss read-only in the linear map")

the linear alias of the .data and .bss regions is remapped read-only
early during the boot. (Note that a subsequent patch to unmap this
region entirely was reverted just before the v7.2 merge window, and will
be brought back in an improved form for the v7.3 cycle)

Fuad reports that in some cases, the KVM init code may apply relocations
to variables that reside in .data, and does so via the linear map. This
means that remapping .data read-only beforehand is a bad idea, and
results in an early boot crash.

These variables in .data are only present when CONFIG_NVHE_EL2_DEBUG or
CONFIG_NVHE_EL2_TRACING are enabled, which is why it was not spotted in
testing.

So move the remap to mark_rodata_ro(), which is a reasonable place to
put this, and ensures that it happens much later during the boot. It
also means that rodata=off is now taken into account, and so the linear
alias will remain writable in that case.

Fixes: f2ba877402e5 ("arm64: mm: Map the kernel data/bss read-only in the linear map")
Reviewed-by: Fuad Tabba <fuad.tabba@linux.dev>
Tested-by: Fuad Tabba <fuad.tabba@linux.dev>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 354bedf0e6386349305ba8a75207e8f6ece184a5..60c2778f413c81199af8306c75188708585a381d 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -1198,11 +1198,6 @@ static void __init map_mem(void)
                __map_memblock(start, end, pgprot_tagged(PAGE_KERNEL),
                               flags);
        }
-
-       /* Map the kernel data/bss read-only in the linear map */
-       __map_memblock(init_end, kernel_end, PAGE_KERNEL_RO, flags);
-       flush_tlb_kernel_range((unsigned long)lm_alias(__init_end),
-                              (unsigned long)lm_alias(__bss_stop));
 }
 
 void mark_rodata_ro(void)
@@ -1221,6 +1216,12 @@ void mark_rodata_ro(void)
        update_mapping_prot(__pa_symbol(_text), (unsigned long)_text,
                            (unsigned long)_stext - (unsigned long)_text,
                            PAGE_KERNEL_RO);
+
+       /* Map the kernel data/bss read-only in the linear map */
+       update_mapping_prot(__pa_symbol(__init_end),
+                           (unsigned long)lm_alias(__init_end),
+                           (unsigned long)__bss_stop - (unsigned long)__init_end,
+                           PAGE_KERNEL_RO);
 }
 
 static void __init declare_vma(struct vm_struct *vma,