]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
x86/boot/64: Apply encryption mask to 5-level pagetable update
authorTom Lendacky <thomas.lendacky@amd.com>
Fri, 22 Mar 2024 15:41:06 +0000 (10:41 -0500)
committerIngo Molnar <mingo@kernel.org>
Sun, 24 Mar 2024 04:00:35 +0000 (05:00 +0100)
commit4d0d7e7852752ea56375ac8645f0239e21ca2b50
tree54ff84136257d188f166d705dfe5e90fc70d7374
parent8a8a9c9047d1089598bdb010ec44d7f14b4f9203
x86/boot/64: Apply encryption mask to 5-level pagetable update

When running with 5-level page tables, the kernel mapping PGD entry is
updated to point to the P4D table. The assignment uses _PAGE_TABLE_NOENC,
which, when SME is active (mem_encrypt=on), results in a page table
entry without the encryption mask set, causing the system to crash on
boot.

Change the assignment to use _PAGE_TABLE instead of _PAGE_TABLE_NOENC so
that the encryption mask is set for the PGD entry.

Fixes: 533568e06b15 ("x86/boot/64: Use RIP_REL_REF() to access early_top_pgt[]")
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/8f20345cda7dbba2cf748b286e1bc00816fe649a.1711122067.git.thomas.lendacky@amd.com
arch/x86/kernel/head64.c