Skip to content

Commit 9843231

Browse files
tlendackyIngo Molnar
authored and
Ingo Molnar
committed
x86/boot/64: Move 5-level paging global variable assignments back
Commit 63bed96 ("x86/startup_64: Defer assignment of 5-level paging global variables") moved assignment of 5-level global variables to later in the boot in order to avoid having to use RIP relative addressing in order to set them. However, when running with 5-level paging and SME active (mem_encrypt=on), the variables are needed as part of the page table setup needed to encrypt the kernel (using pgd_none(), p4d_offset(), etc.). Since the variables haven't been set, the page table manipulation is done as if 4-level paging is active, causing the system to crash on boot. While only a subset of the assignments that were moved need to be set early, move all of the assignments back into check_la57_support() so that these assignments aren't spread between two locations. Instead of just reverting the fix, this uses the new RIP_REL_REF() macro when assigning the variables. Fixes: 63bed96 ("x86/startup_64: Defer assignment of 5-level paging global variables") Signed-off-by: Tom Lendacky <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/2ca419f4d0de719926fd82353f6751f717590a86.1711122067.git.thomas.lendacky@amd.com
1 parent 4d0d7e7 commit 9843231

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

arch/x86/kernel/head64.c

+7-9
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ static inline bool check_la57_support(void)
8181
if (!(native_read_cr4() & X86_CR4_LA57))
8282
return false;
8383

84+
RIP_REL_REF(__pgtable_l5_enabled) = 1;
85+
RIP_REL_REF(pgdir_shift) = 48;
86+
RIP_REL_REF(ptrs_per_p4d) = 512;
87+
RIP_REL_REF(page_offset_base) = __PAGE_OFFSET_BASE_L5;
88+
RIP_REL_REF(vmalloc_base) = __VMALLOC_BASE_L5;
89+
RIP_REL_REF(vmemmap_base) = __VMEMMAP_BASE_L5;
90+
8491
return true;
8592
}
8693

@@ -431,15 +438,6 @@ asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode
431438
(__START_KERNEL & PGDIR_MASK)));
432439
BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END);
433440

434-
if (check_la57_support()) {
435-
__pgtable_l5_enabled = 1;
436-
pgdir_shift = 48;
437-
ptrs_per_p4d = 512;
438-
page_offset_base = __PAGE_OFFSET_BASE_L5;
439-
vmalloc_base = __VMALLOC_BASE_L5;
440-
vmemmap_base = __VMEMMAP_BASE_L5;
441-
}
442-
443441
cr4_init_shadow();
444442

445443
/* Kill off the identity-map trampoline */

0 commit comments

Comments
 (0)