Commit 5a67da1f authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot: Move the 5-level paging trampoline into /startup 



The 5-level paging trampoline is used by both the EFI stub and the
traditional decompressor. Move it out of the decompressor sources into
the newly minted arch/x86/boot/startup/ sub-directory which will hold
startup code that may be shared between the decompressor, the EFI stub
and the kernel proper, and needs to tolerate being called during early
boot, before the kernel virtual mapping has been created.

This will allow the 5-level paging trampoline to be used by EFI boot
images such as zboot that omit the traditional decompressor entirely.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250401133416.1436741-10-ardb+git@google.com
parent 5d4456fc

arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ archprepare: $(cpufeaturemasks.hdr) 
###

# Kernel objects



core-y  += arch/x86/boot/startup/

libs-y  += arch/x86/lib/



# drivers-y are linked after core-y

arch/x86/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ ifdef CONFIG_X86_64 
	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/mem_encrypt.o

	vmlinux-objs-y += $(obj)/pgtable_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o

	vmlinux-objs-y += $(obj)/la57toggle.o

endif



vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o
@@ -106,6 +105,7 @@ vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o 


vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o

vmlinux-libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

vmlinux-libs-$(CONFIG_X86_64)	+= $(objtree)/arch/x86/boot/startup/lib.a



$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE

	$(call if_changed,ld)

arch/x86/boot/startup/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



lib-$(CONFIG_X86_64)		+= la57toggle.o