Commit 1fa753c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-next-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI updates from Ard Biesheuvel:

 - Decouple mixed mode startup code from the traditional x86
   decompressor

 - Revert zero-length file hack in efivarfs

 - Prevent EFI zboot from using the CopyMem/SetMem boot services after
   ExitBootServices()

 - Update EFI zboot to use the ZLIB/ZSTD library interfaces directly

* tag 'efi-next-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/libstub: Avoid legacy decompressor zlib/zstd wrappers
  efi/libstub: Avoid CopyMem/SetMem EFI services after ExitBootServices
  efi: efibc: change kmalloc(size * count, ...) to kmalloc_array()
  efivarfs: Revert "allow creation of zero length files"
  x86/efi/mixed: Move mixed mode startup code into libstub
  x86/efi/mixed: Simplify and document thunking logic
  x86/efi/mixed: Remove dependency on legacy startup_32 code
  x86/efi/mixed: Set up 1:1 mapping of lower 4GiB in the stub
  x86/efi/mixed: Factor out and clean up long mode entry
  x86/efi/mixed: Check CPU compatibility without relying on verify_cpu()
  x86/efistub: Merge PE and handover entrypoints
parents 3b9ea5b5 0dc1754e

arch/x86/boot/compressed/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o $(obj)/tdcall.o $(obj)/td 
vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o



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

vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_mixed.o

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



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

arch/x86/boot/compressed/head_64.S

+0 −7
Original line number Diff line number Diff line
@@ -263,13 +263,6 @@ SYM_FUNC_START(startup_32) 
	 * used to perform that far jump.

	 */

	leal	rva(startup_64)(%ebp), %eax

#ifdef CONFIG_EFI_MIXED

	cmpb	$1, rva(efi_is64)(%ebp)

	je	1f

	leal	rva(startup_64_mixed_mode)(%ebp), %eax

1:

#endif



	pushl	$__KERNEL_CS

	pushl	%eax

drivers/firmware/efi/efibc.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int efibc_reboot_notifier_call(struct notifier_block *notifier, 
	if (ret || !data)

		return NOTIFY_DONE;



	wdata = kmalloc(MAX_DATA_LEN * sizeof(efi_char16_t), GFP_KERNEL);

	wdata = kmalloc_array(MAX_DATA_LEN, sizeof(efi_char16_t), GFP_KERNEL);

	if (!wdata)

		return NOTIFY_DONE;

drivers/firmware/efi/libstub/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS)) 
# `-fdata-sections` flag from KBUILD_CFLAGS_KERNEL

KBUILD_CFLAGS_KERNEL := $(filter-out -fdata-sections, $(KBUILD_CFLAGS_KERNEL))



KBUILD_AFLAGS			:= $(KBUILD_CFLAGS) -D__ASSEMBLY__



lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o \

				   file.o mem.o random.o randomalloc.o pci.o \

				   skip_spaces.o lib-cmdline.o lib-ctype.o \
@@ -83,13 +85,19 @@ lib-$(CONFIG_EFI_GENERIC_STUB) += efi-stub.o string.o intrinsics.o systable.o \ 
lib-$(CONFIG_ARM)		+= arm32-stub.o

lib-$(CONFIG_ARM64)		+= kaslr.o arm64.o arm64-stub.o smbios.o

lib-$(CONFIG_X86)		+= x86-stub.o smbios.o

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

lib-$(CONFIG_X86_64)		+= x86-5lvl.o

lib-$(CONFIG_RISCV)		+= kaslr.o riscv.o riscv-stub.o

lib-$(CONFIG_LOONGARCH)		+= loongarch.o loongarch-stub.o



CFLAGS_arm32-stub.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)



zboot-obj-$(CONFIG_RISCV)	:= lib-clz_ctz.o lib-ashldi3.o

zboot-obj-y			:= zboot-decompress-gzip.o

CFLAGS_zboot-decompress-gzip.o	+= -I$(srctree)/lib/zlib_inflate

zboot-obj-$(CONFIG_KERNEL_ZSTD)	:= zboot-decompress-zstd.o lib-xxhash.o

CFLAGS_zboot-decompress-zstd.o	+= -I$(srctree)/lib/zstd



zboot-obj-$(CONFIG_RISCV)	+= lib-clz_ctz.o lib-ashldi3.o

lib-$(CONFIG_EFI_ZBOOT)		+= zboot.o $(zboot-obj-y)



lib-$(CONFIG_UNACCEPTED_MEMORY) += unaccepted_memory.o bitmap.o find.o

drivers/firmware/efi/libstub/efistub.h

+3 −0
Original line number Diff line number Diff line
@@ -1234,4 +1234,7 @@ void process_unaccepted_memory(u64 start, u64 end); 
void accept_memory(phys_addr_t start, unsigned long size);

void arch_accept_memory(phys_addr_t start, phys_addr_t end);



efi_status_t efi_zboot_decompress_init(unsigned long *alloc_size);

efi_status_t efi_zboot_decompress(u8 *out, unsigned long outlen);



#endif