Commit 7ae089ee authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot: Move early SME init code into startup/ 



Move the SME initialization code, which runs from the 1:1 mapping of
memory as it operates on the kernel virtual mapping, into the new
sub-directory arch/x86/boot/startup/ where all startup code will reside
that needs to tolerate executing from the 1:1 mapping.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Dionna Amalie Glaze <dionnaglaze@google.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kevin Loughlin <kevinloughlin@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-efi@vger.kernel.org
Link: https://lore.kernel.org/r/20250410134117.3713574-18-ardb+git@google.com
parent dafb26f4

arch/x86/boot/startup/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ UBSAN_SANITIZE := n 
KCOV_INSTRUMENT	:= n



obj-$(CONFIG_X86_64)		+= gdt_idt.o map_kernel.o

obj-$(CONFIG_AMD_MEM_ENCRYPT)	+= sme.o



lib-$(CONFIG_X86_64)		+= la57toggle.o

lib-$(CONFIG_EFI_MIXED)		+= efi-mixed.o

arch/x86/mm/mem_encrypt_identity.c→arch/x86/boot/startup/sme.c

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#include <asm/coco.h>

#include <asm/sev.h>



#include "mm_internal.h"



#define PGD_FLAGS		_KERNPG_TABLE_NOENC

#define P4D_FLAGS		_KERNPG_TABLE_NOENC

#define PUD_FLAGS		_KERNPG_TABLE_NOENC

arch/x86/mm/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,10 @@ 
KCOV_INSTRUMENT_tlb.o			:= n

KCOV_INSTRUMENT_mem_encrypt.o		:= n

KCOV_INSTRUMENT_mem_encrypt_amd.o	:= n

KCOV_INSTRUMENT_mem_encrypt_identity.o	:= n

KCOV_INSTRUMENT_pgprot.o		:= n



KASAN_SANITIZE_mem_encrypt.o		:= n

KASAN_SANITIZE_mem_encrypt_amd.o	:= n

KASAN_SANITIZE_mem_encrypt_identity.o	:= n

KASAN_SANITIZE_pgprot.o		:= n



# Disable KCSAN entirely, because otherwise we get warnings that some functions
@@ -16,12 +14,10 @@ KASAN_SANITIZE_pgprot.o := n 
KCSAN_SANITIZE := n

# Avoid recursion by not calling KMSAN hooks for CEA code.

KMSAN_SANITIZE_cpu_entry_area.o := n

KMSAN_SANITIZE_mem_encrypt_identity.o := n



ifdef CONFIG_FUNCTION_TRACER

CFLAGS_REMOVE_mem_encrypt.o		= -pg

CFLAGS_REMOVE_mem_encrypt_amd.o		= -pg

CFLAGS_REMOVE_mem_encrypt_identity.o	= -pg

CFLAGS_REMOVE_pgprot.o			= -pg

endif
@@ -32,7 +28,6 @@ obj-y += pat/ 


# Make sure __phys_addr has no stackprotector

CFLAGS_physaddr.o		:= -fno-stack-protector

CFLAGS_mem_encrypt_identity.o	:= -fno-stack-protector



CFLAGS_fault.o := -I $(src)/../include/asm/trace
@@ -63,5 +58,4 @@ obj-$(CONFIG_MITIGATION_PAGE_TABLE_ISOLATION) += pti.o 
obj-$(CONFIG_X86_MEM_ENCRYPT)	+= mem_encrypt.o

obj-$(CONFIG_AMD_MEM_ENCRYPT)	+= mem_encrypt_amd.o



obj-$(CONFIG_AMD_MEM_ENCRYPT)	+= mem_encrypt_identity.o

obj-$(CONFIG_AMD_MEM_ENCRYPT)	+= mem_encrypt_boot.o