Commit 50358c25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fix from Catalin Marinas:
 "Move the arm64_use_ng_mappings variable from the .bss to the .data
  section as it is accessed very early during boot with the MMU off and
  before the .bss has been initialised.

  This could lead to incorrect idmap page table"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: cpufeature: Move arm64_use_ng_mappings to the .data section to prevent wrong idmap generation
parents 3013c33d 363cd2b8

arch/arm64/kernel/cpufeature.c

+8 −1
Original line number Diff line number Diff line
@@ -114,7 +114,14 @@ static struct arm64_cpu_capabilities const __ro_after_init *cpucap_ptrs[ARM64_NC 


DECLARE_BITMAP(boot_cpucaps, ARM64_NCAPS);



bool arm64_use_ng_mappings = false;

/*

 * arm64_use_ng_mappings must be placed in the .data section, otherwise it

 * ends up in the .bss section where it is initialized in early_map_kernel()

 * after the MMU (with the idmap) was enabled. create_init_idmap() - which

 * runs before early_map_kernel() and reads the variable via PTE_MAYBE_NG -

 * may end up generating an incorrect idmap page table attributes.

 */

bool arm64_use_ng_mappings __read_mostly = false;

EXPORT_SYMBOL(arm64_use_ng_mappings);



DEFINE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector) = vectors;