Skip to contentSkip to conversation

x86/boot: Rework PE header generation

PATCH Applied Ard Biesheuvel 6 participants 41 messages Sep 12, 2023 – Oct 24, 2023

Subsystems (2)

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover x86/boot: Rework PE header generation

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

In true x86 fashion, this is a lot more complicated than on other architectures, which have implemented this code/data split with 4k alignment from the beginning. The complicating factor here is that the boot image consists of two different parts, which are stitched together and fixed up using a special build tool.

After this series is applied, the only remaining task performed by the build tool is generating the CRC-32. Even though this checksum is usually wrong (given that distro kernels are signed for secure boot in a way that corrupts the CRC), this feature is retained as we cannot be sure that nobody is relying on this.

This supersedes the work proposed by Evgeniy last year, which did a major rewrite of the build tool in order to clean it up, before updating it to generate the new 4k aligned image layout. As this series proves, the build tool is mostly unnecessary, and we have too many of those already.

Changes since v1:
- drop patch that removed the CRC and the build tool
- do not use fixed setup_size but derive it in the setup.ld linker script
- reorganize the PE header so the .compat section only covers its payload and the padding that follows it
- add hpa's ack to patch #4

Cc Evgeniy Baskov <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Peter Jones <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Gerd Hoffmann <[email protected]>
Cc Kees Cook <[email protected]>
Cc "H. Peter Anvin" <[email protected]>

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64
x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script
x86/boot: Derive file size from _edata symbol
x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section
x86/boot: Increase section and file alignment to 4k/512

 arch/x86/boot/Makefile                  |   2 +-
 arch/x86/boot/compressed/vmlinux.lds.S  |   6 +-
 arch/x86/boot/header.S                  | 213 ++++++---------
 arch/x86/boot/setup.ld                  |  14 +-
 arch/x86/boot/tools/build.c             | 273 +-------------------
 drivers/firmware/efi/libstub/Makefile   |   7 -
 drivers/firmware/efi/libstub/x86-stub.c |  46 +---
 7 files changed, 114 insertions(+), 447 deletions(-)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#1 lore raw

PATCH v2 1/15 x86/efi: Drop EFI stub .bss from .data section

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub always zero inits its BSS section upon entry, there is no longer a need to place the BSS symbols carried by the stub into the .data section.

---
 arch/x86/boot/compressed/vmlinux.lds.S | 1 -
 drivers/firmware/efi/libstub/Makefile  | 7 -------
 2 files changed, 8 deletions(-)
arch/x86/boot/compressed/vmlinux.lds.S +0 -1
index b22f34b8684a..4ff6ab1b67d9 100644
@@ -47,7 +47,6 @@ SECTIONS
 		_data = . ;
 		*(.data)
 		*(.data.*)
-		*(.bss.efistub)
 		_edata = . ;
 	}
 	. = ALIGN(L1_CACHE_BYTES);
drivers/firmware/efi/libstub/Makefile +0 -7
index a1157c2a7170..ef4c12f0877b 100644
@@ -108,13 +108,6 @@ lib-y				:= $(patsubst %.o,%.stub.o,$(lib-y))
 # https://bugs.llvm.org/show_bug.cgi?id=46480
 STUBCOPY_FLAGS-y		+= --remove-section=.note.gnu.property
 
-#
-# For x86, bootloaders like systemd-boot or grub-efi do not zero-initialize the
-# .bss section, so the .bss section of the EFI stub needs to be included in the
-# .data section of the compressed kernel to ensure initialization. Rename the
-# .bss section here so it's easy to pick out in the linker script.
-#
-STUBCOPY_FLAGS-$(CONFIG_X86)	+= --rename-section .bss=.bss.efistub,load,alloc
 STUBCOPY_RELOC-$(CONFIG_X86_32)	:= R_386_32
 STUBCOPY_RELOC-$(CONFIG_X86_64)	:= R_X86_64_64
 
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#2 lore raw

[tip: x86/boot] x86/efi: Drop EFI stub .bss from .data section

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     5f51c5d0e905608ba7be126737f7c84a793ae1aa
Gitweb:        https://git.kernel.org/tip/5f51c5d0e905608ba7be126737f7c84a793ae1aa
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:52 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:40 +02:00

x86/efi: Drop EFI stub .bss from .data section

Now that the EFI stub always zero inits its BSS section upon entry, there is no longer a need to place the BSS symbols carried by the stub into the .data section.

---
 arch/x86/boot/compressed/vmlinux.lds.S | 1 -
 drivers/firmware/efi/libstub/Makefile  | 7 -------
 2 files changed, 8 deletions(-)
arch/x86/boot/compressed/vmlinux.lds.S +0 -1
index b22f34b..4ff6ab1 100644
@@ -47,7 +47,6 @@ SECTIONS
 		_data = . ;
 		*(.data)
 		*(.data.*)
-		*(.bss.efistub)
 		_edata = . ;
 	}
 	. = ALIGN(L1_CACHE_BYTES);
drivers/firmware/efi/libstub/Makefile +0 -7
index a1157c2..ef4c12f 100644
@@ -108,13 +108,6 @@ lib-y				:= $(patsubst %.o,%.stub.o,$(lib-y))
 # https://bugs.llvm.org/show_bug.cgi?id=46480
 STUBCOPY_FLAGS-y		+= --remove-section=.note.gnu.property
 
-#
-# For x86, bootloaders like systemd-boot or grub-efi do not zero-initialize the
-# .bss section, so the .bss section of the EFI stub needs to be included in the
-# .data section of the compressed kernel to ensure initialization. Rename the
-# .bss section here so it's easy to pick out in the linker script.
-#
-STUBCOPY_FLAGS-$(CONFIG_X86)	+= --rename-section .bss=.bss.efistub,load,alloc
 STUBCOPY_RELOC-$(CONFIG_X86_32)	:= R_386_32
 STUBCOPY_RELOC-$(CONFIG_X86_64)	:= R_X86_64_64
 
#3 lore raw

PATCH v2 2/15 x86/efi: Disregard setup header of loaded image

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The native EFI entrypoint does not take a struct boot_params from the loader, but instead, it constructs one from scratch, using the setup header data placed at the start of the image.

This setup header is placed in a way that permits legacy loaders to manipulate the contents (i.e., to pass the kernel command line or the address and size of an initial ramdisk), but EFI boot does not use it in that way - it only copies the contents that were placed there at build time, but EFI loaders will not (and should not) manipulate the setup header to configure the boot. (Commit 63bf28ceb3ebbe76 "efi: x86: Wipe setup_data on pure EFI boot" deals with some of the fallout of using setup_data in a way that breaks EFI boot.)

Given that none of the non-zero values that are copied from the setup header into the EFI stub's struct boot_params are relevant to the boot now that the EFI stub no longer enters via the legacy decompressor, the copy can be omitted altogether.

---
 drivers/firmware/efi/libstub/x86-stub.c | 46 +++-----------------
 1 file changed, 6 insertions(+), 40 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +6 -40
index 2fee52ed335d..d76a9f7c35d0 100644
@@ -449,9 +449,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
 efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 				   efi_system_table_t *sys_table_arg)
 {
-	struct boot_params *boot_params;
-	struct setup_header *hdr;
-	void *image_base;
+	static struct boot_params boot_params __page_aligned_bss;
+	struct setup_header *hdr = &boot_params.hdr;
 	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
 	int options_size = 0;
 	efi_status_t status;
@@ -469,30 +468,9 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 		efi_exit(handle, status);
 	}
 
-	image_base = efi_table_attr(image, image_base);
-
-	status = efi_allocate_pages(sizeof(struct boot_params),
-				    (unsigned long *)&boot_params, ULONG_MAX);
-	if (status != EFI_SUCCESS) {
-		efi_err("Failed to allocate lowmem for boot params\n");
-		efi_exit(handle, status);
-	}
-
-	memset(boot_params, 0x0, sizeof(struct boot_params));
-
-	hdr = &boot_params->hdr;
-
-	/* Copy the setup header from the second sector to boot_params */
-	memcpy(&hdr->jump, image_base + 512,
-	       sizeof(struct setup_header) - offsetof(struct setup_header, jump));
-
-	/*
-	 * Fill out some of the header fields ourselves because the
-	 * EFI firmware loader doesn't load the first sector.
-	 */
+	/* assign the setup_header fields that the kernel actually cares about */
 	hdr->root_flags	= 1;
 	hdr->vid_mode	= 0xffff;
-	hdr->boot_flag	= 0xAA55;
 
 	hdr->type_of_loader = 0x21;
 
@@ -501,25 +479,13 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 	if (!cmdline_ptr)
 		goto fail;
 
-	efi_set_u64_split((unsigned long)cmdline_ptr,
-			  &hdr->cmd_line_ptr, &boot_params->ext_cmd_line_ptr);
-
-	hdr->ramdisk_image = 0;
-	hdr->ramdisk_size = 0;
-
-	/*
-	 * Disregard any setup data that was provided by the bootloader:
-	 * setup_data could be pointing anywhere, and we have no way of
-	 * authenticating or validating the payload.
-	 */
-	hdr->setup_data = 0;
+	efi_set_u64_split((unsigned long)cmdline_ptr, &hdr->cmd_line_ptr,
+			  &boot_params.ext_cmd_line_ptr);
 
-	efi_stub_entry(handle, sys_table_arg, boot_params);
+	efi_stub_entry(handle, sys_table_arg, &boot_params);
 	/* not reached */
 
 fail:
-	efi_free(sizeof(struct boot_params), (unsigned long)boot_params);
-
 	efi_exit(handle, status);
 }
 
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#4 lore raw

[tip: x86/boot] x86/efi: Disregard setup header of loaded image

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     7e50262229faad0c7b8c54477cd1c883f31cc4a7
Gitweb:        https://git.kernel.org/tip/7e50262229faad0c7b8c54477cd1c883f31cc4a7
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:53 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:40 +02:00

x86/efi: Disregard setup header of loaded image

The native EFI entrypoint does not take a struct boot_params from the loader, but instead, it constructs one from scratch, using the setup header data placed at the start of the image.

This setup header is placed in a way that permits legacy loaders to manipulate the contents (i.e., to pass the kernel command line or the address and size of an initial ramdisk), but EFI boot does not use it in that way - it only copies the contents that were placed there at build time, but EFI loaders will not (and should not) manipulate the setup header to configure the boot. (Commit 63bf28ceb3ebbe76 "efi: x86: Wipe setup_data on pure EFI boot" deals with some of the fallout of using setup_data in a way that breaks EFI boot.)

Given that none of the non-zero values that are copied from the setup header into the EFI stub's struct boot_params are relevant to the boot now that the EFI stub no longer enters via the legacy decompressor, the copy can be omitted altogether.

---
 drivers/firmware/efi/libstub/x86-stub.c | 46 +++---------------------
 1 file changed, 6 insertions(+), 40 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +6 -40
index 2fee52e..3bfc596 100644
@@ -449,9 +449,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
 efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 				   efi_system_table_t *sys_table_arg)
 {
-	struct boot_params *boot_params;
-	struct setup_header *hdr;
-	void *image_base;
+	static struct boot_params boot_params __page_aligned_bss;
+	struct setup_header *hdr = &boot_params.hdr;
 	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
 	int options_size = 0;
 	efi_status_t status;
@@ -469,30 +468,9 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 		efi_exit(handle, status);
 	}
 
-	image_base = efi_table_attr(image, image_base);
-
-	status = efi_allocate_pages(sizeof(struct boot_params),
-				    (unsigned long *)&boot_params, ULONG_MAX);
-	if (status != EFI_SUCCESS) {
-		efi_err("Failed to allocate lowmem for boot params\n");
-		efi_exit(handle, status);
-	}
-
-	memset(boot_params, 0x0, sizeof(struct boot_params));
-
-	hdr = &boot_params->hdr;
-
-	/* Copy the setup header from the second sector to boot_params */
-	memcpy(&hdr->jump, image_base + 512,
-	       sizeof(struct setup_header) - offsetof(struct setup_header, jump));
-
-	/*
-	 * Fill out some of the header fields ourselves because the
-	 * EFI firmware loader doesn't load the first sector.
-	 */
+	/* Assign the setup_header fields that the kernel actually cares about */
 	hdr->root_flags	= 1;
 	hdr->vid_mode	= 0xffff;
-	hdr->boot_flag	= 0xAA55;
 
 	hdr->type_of_loader = 0x21;
 
@@ -501,25 +479,13 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
 	if (!cmdline_ptr)
 		goto fail;
 
-	efi_set_u64_split((unsigned long)cmdline_ptr,
-			  &hdr->cmd_line_ptr, &boot_params->ext_cmd_line_ptr);
-
-	hdr->ramdisk_image = 0;
-	hdr->ramdisk_size = 0;
-
-	/*
-	 * Disregard any setup data that was provided by the bootloader:
-	 * setup_data could be pointing anywhere, and we have no way of
-	 * authenticating or validating the payload.
-	 */
-	hdr->setup_data = 0;
+	efi_set_u64_split((unsigned long)cmdline_ptr, &hdr->cmd_line_ptr,
+			  &boot_params.ext_cmd_line_ptr);
 
-	efi_stub_entry(handle, sys_table_arg, boot_params);
+	efi_stub_entry(handle, sys_table_arg, &boot_params);
 	/* not reached */
 
 fail:
-	efi_free(sizeof(struct boot_params), (unsigned long)boot_params);
-
 	efi_exit(handle, status);
 }
 
#5 lore raw

PATCH v2 3/15 x86/efi: Drop alignment flags from PE section headers

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The section header flags for alignment are documented in the PE/COFF spec as being applicable to PE object files only, not to PE executables such as the Linux bzImage, so let's drop them from the PE header.

---
 arch/x86/boot/header.S | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
arch/x86/boot/header.S +4 -8
index b04ca8e2b213..8c8148d751c6 100644
@@ -209,8 +209,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_CODE		| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_EXECUTE		| \
-		IMAGE_SCN_ALIGN_16BYTES		# Characteristics
+		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
 	#
 	# The EFI application loader requires a relocation section
@@ -230,8 +229,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_DISCARDABLE	| \
-		IMAGE_SCN_ALIGN_1BYTES		# Characteristics
+		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
 
 #ifdef CONFIG_EFI_MIXED
 	#
@@ -249,8 +247,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_DISCARDABLE	| \
-		IMAGE_SCN_ALIGN_1BYTES		# Characteristics
+		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
 #endif
 
 	#
@@ -271,8 +268,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_CODE		| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_EXECUTE		| \
-		IMAGE_SCN_ALIGN_16BYTES		# Characteristics
+		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
 	.set	section_count, (. - section_table) / 40
 #endif /* CONFIG_EFI_STUB */
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#6 lore raw

[tip: x86/boot] x86/efi: Drop alignment flags from PE section headers

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     bfab35f552ab3dd6d017165bf9de1d1d20f198cc
Gitweb:        https://git.kernel.org/tip/bfab35f552ab3dd6d017165bf9de1d1d20f198cc
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:54 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:41 +02:00

x86/efi: Drop alignment flags from PE section headers

The section header flags for alignment are documented in the PE/COFF spec as being applicable to PE object files only, not to PE executables such as the Linux bzImage, so let's drop them from the PE header.

---
 arch/x86/boot/header.S | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
arch/x86/boot/header.S +4 -8
index b04ca8e..8c8148d 100644
@@ -209,8 +209,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_CODE		| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_EXECUTE		| \
-		IMAGE_SCN_ALIGN_16BYTES		# Characteristics
+		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
 	#
 	# The EFI application loader requires a relocation section
@@ -230,8 +229,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_DISCARDABLE	| \
-		IMAGE_SCN_ALIGN_1BYTES		# Characteristics
+		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
 
 #ifdef CONFIG_EFI_MIXED
 	#
@@ -249,8 +247,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_DISCARDABLE	| \
-		IMAGE_SCN_ALIGN_1BYTES		# Characteristics
+		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
 #endif
 
 	#
@@ -271,8 +268,7 @@ section_table:
 	.word	0				# NumberOfLineNumbers
 	.long	IMAGE_SCN_CNT_CODE		| \
 		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_EXECUTE		| \
-		IMAGE_SCN_ALIGN_16BYTES		# Characteristics
+		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
 	.set	section_count, (. - section_table) / 40
 #endif /* CONFIG_EFI_STUB */
#7 lore raw

PATCH v2 4/15 x86/boot: Remove the 'bugger off' message

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Ancient (pre-2003) x86 kernels could boot from a floppy disk straight from the BIOS, using a small real mode boot stub at the start of the image where the BIOS would expect the boot record (or boot block) to appear.

Due to its limitations (kernel size < 1 MiB, no support for IDE, USB or El Torito floppy emulation), this support was dropped, and a Linux aware bootloader is now always required to boot the kernel from a legacy BIOS.

To smoothen this transition, the boot stub was not removed entirely, but replaced with one that just prints an error message telling the user to install a bootloader.

As it is unlikely that anyone doing direct floppy boot with such an ancient kernel is going to upgrade to v6.5+ and expect that this boot method still works, printing this message is kind of pointless, and so it should be possible to remove the logic that emits it.

Let's free up this space so it can be used to expand the PE header in a subsequent patch.

---
 arch/x86/boot/header.S | 49 --------------------
 arch/x86/boot/setup.ld |  7 +--
 2 files changed, 4 insertions(+), 52 deletions(-)
arch/x86/boot/header.S +0 -49
index 8c8148d751c6..b24fa50a9898 100644
@@ -38,64 +38,15 @@ SYSSEG		= 0x1000		/* historical load address >> 4 */
 
 	.code16
 	.section ".bstext", "ax"
-
-	.global bootsect_start
-bootsect_start:
 #ifdef CONFIG_EFI_STUB
 	# "MZ", MS-DOS header
 	.word	MZ_MAGIC
-#endif
-
-	# Normalize the start address
-	ljmp	$BOOTSEG, $start2
-
-start2:
-	movw	%cs, %ax
-	movw	%ax, %ds
-	movw	%ax, %es
-	movw	%ax, %ss
-	xorw	%sp, %sp
-	sti
-	cld
-
-	movw	$bugger_off_msg, %si
-
-msg_loop:
-	lodsb
-	andb	%al, %al
-	jz	bs_die
-	movb	$0xe, %ah
-	movw	$7, %bx
-	int	$0x10
-	jmp	msg_loop
-
-bs_die:
-	# Allow the user to press a key, then reboot
-	xorw	%ax, %ax
-	int	$0x16
-	int	$0x19
-
-	# int 0x19 should never return.  In case it does anyway,
-	# invoke the BIOS reset code...
-	ljmp	$0xf000,$0xfff0
-
-#ifdef CONFIG_EFI_STUB
 	.org	0x38
 	#
 	# Offset to the PE header.
 	#
 	.long	LINUX_PE_MAGIC
 	.long	pe_header
-#endif /* CONFIG_EFI_STUB */
-
-	.section ".bsdata", "a"
-bugger_off_msg:
-	.ascii	"Use a boot loader.\r\n"
-	.ascii	"\n"
-	.ascii	"Remove disk and press any key to reboot...\r\n"
-	.byte	0
-
-#ifdef CONFIG_EFI_STUB
 pe_header:
 	.long	PE_MAGIC
 
arch/x86/boot/setup.ld +4 -3
index 49546c247ae2..b11c45b9e51e 100644
@@ -10,10 +10,11 @@ ENTRY(_start)
 SECTIONS
 {
 	. = 0;
-	.bstext		: { *(.bstext) }
-	.bsdata		: { *(.bsdata) }
+	.bstext	: {
+		*(.bstext)
+		. = 495;
+	} =0xffffffff
 
-	. = 495;
 	.header		: { *(.header) }
 	.entrytext	: { *(.entrytext) }
 	.inittext	: { *(.inittext) }
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#8 lore raw

[tip: x86/boot] x86/boot: Remove the 'bugger off' message

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     768171d7ebbce005210e1cf8456f043304805c15
Gitweb:        https://git.kernel.org/tip/768171d7ebbce005210e1cf8456f043304805c15
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:55 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:41 +02:00

x86/boot: Remove the 'bugger off' message

Ancient (pre-2003) x86 kernels could boot from a floppy disk straight from the BIOS, using a small real mode boot stub at the start of the image where the BIOS would expect the boot record (or boot block) to appear.

Due to its limitations (kernel size < 1 MiB, no support for IDE, USB or El Torito floppy emulation), this support was dropped, and a Linux aware bootloader is now always required to boot the kernel from a legacy BIOS.

To smoothen this transition, the boot stub was not removed entirely, but replaced with one that just prints an error message telling the user to install a bootloader.

As it is unlikely that anyone doing direct floppy boot with such an ancient kernel is going to upgrade to v6.5+ and expect that this boot method still works, printing this message is kind of pointless, and so it should be possible to remove the logic that emits it.

Let's free up this space so it can be used to expand the PE header in a subsequent patch.

---
 arch/x86/boot/header.S | 49 +-----------------------------------------
 arch/x86/boot/setup.ld |  7 +++---
 2 files changed, 4 insertions(+), 52 deletions(-)
arch/x86/boot/header.S +0 -49
index 8c8148d..b24fa50 100644
@@ -38,64 +38,15 @@ SYSSEG		= 0x1000		/* historical load address >> 4 */
 
 	.code16
 	.section ".bstext", "ax"
-
-	.global bootsect_start
-bootsect_start:
 #ifdef CONFIG_EFI_STUB
 	# "MZ", MS-DOS header
 	.word	MZ_MAGIC
-#endif
-
-	# Normalize the start address
-	ljmp	$BOOTSEG, $start2
-
-start2:
-	movw	%cs, %ax
-	movw	%ax, %ds
-	movw	%ax, %es
-	movw	%ax, %ss
-	xorw	%sp, %sp
-	sti
-	cld
-
-	movw	$bugger_off_msg, %si
-
-msg_loop:
-	lodsb
-	andb	%al, %al
-	jz	bs_die
-	movb	$0xe, %ah
-	movw	$7, %bx
-	int	$0x10
-	jmp	msg_loop
-
-bs_die:
-	# Allow the user to press a key, then reboot
-	xorw	%ax, %ax
-	int	$0x16
-	int	$0x19
-
-	# int 0x19 should never return.  In case it does anyway,
-	# invoke the BIOS reset code...
-	ljmp	$0xf000,$0xfff0
-
-#ifdef CONFIG_EFI_STUB
 	.org	0x38
 	#
 	# Offset to the PE header.
 	#
 	.long	LINUX_PE_MAGIC
 	.long	pe_header
-#endif /* CONFIG_EFI_STUB */
-
-	.section ".bsdata", "a"
-bugger_off_msg:
-	.ascii	"Use a boot loader.\r\n"
-	.ascii	"\n"
-	.ascii	"Remove disk and press any key to reboot...\r\n"
-	.byte	0
-
-#ifdef CONFIG_EFI_STUB
 pe_header:
 	.long	PE_MAGIC
 
arch/x86/boot/setup.ld +4 -3
index 49546c2..b11c45b 100644
@@ -10,10 +10,11 @@ ENTRY(_start)
 SECTIONS
 {
 	. = 0;
-	.bstext		: { *(.bstext) }
-	.bsdata		: { *(.bsdata) }
+	.bstext	: {
+		*(.bstext)
+		. = 495;
+	} =0xffffffff
 
-	. = 495;
 	.header		: { *(.header) }
 	.entrytext	: { *(.entrytext) }
 	.inittext	: { *(.inittext) }
#9 lore raw

PATCH v2 5/15 x86/boot: Omit compression buffer from PE/COFF image memory footprint

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub decompresses the kernel and hands over to the decompressed image directly, there is no longer a need to provide a decompression buffer as part of the .BSS allocation of the PE/COFF image. It also means the PE/COFF image can be loaded anywhere in memory, and setting the preferred image base is unnecessary. So drop the handling of this from the header and from the build tool.

---
 arch/x86/boot/header.S      |  6 +--
 arch/x86/boot/tools/build.c | 50 +++-----------------
 2 files changed, 8 insertions(+), 48 deletions(-)
arch/x86/boot/header.S +2 -4
index b24fa50a9898..a87d9133384b 100644
@@ -90,12 +90,10 @@ optional_header:
 #endif
 
 extra_header_fields:
-	# PE specification requires ImageBase to be 64k aligned
-	.set	image_base, (LOAD_PHYSICAL_ADDR + 0xffff) & ~0xffff
 #ifdef CONFIG_X86_32
-	.long	image_base			# ImageBase
+	.long	0				# ImageBase
 #else
-	.quad	image_base			# ImageBase
+	.quad	0				# ImageBase
 #endif
 	.long	0x20				# SectionAlignment
 	.long	0x20				# FileAlignment
arch/x86/boot/tools/build.c +6 -44

100 lines not on this page · raw message

Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#10 lore raw

[tip: x86/boot] x86/boot: Omit compression buffer from PE/COFF image memory footprint

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     8eace5b3555606e684739bef5bcdfcfe68235257
Gitweb:        https://git.kernel.org/tip/8eace5b3555606e684739bef5bcdfcfe68235257
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:56 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:41 +02:00

x86/boot: Omit compression buffer from PE/COFF image memory footprint

Now that the EFI stub decompresses the kernel and hands over to the decompressed image directly, there is no longer a need to provide a decompression buffer as part of the .BSS allocation of the PE/COFF image. It also means the PE/COFF image can be loaded anywhere in memory, and setting the preferred image base is unnecessary. So drop the handling of this from the header and from the build tool.

---
 arch/x86/boot/header.S      |  6 +---
 arch/x86/boot/tools/build.c | 50 ++++--------------------------------
 2 files changed, 8 insertions(+), 48 deletions(-)
arch/x86/boot/header.S +2 -4
index b24fa50..a87d913 100644
@@ -90,12 +90,10 @@ optional_header:
 #endif
 
 extra_header_fields:
-	# PE specification requires ImageBase to be 64k aligned
-	.set	image_base, (LOAD_PHYSICAL_ADDR + 0xffff) & ~0xffff
 #ifdef CONFIG_X86_32
-	.long	image_base			# ImageBase
+	.long	0				# ImageBase
 #else
-	.quad	image_base			# ImageBase
+	.quad	0				# ImageBase
 #endif
 	.long	0x20				# SectionAlignment
 	.long	0x20				# FileAlignment
arch/x86/boot/tools/build.c +6 -44

101 lines not on this page · raw message

#11 lore raw

PATCH v2 6/15 x86/boot: Drop redundant code setting the root device

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The root device defaults to 0,0 and is no longer configurable at build time [0], so there is no need for the build tool to ever write to this field.

[0] 079f85e624189292 ("x86, build: Do not set the root_dev field in bzImage")

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/header.S      | 2 +-
 arch/x86/boot/tools/build.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
arch/x86/boot/header.S +1 -1
index a87d9133384b..6059f87b159d 100644
@@ -236,7 +236,7 @@ root_flags:	.word ROOT_RDONLY
 syssize:	.long 0			/* Filled in by build.c */
 ram_size:	.word 0			/* Obsolete */
 vid_mode:	.word SVGA_MODE
-root_dev:	.word 0			/* Filled in by build.c */
+root_dev:	.word 0			/* Default to major/minor 0/0 */
 boot_flag:	.word 0xAA55
 
 	# offset 512, entry point
arch/x86/boot/tools/build.c +0 -7
index 0354c223e354..efa4e9c7d713 100644
@@ -40,10 +40,6 @@ typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
 
-#define DEFAULT_MAJOR_ROOT 0
-#define DEFAULT_MINOR_ROOT 0
-#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)
-
 /* Minimal number of setup sectors */
 #define SETUP_SECT_MIN 5
 #define SETUP_SECT_MAX 64
@@ -399,9 +395,6 @@ int main(int argc, char ** argv)
 
 	update_pecoff_setup_and_reloc(i);
 
-	/* Set the default root device */
-	put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
-
 	/* Open and stat the kernel file */
 	fd = open(argv[2], O_RDONLY);
 	if (fd < 0)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#12 lore raw

[tip: x86/boot] x86/boot: Drop redundant code setting the root device

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     7448e8e5d15a3c4df649bf6d6d460f78396f7e1e
Gitweb:        https://git.kernel.org/tip/7448e8e5d15a3c4df649bf6d6d460f78396f7e1e
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:57 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:42 +02:00

x86/boot: Drop redundant code setting the root device

The root device defaults to 0,0 and is no longer configurable at build time [0], so there is no need for the build tool to ever write to this field.

[0] 079f85e624189292 ("x86, build: Do not set the root_dev field in bzImage")

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/header.S      | 2 +-
 arch/x86/boot/tools/build.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
arch/x86/boot/header.S +1 -1
index a87d913..6059f87 100644
@@ -236,7 +236,7 @@ root_flags:	.word ROOT_RDONLY
 syssize:	.long 0			/* Filled in by build.c */
 ram_size:	.word 0			/* Obsolete */
 vid_mode:	.word SVGA_MODE
-root_dev:	.word 0			/* Filled in by build.c */
+root_dev:	.word 0			/* Default to major/minor 0/0 */
 boot_flag:	.word 0xAA55
 
 	# offset 512, entry point
arch/x86/boot/tools/build.c +0 -7
index 0354c22..efa4e9c 100644
@@ -40,10 +40,6 @@ typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
 
-#define DEFAULT_MAJOR_ROOT 0
-#define DEFAULT_MINOR_ROOT 0
-#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)
-
 /* Minimal number of setup sectors */
 #define SETUP_SECT_MIN 5
 #define SETUP_SECT_MAX 64
@@ -399,9 +395,6 @@ int main(int argc, char ** argv)
 
 	update_pecoff_setup_and_reloc(i);
 
-	/* Set the default root device */
-	put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
-
 	/* Open and stat the kernel file */
 	fd = open(argv[2], O_RDONLY);
 	if (fd < 0)
#13 lore raw

PATCH v2 7/15 x86/boot: Grab kernel_info offset from zoffset header directly

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Instead of parsing zoffset.h and poking the kernel_info offset value into the header from the build tool, just grab the value directly in the asm file that describes this header.

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/header.S      | 2 +-
 arch/x86/boot/tools/build.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
arch/x86/boot/header.S +1 -1
index 6059f87b159d..5575d0f06bab 100644
@@ -526,7 +526,7 @@ pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr
 
 init_size:		.long INIT_SIZE		# kernel initialization size
 handover_offset:	.long 0			# Filled in by build.c
-kernel_info_offset:	.long 0			# Filled in by build.c
+kernel_info_offset:	.long ZO_kernel_info
 
 # End of setup header #####################################################
 
arch/x86/boot/tools/build.c +0 -4
index efa4e9c7d713..660627ea6cbb 100644
@@ -59,7 +59,6 @@ static unsigned long efi32_stub_entry;
 static unsigned long efi64_stub_entry;
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
-static unsigned long kernel_info;
 static unsigned long startup_64;
 static unsigned long _end;
 
@@ -339,7 +338,6 @@ static void parse_zoffset(char *fname)
 		PARSE_ZOFS(p, efi64_stub_entry);
 		PARSE_ZOFS(p, efi_pe_entry);
 		PARSE_ZOFS(p, efi32_pe_entry);
-		PARSE_ZOFS(p, kernel_info);
 		PARSE_ZOFS(p, startup_64);
 		PARSE_ZOFS(p, _end);
 
@@ -422,8 +420,6 @@ int main(int argc, char ** argv)
 	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
 
 	efi_stub_entry_update();
-	/* Update kernel_info offset. */
-	put_unaligned_le32(kernel_info, &buf[0x268]);
 
 	crc = partial_crc32(buf, i, crc);
 	if (fwrite(buf, 1, i, dest) != i)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#14 lore raw

PATCH v2 8/15 x86/boot: Drop references to startup_64

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code.

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/Makefile      | 2 +-
 arch/x86/boot/tools/build.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
arch/x86/boot/Makefile +1 -1
index f33e45ed1437..0e98bc503699 100644
@@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
-sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
+sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
 
 quiet_cmd_zoffset = ZOFFSET $@
       cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
arch/x86/boot/tools/build.c +0 -3
index 660627ea6cbb..14ef13fe7ab0 100644
@@ -59,7 +59,6 @@ static unsigned long efi32_stub_entry;
 static unsigned long efi64_stub_entry;
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
-static unsigned long startup_64;
 static unsigned long _end;
 
 /*----------------------------------------------------------------------*/
@@ -263,7 +262,6 @@ static void efi_stub_defaults(void)
 	efi_pe_entry = 0x10;
 #else
 	efi_pe_entry = 0x210;
-	startup_64 = 0x200;
 #endif
 }
 
@@ -338,7 +336,6 @@ static void parse_zoffset(char *fname)
 		PARSE_ZOFS(p, efi64_stub_entry);
 		PARSE_ZOFS(p, efi_pe_entry);
 		PARSE_ZOFS(p, efi32_pe_entry);
-		PARSE_ZOFS(p, startup_64);
 		PARSE_ZOFS(p, _end);
 
 		p = strchr(p, '\n');
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#15 lore raw

Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

Quoted 6 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code.

Quoted 7 lines

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/Makefile      | 2 +-
 arch/x86/boot/tools/build.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

Note that this patch conflicted with a recent upstream cleanup commit:

e78d334a5470 ("x86/boot: Mark global variables as static")

It was trivial to resolve, but please double-check the result once I push out the new tip:x86/boot tree.

Thanks,

Ingo

maintainer
#16 lore raw

Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

Quoted 18 lines · Ingo Molnar
Quoted 6 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code.

Quoted 7 lines

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/Makefile      | 2 +-
 arch/x86/boot/tools/build.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
Quoted 7 lines

Note that this patch conflicted with a recent upstream cleanup commit:

e78d334a5470 ("x86/boot: Mark global variables as static")

It was trivial to resolve, but please double-check the result once I push out the new tip:x86/boot tree.

Ehm, I suspect something is going on with your workflow - did you apply my patches out of order perhaps? (/me notes that you seem to have omitted patches #7 and #9)

The patch you refer to is

commit e78d334a5470ead861590ec83158f3b17bd6c807

Author:     Arvind Sankar <[email protected]>
AuthorDate: Mon May 11 18:58:49 2020 -0400
Commit:     Ard Biesheuvel <[email protected]>
CommitDate: Thu May 14 11:11:20 2020 +0200

x86/boot: Mark global variables as static

which went into v5.7 as a late fix via the EFI tree.

#17 lore raw

Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

Quoted 23 lines · Ard Biesheuvel
Quoted 22 lines · Ingo Molnar
Quoted 6 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code.

Quoted 7 lines

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/Makefile      | 2 +-
 arch/x86/boot/tools/build.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

Note that this patch conflicted with a recent upstream cleanup commit:

e78d334a5470 ("x86/boot: Mark global variables as static")

Quoted 7 lines
Quoted 3 lines

It was trivial to resolve, but please double-check the result once I push out the new tip:x86/boot tree.

Ehm, I suspect something is going on with your workflow - did you apply my patches out of order perhaps? (/me notes that you seem to have omitted patches #7

Indeed: patch #7 was not in my inbox - nor is it in my lkml folder:

664225     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 04/15] x86/boot: Remove the 'bugger off' message
664226     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 05/15] x86/boot: Omit compression buffer from PE/COFF image memory footprint
664227     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 06/15] x86/boot: Drop redundant code setting the root device
664228     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 08/15] x86/boot: Drop references to startup_64
664229     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 10/15] x86/boot: Define setup size in linker script
664230     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 12/15] x86/boot: Construct PE/COFF .text section from assembler
664231     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 13/15] x86/boot: Drop PE/COFF .reloc section
664232     Sep 12 Ard Biesheuvel     | ├─>[PATCH v2 14/15] x86/boot: Split off PE/COFF .data section

:-/

Very weird - could it have gotten lost in the sending process, on your side?

Thanks,

Ingo

#18 lore raw

Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

Quoted 2 lines · Ingo Molnar

Very weird - could it have gotten lost in the sending process, on your side?

In any case I've dropped patch #8 from tip:x86/boot as well - the first 6 patches arrived fine and are in the intended order.

Once the boot problem has been resolved, mind resending the rest?

There are no changes in -tip that should be interfering: tip:x86/boot has an upstream base.

Thanks,

Ingo

maintainer
#19 lore raw

Re: [PATCH v2 08/15] x86/boot: Drop references to startup_64

Quoted 7 lines · Ingo Molnar
Quoted 2 lines · Ingo Molnar

Very weird - could it have gotten lost in the sending process, on your side?

Lore does have them but I have no idea whose end caused this - I recently switched to Google's internal infrastructure for outgoing GIT email as our network does not permit outgoing SMTP to kernel.org but this is the first time I heard of a potential issue of this nature.

https://lore.kernel.org/linux-efi/[email protected]/T/#u
https://lore.kernel.org/linux-efi/[email protected]/T/#u

Quoted 8 lines

In any case I've dropped patch #8 from tip:x86/boot as well - the first 6 patches arrived fine and are in the intended order.

Once the boot problem has been resolved, mind resending the rest?

There are no changes in -tip that should be interfering: tip:x86/boot has an upstream base.

Yeah I'll respin and resend. Thanks.

merge bot Applied
#20 lore raw

[tip: x86/boot] x86/boot: Drop references to startup_64

In reply to Ard Biesheuvel
The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     b618d31f112bea3d2daea19190d63e567f32a4db
Gitweb:        https://git.kernel.org/tip/b618d31f112bea3d2daea19190d63e567f32a4db
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:00:59 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:42 +02:00

x86/boot: Drop references to startup_64

The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code.

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/Makefile      | 2 +-
 arch/x86/boot/tools/build.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
arch/x86/boot/Makefile +1 -1
index f33e45e..0e98bc5 100644
@@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
-sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
+sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
 
 quiet_cmd_zoffset = ZOFFSET $@
       cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
arch/x86/boot/tools/build.c +0 -3
index efa4e9c..10b0207 100644
@@ -60,7 +60,6 @@ static unsigned long efi64_stub_entry;
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
 static unsigned long kernel_info;
-static unsigned long startup_64;
 static unsigned long _end;
 
 /*----------------------------------------------------------------------*/
@@ -264,7 +263,6 @@ static void efi_stub_defaults(void)
 	efi_pe_entry = 0x10;
 #else
 	efi_pe_entry = 0x210;
-	startup_64 = 0x200;
 #endif
 }
 
@@ -340,7 +338,6 @@ static void parse_zoffset(char *fname)
 		PARSE_ZOFS(p, efi_pe_entry);
 		PARSE_ZOFS(p, efi32_pe_entry);
 		PARSE_ZOFS(p, kernel_info);
-		PARSE_ZOFS(p, startup_64);
 		PARSE_ZOFS(p, _end);
 
 		p = strchr(p, '\n');
#21 lore raw

PATCH v2 9/15 x86/boot: Set EFI handover offset directly in header asm

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The offsets of the EFI handover entrypoints are available to the assembler when constructing the header, so there is no need to set them from the build tool afterwards.

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/header.S      | 18 ++++++++++++++-
 arch/x86/boot/tools/build.c | 24 --------------------
 2 files changed, 17 insertions(+), 25 deletions(-)
arch/x86/boot/header.S +17 -1
index 5575d0f06bab..72744ba440f6 100644
@@ -524,8 +524,24 @@ pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr
 # define INIT_SIZE VO_INIT_SIZE
 #endif
 
+	.macro		__handover_offset
+#ifndef CONFIG_EFI_HANDOVER_PROTOCOL
+	.long		0
+#elif !defined(CONFIG_X86_64)
+	.long		ZO_efi32_stub_entry
+#else
+	/* Yes, this is really how we defined it :( */
+	.long		ZO_efi64_stub_entry - 0x200
+#ifdef CONFIG_EFI_MIXED
+	.if		ZO_efi32_stub_entry != ZO_efi64_stub_entry - 0x200
+	.error		"32-bit and 64-bit EFI entry points do not match"
+	.endif
+#endif
+#endif
+	.endm
+
 init_size:		.long INIT_SIZE		# kernel initialization size
-handover_offset:	.long 0			# Filled in by build.c
+handover_offset:	__handover_offset
 kernel_info_offset:	.long ZO_kernel_info
 
 # End of setup header #####################################################
arch/x86/boot/tools/build.c +0 -24
index 14ef13fe7ab0..069497543164 100644
@@ -55,8 +55,6 @@ u8 buf[SETUP_SECT_MAX*512];
 #define PECOFF_COMPAT_RESERVE 0x0
 #endif
 
-static unsigned long efi32_stub_entry;
-static unsigned long efi64_stub_entry;
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
 static unsigned long _end;
@@ -265,31 +263,12 @@ static void efi_stub_defaults(void)
 #endif
 }
 
-static void efi_stub_entry_update(void)
-{
-	unsigned long addr = efi32_stub_entry;
-
-#ifdef CONFIG_EFI_HANDOVER_PROTOCOL
-#ifdef CONFIG_X86_64
-	/* Yes, this is really how we defined it :( */
-	addr = efi64_stub_entry - 0x200;
-#endif
-
-#ifdef CONFIG_EFI_MIXED
-	if (efi32_stub_entry != addr)
-		die("32-bit and 64-bit EFI entry points do not match\n");
-#endif
-#endif
-	put_unaligned_le32(addr, &buf[0x264]);
-}
-
 #else
 
 static inline void update_pecoff_setup_and_reloc(unsigned int size) {}
 static inline void update_pecoff_text(unsigned int text_start,
 				      unsigned int file_sz) {}
 static inline void efi_stub_defaults(void) {}
-static inline void efi_stub_entry_update(void) {}
 
 static inline int reserve_pecoff_reloc_section(int c)
 {
@@ -332,8 +311,6 @@ static void parse_zoffset(char *fname)
 	p = (char *)buf;
 
 	while (p && *p) {
-		PARSE_ZOFS(p, efi32_stub_entry);
-		PARSE_ZOFS(p, efi64_stub_entry);
 		PARSE_ZOFS(p, efi_pe_entry);
 		PARSE_ZOFS(p, efi32_pe_entry);
 		PARSE_ZOFS(p, _end);
@@ -416,7 +393,6 @@ int main(int argc, char ** argv)
 
 	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
 
-	efi_stub_entry_update();
 
 	crc = partial_crc32(buf, i, crc);
 	if (fwrite(buf, 1, i, dest) != i)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#22 lore raw

PATCH v2 10/15 x86/boot: Define setup size in linker script

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The setup block contains the real mode startup code that is used when booting from a legacy BIOS, along with the boot_params/setup_data that is used by legacy x86 bootloaders to pass the command line and initial ramdisk parameters, among other things.

The setup block also contains the PE/COFF header of the entire combined image, which includes the compressed kernel image, the decompressor and the EFI stub.

This PE header describes the layout of the executable image in memory, and currently, the fact that the setup block precedes it makes it rather fiddly to get the right values into the right place in the final image.

Let's make things a bit easier by defining the setup_size in the linker script so it can be referenced from the asm code directly, rather than having to rely on the build tool to calculate it. For the time being, add 64 bytes of fixed padding for the .reloc and .compat sections - this will be removed in a subsequent patch after the PE/COFF header has been reorganized.

This change has no impact on the resulting bzImage binary when configured with CONFIG_EFI_MIXED=y.

---
 arch/x86/boot/header.S      | 2 +-
 arch/x86/boot/setup.ld      | 4 ++++
 arch/x86/boot/tools/build.c | 6 ------
 3 files changed, 5 insertions(+), 7 deletions(-)
arch/x86/boot/header.S +1 -1
index 72744ba440f6..06bd72a324c1 100644
@@ -231,7 +231,7 @@ sentinel:	.byte 0xff, 0xff        /* Used to detect broken loaders */
 
 	.globl	hdr
 hdr:
-setup_sects:	.byte 0			/* Filled in by build.c */
+		.byte setup_sects - 1
 root_flags:	.word ROOT_RDONLY
 syssize:	.long 0			/* Filled in by build.c */
 ram_size:	.word 0			/* Obsolete */
arch/x86/boot/setup.ld +4 -0
index b11c45b9e51e..ae2b5046a0db 100644
@@ -39,6 +39,10 @@ SECTIONS
 	.signature	: {
 		setup_sig = .;
 		LONG(0x5a5aaa55)
+
+		/* reserve some extra space for the reloc and compat sections */
+		setup_size = ABSOLUTE(ALIGN(. + 64, 512));
+		setup_sects = ABSOLUTE(setup_size / 512);
 	}
 
 
arch/x86/boot/tools/build.c +0 -6
index 069497543164..745d64b6d930 100644
@@ -48,12 +48,7 @@ typedef unsigned int   u32;
 u8 buf[SETUP_SECT_MAX*512];
 
 #define PECOFF_RELOC_RESERVE 0x20
-
-#ifdef CONFIG_EFI_MIXED
 #define PECOFF_COMPAT_RESERVE 0x20
-#else
-#define PECOFF_COMPAT_RESERVE 0x0
-#endif
 
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
@@ -388,7 +383,6 @@ int main(int argc, char ** argv)
 #endif
 
 	/* Patch the setup code with the appropriate size parameters */
-	buf[0x1f1] = setup_sectors-1;
 	put_unaligned_le32(sys_size, &buf[0x1f4]);
 
 	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
merge bot Applied
#23 lore raw

[tip: x86/boot] x86/boot: Define setup size in linker script

The following commit has been merged into the x86/boot branch of tip:

The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     988b52b207a9fe74c3699bda8c2256714926b94b
Gitweb:        https://git.kernel.org/tip/988b52b207a9fe74c3699bda8c2256714926b94b
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Tue, 12 Sep 2023 09:01:01 
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Fri, 15 Sep 2023 11:18:42 +02:00

x86/boot: Define setup size in linker script

The setup block contains the real mode startup code that is used when booting from a legacy BIOS, along with the boot_params/setup_data that is used by legacy x86 bootloaders to pass the command line and initial ramdisk parameters, among other things.

The setup block also contains the PE/COFF header of the entire combined image, which includes the compressed kernel image, the decompressor and the EFI stub.

This PE header describes the layout of the executable image in memory, and currently, the fact that the setup block precedes it makes it rather fiddly to get the right values into the right place in the final image.

Let's make things a bit easier by defining the setup_size in the linker script so it can be referenced from the asm code directly, rather than having to rely on the build tool to calculate it. For the time being, add 64 bytes of fixed padding for the .reloc and .compat sections - this will be removed in a subsequent patch after the PE/COFF header has been reorganized.

This change has no impact on the resulting bzImage binary when configured with CONFIG_EFI_MIXED=y.

---
 arch/x86/boot/header.S      | 2 +-
 arch/x86/boot/setup.ld      | 4 ++++
 arch/x86/boot/tools/build.c | 6 ------
 3 files changed, 5 insertions(+), 7 deletions(-)
arch/x86/boot/header.S +1 -1
index 6059f87..36011b2 100644
@@ -231,7 +231,7 @@ sentinel:	.byte 0xff, 0xff        /* Used to detect broken loaders */
 
 	.globl	hdr
 hdr:
-setup_sects:	.byte 0			/* Filled in by build.c */
+		.byte setup_sects - 1
 root_flags:	.word ROOT_RDONLY
 syssize:	.long 0			/* Filled in by build.c */
 ram_size:	.word 0			/* Obsolete */
arch/x86/boot/setup.ld +4 -0
index b11c45b..f125f17 100644
@@ -39,6 +39,10 @@ SECTIONS
 	.signature	: {
 		setup_sig = .;
 		LONG(0x5a5aaa55)
+
+		/* Reserve some extra space for the reloc and compat sections */
+		setup_size = ABSOLUTE(ALIGN(. + 64, 512));
+		setup_sects = ABSOLUTE(setup_size / 512);
 	}
 
 
arch/x86/boot/tools/build.c +0 -6
index 10b0207..bcbae88 100644
@@ -48,12 +48,7 @@ typedef unsigned int   u32;
 u8 buf[SETUP_SECT_MAX*512];
 
 #define PECOFF_RELOC_RESERVE 0x20
-
-#ifdef CONFIG_EFI_MIXED
 #define PECOFF_COMPAT_RESERVE 0x20
-#else
-#define PECOFF_COMPAT_RESERVE 0x0
-#endif
 
 static unsigned long efi32_stub_entry;
 static unsigned long efi64_stub_entry;
@@ -413,7 +408,6 @@ int main(int argc, char ** argv)
 #endif
 
 	/* Patch the setup code with the appropriate size parameters */
-	buf[0x1f1] = setup_sectors-1;
 	put_unaligned_le32(sys_size, &buf[0x1f4]);
 
 	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
#24 lore raw

PATCH v2 11/15 x86/boot: Derive file size from _edata symbol

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Tweak the linker script so that the value of _edata represents the decompressor binary's file size rounded up to the appropriate alignment. This removes the need to calculate it in the build tool, and will make it easier to refer to the file size from the header directly in subsequent changes to the PE header layout.

While adding _edata to the sed regex that parses the compressed vmlinux's symbol list, tweak the regex a bit for conciseness.

This change has no impact on the resulting bzImage binary when configured with CONFIG_EFI_STUB=y.

---
 arch/x86/boot/Makefile                 |  2 +-
 arch/x86/boot/compressed/vmlinux.lds.S |  3 ++
 arch/x86/boot/header.S                 |  2 +-
 arch/x86/boot/tools/build.c            | 30 +++++---------------
 4 files changed, 12 insertions(+), 25 deletions(-)
arch/x86/boot/Makefile +1 -1
index 0e98bc503699..cc04917b1ac6 100644
@@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
-sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
+sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi.._stub_entry\|efi\(32\)\?_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|_edata\|z_.*\)$$/\#define ZO_\2 0x\1/p'
 
 quiet_cmd_zoffset = ZOFFSET $@
       cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
arch/x86/boot/compressed/vmlinux.lds.S +3 -0
index 4ff6ab1b67d9..5326f3b44194 100644
@@ -47,6 +47,9 @@ SECTIONS
 		_data = . ;
 		*(.data)
 		*(.data.*)
+
+		/* add 4 bytes of extra space for a CRC-32 checksum */
+		. = ALIGN(. + 4, 0x20);
 		_edata = . ;
 	}
 	. = ALIGN(L1_CACHE_BYTES);
arch/x86/boot/header.S +1 -1
index 06bd72a324c1..34e9b35b827c 100644
@@ -233,7 +233,7 @@ sentinel:	.byte 0xff, 0xff        /* Used to detect broken loaders */
 hdr:
 		.byte setup_sects - 1
 root_flags:	.word ROOT_RDONLY
-syssize:	.long 0			/* Filled in by build.c */
+syssize:	.long ZO__edata / 16
 ram_size:	.word 0			/* Obsolete */
 vid_mode:	.word SVGA_MODE
 root_dev:	.word 0			/* Default to major/minor 0/0 */
arch/x86/boot/tools/build.c +7 -23
index 745d64b6d930..e792c6c5a634 100644
@@ -52,6 +52,7 @@ u8 buf[SETUP_SECT_MAX*512];
 
 static unsigned long efi_pe_entry;
 static unsigned long efi32_pe_entry;
+static unsigned long _edata;
 static unsigned long _end;
 
 /*----------------------------------------------------------------------*/
@@ -308,6 +309,7 @@ static void parse_zoffset(char *fname)
 	while (p && *p) {
 		PARSE_ZOFS(p, efi_pe_entry);
 		PARSE_ZOFS(p, efi32_pe_entry);
+		PARSE_ZOFS(p, _edata);
 		PARSE_ZOFS(p, _end);
 
 		p = strchr(p, '\n');
@@ -320,7 +322,6 @@ int main(int argc, char ** argv)
 {
 	unsigned int i, sz, setup_sectors;
 	int c;
-	u32 sys_size;
 	struct stat sb;
 	FILE *file, *dest;
 	int fd;
@@ -368,24 +369,14 @@ int main(int argc, char ** argv)
 		die("Unable to open `%s': %m", argv[2]);
 	if (fstat(fd, &sb))
 		die("Unable to stat `%s': %m", argv[2]);
-	sz = sb.st_size;
+	if (_edata != sb.st_size)
+		die("Unexpected file size `%s': %u != %u", argv[2], _edata,
+		    sb.st_size);
+	sz = _edata - 4;
 	kernel = mmap(NULL, sz, PROT_READ, MAP_SHARED, fd, 0);
 	if (kernel == MAP_FAILED)
 		die("Unable to mmap '%s': %m", argv[2]);
-	/* Number of 16-byte paragraphs, including space for a 4-byte CRC */
-	sys_size = (sz + 15 + 4) / 16;
-#ifdef CONFIG_EFI_STUB
-	/*
-	 * COFF requires minimum 32-byte alignment of sections, and
-	 * adding a signature is problematic without that alignment.
-	 */
-	sys_size = (sys_size + 1) & ~1;
-#endif
-
-	/* Patch the setup code with the appropriate size parameters */
-	put_unaligned_le32(sys_size, &buf[0x1f4]);
-
-	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));
+	update_pecoff_text(setup_sectors * 512, i + _edata);
 
 
 	crc = partial_crc32(buf, i, crc);
@@ -397,13 +388,6 @@ int main(int argc, char ** argv)
 	if (fwrite(kernel, 1, sz, dest) != sz)
 		die("Writing kernel failed");
 
-	/* Add padding leaving 4 bytes for the checksum */
-	while (sz++ < (sys_size*16) - 4) {
-		crc = partial_crc32_one('\0', crc);
-		if (fwrite("\0", 1, 1, dest) != 1)
-			die("Writing padding failed");
-	}
-
 	/* Write the CRC */
 	put_unaligned_le32(crc, buf);
 	if (fwrite(buf, 1, 4, dest) != 4)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#25 lore raw

PATCH v2 12/15 x86/boot: Construct PE/COFF .text section from assembler

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the size of the setup block is visible to the assembler, it is possible to populate the PE/COFF header fields from the asm code directly, instead of poking the values into the binary using the build tool. This will make it easier to reorganize the section layout without having to tweak the build tool in lockstep.

This change has no impact on the resulting bzImage binary.

---
 arch/x86/boot/header.S      | 22 +++------
 arch/x86/boot/tools/build.c | 47 --------------------
 2 files changed, 7 insertions(+), 62 deletions(-)
arch/x86/boot/header.S +7 -15
index 34e9b35b827c..2b07bc596c39 100644
@@ -75,14 +75,12 @@ optional_header:
 	.byte	0x02				# MajorLinkerVersion
 	.byte	0x14				# MinorLinkerVersion
 
-	# Filled in by build.c
-	.long	0				# SizeOfCode
+	.long	setup_size + ZO__end - 0x200	# SizeOfCode
 
 	.long	0				# SizeOfInitializedData
 	.long	0				# SizeOfUninitializedData
 
-	# Filled in by build.c
-	.long	0x0000				# AddressOfEntryPoint
+	.long	setup_size + ZO_efi_pe_entry	# AddressOfEntryPoint
 
 	.long	0x0200				# BaseOfCode
 #ifdef CONFIG_X86_32
@@ -105,10 +103,7 @@ extra_header_fields:
 	.word	0				# MinorSubsystemVersion
 	.long	0				# Win32VersionValue
 
-	#
-	# The size of the bzImage is written in tools/build.c
-	#
-	.long	0				# SizeOfImage
+	.long	setup_size + ZO__end 		# SizeOfImage
 
 	.long	0x200				# SizeOfHeaders
 	.long	0				# CheckSum
@@ -199,18 +194,15 @@ section_table:
 		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
 #endif
 
-	#
-	# The offset & size fields are filled in by build.c.
-	#
 	.ascii	".text"
 	.byte	0
 	.byte	0
 	.byte	0
-	.long	0
-	.long	0x0				# startup_{32,64}
-	.long	0				# Size of initialized data
+	.long	ZO__end
+	.long	setup_size
+	.long	ZO__edata			# Size of initialized data
 						# on disk
-	.long	0x0				# startup_{32,64}
+	.long	setup_size
 	.long	0				# PointerToRelocations
 	.long	0				# PointerToLineNumbers
 	.word	0				# NumberOfRelocations
arch/x86/boot/tools/build.c +0 -47

90 lines not on this page · raw message

Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#26 lore raw

PATCH v2 13/15 x86/boot: Drop PE/COFF .reloc section

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Ancient buggy EFI loaders may have required a .reloc section to be present at some point in time, but this has not been true for a long time so the .reloc section can just be dropped.

---
 arch/x86/boot/header.S      | 20 ------------
 arch/x86/boot/setup.ld      |  4 +--
 arch/x86/boot/tools/build.c | 34 +++-----------------
 3 files changed, 7 insertions(+), 51 deletions(-)
arch/x86/boot/header.S +0 -20
index 2b07bc596c39..9e9641e220a7 100644
@@ -155,26 +155,6 @@ section_table:
 		IMAGE_SCN_MEM_READ		| \
 		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
-	#
-	# The EFI application loader requires a relocation section
-	# because EFI applications must be relocatable. The .reloc
-	# offset & size fields are filled in by build.c.
-	#
-	.ascii	".reloc"
-	.byte	0
-	.byte	0
-	.long	0
-	.long	0
-	.long	0				# SizeOfRawData
-	.long	0				# PointerToRawData
-	.long	0				# PointerToRelocations
-	.long	0				# PointerToLineNumbers
-	.word	0				# NumberOfRelocations
-	.word	0				# NumberOfLineNumbers
-	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
-		IMAGE_SCN_MEM_READ		| \
-		IMAGE_SCN_MEM_DISCARDABLE	# Characteristics
-
 #ifdef CONFIG_EFI_MIXED
 	#
 	# The offset & size fields are filled in by build.c.
arch/x86/boot/setup.ld +2 -2
index ae2b5046a0db..9b551eacffa8 100644
@@ -40,8 +40,8 @@ SECTIONS
 		setup_sig = .;
 		LONG(0x5a5aaa55)
 
-		/* reserve some extra space for the reloc and compat sections */
-		setup_size = ABSOLUTE(ALIGN(. + 64, 512));
+		/* reserve some extra space for the compat section */
+		setup_size = ABSOLUTE(ALIGN(. + 32, 512));
 		setup_sects = ABSOLUTE(setup_size / 512);
 	}
 
arch/x86/boot/tools/build.c +5 -29
index 9712f27e32c1..faccff9743a3 100644
@@ -47,7 +47,6 @@ typedef unsigned int   u32;
 /* This must be large enough to hold the entire setup */
 u8 buf[SETUP_SECT_MAX*512];
 
-#define PECOFF_RELOC_RESERVE 0x20
 #define PECOFF_COMPAT_RESERVE 0x20
 
 static unsigned long efi32_pe_entry;
@@ -180,24 +179,13 @@ static void update_pecoff_section_header(char *section_name, u32 offset, u32 siz
 	update_pecoff_section_header_fields(section_name, offset, size, size, offset);
 }
 
-static void update_pecoff_setup_and_reloc(unsigned int size)
+static void update_pecoff_setup(unsigned int size)
 {
 	u32 setup_offset = 0x200;
-	u32 reloc_offset = size - PECOFF_RELOC_RESERVE - PECOFF_COMPAT_RESERVE;
-#ifdef CONFIG_EFI_MIXED
-	u32 compat_offset = reloc_offset + PECOFF_RELOC_RESERVE;
-#endif
-	u32 setup_size = reloc_offset - setup_offset;
+	u32 compat_offset = size - PECOFF_COMPAT_RESERVE;
+	u32 setup_size = compat_offset - setup_offset;
 
 	update_pecoff_section_header(".setup", setup_offset, setup_size);
-	update_pecoff_section_header(".reloc", reloc_offset, PECOFF_RELOC_RESERVE);
-
-	/*
-	 * Modify .reloc section contents with a single entry. The
-	 * relocation is applied to offset 10 of the relocation section.
-	 */
-	put_unaligned_le32(reloc_offset + 10, &buf[reloc_offset]);
-	put_unaligned_le32(10, &buf[reloc_offset + 4]);
 
 #ifdef CONFIG_EFI_MIXED
 	update_pecoff_section_header(".compat", compat_offset, PECOFF_COMPAT_RESERVE);
@@ -214,21 +202,10 @@ static void update_pecoff_setup_and_reloc(unsigned int size)
 #endif
 }
 
-static int reserve_pecoff_reloc_section(int c)
-{
-	/* Reserve 0x20 bytes for .reloc section */
-	memset(buf+c, 0, PECOFF_RELOC_RESERVE);
-	return PECOFF_RELOC_RESERVE;
-}
-
 #else
 
-static inline void update_pecoff_setup_and_reloc(unsigned int size) {}
+static inline void update_pecoff_setup(unsigned int size) {}
 
-static inline int reserve_pecoff_reloc_section(int c)
-{
-	return 0;
-}
 #endif /* CONFIG_EFI_STUB */
 
 static int reserve_pecoff_compat_section(int c)
@@ -307,7 +284,6 @@ int main(int argc, char ** argv)
 	fclose(file);
 
 	c += reserve_pecoff_compat_section(c);
-	c += reserve_pecoff_reloc_section(c);
 
 	/* Pad unused space with zeros */
 	setup_sectors = (c + 511) / 512;
@@ -316,7 +292,7 @@ int main(int argc, char ** argv)
 	i = setup_sectors*512;
 	memset(buf+c, 0, i-c);
 
-	update_pecoff_setup_and_reloc(i);
+	update_pecoff_setup(i);
 
 	/* Open and stat the kernel file */
 	fd = open(argv[2], O_RDONLY);
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#27 lore raw

PATCH v2 14/15 x86/boot: Split off PE/COFF .data section

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Describe the code and data of the decompressor binary using separate .text and .data PE/COFF sections, so that we will be able to map them using restricted permissions once we increase the section and file alignment sufficiently. This avoids the need for memory mappings that are writable and executable at the same time, which is something that is best avoided for security reasons.

---
 arch/x86/boot/Makefile |  2 +-
 arch/x86/boot/header.S | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)
arch/x86/boot/Makefile +1 -1
index cc04917b1ac6..3cece19b7473 100644
@@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
-sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi.._stub_entry\|efi\(32\)\?_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|_edata\|z_.*\)$$/\#define ZO_\2 0x\1/p'
+sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi.._stub_entry\|efi\(32\)\?_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|_e\?data\|z_.*\)$$/\#define ZO_\2 0x\1/p'
 
 quiet_cmd_zoffset = ZOFFSET $@
       cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
arch/x86/boot/header.S +15 -4
index 9e9641e220a7..a1f986105f00 100644
@@ -75,9 +75,9 @@ optional_header:
 	.byte	0x02				# MajorLinkerVersion
 	.byte	0x14				# MinorLinkerVersion
 
-	.long	setup_size + ZO__end - 0x200	# SizeOfCode
+	.long	ZO__data			# SizeOfCode
 
-	.long	0				# SizeOfInitializedData
+	.long	ZO__end - ZO__data		# SizeOfInitializedData
 	.long	0				# SizeOfUninitializedData
 
 	.long	setup_size + ZO_efi_pe_entry	# AddressOfEntryPoint
@@ -178,9 +178,9 @@ section_table:
 	.byte	0
 	.byte	0
 	.byte	0
-	.long	ZO__end
+	.long	ZO__data
 	.long	setup_size
-	.long	ZO__edata			# Size of initialized data
+	.long	ZO__data			# Size of initialized data
 						# on disk
 	.long	setup_size
 	.long	0				# PointerToRelocations
@@ -191,6 +191,17 @@ section_table:
 		IMAGE_SCN_MEM_READ		| \
 		IMAGE_SCN_MEM_EXECUTE		# Characteristics
 
+	.ascii	".data\0\0\0"
+	.long	ZO__end - ZO__data		# VirtualSize
+	.long	setup_size + ZO__data		# VirtualAddress
+	.long	ZO__edata - ZO__data		# SizeOfRawData
+	.long	setup_size + ZO__data		# PointerToRawData
+
+	.long	0, 0, 0
+	.long	IMAGE_SCN_CNT_INITIALIZED_DATA	| \
+		IMAGE_SCN_MEM_READ		| \
+		IMAGE_SCN_MEM_WRITE		# Characteristics
+
 	.set	section_count, (. - section_table) / 40
 #endif /* CONFIG_EFI_STUB */
 
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#28 lore raw

PATCH v2 15/15 x86/boot: Increase section and file alignment to 4k/512

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Align x86 with other EFI architectures, and increase the section alignment to the EFI page size (4k), so that firmware is able to honour the section permission attributes and map code read-only and data non-executable.

There are a number of requirements that have to be taken into account:
- the sign tools get cranky when there are gaps between sections in the file view of the image
- the virtual offset of each section must be aligned to the image's section alignment
- the file offset *and size* of each section must be aligned to the image's file alignment
- the image size must be aligned to the section alignment
- each section's virtual offset must be greater than or equal to the size of the headers.

In order to meet all these requirements, while avoiding the need for lots of padding to accommodate the .compat section, the latter is placed at an arbitrary offset towards the end of the image, but aligned to the minimum file alignment (512 bytes). The space before the .text section is therefore distributed between the PE header, the .setup section and the .compat section, leaving no gaps in the file coverage, making the signing tools happy.

---
 arch/x86/boot/compressed/vmlinux.lds.S |  4 +-
 arch/x86/boot/header.S                 | 75 +++++++++-------
 arch/x86/boot/setup.ld                 |  7 +-
 arch/x86/boot/tools/build.c            | 90 +-------------------
 4 files changed, 51 insertions(+), 125 deletions(-)
arch/x86/boot/compressed/vmlinux.lds.S +2 -2
index 5326f3b44194..3df57cdf5003 100644
@@ -43,13 +43,13 @@ SECTIONS
 		*(.rodata.*)
 		_erodata = . ;
 	}
-	.data :	{
+	.data :	ALIGN(0x1000) {
 		_data = . ;
 		*(.data)
 		*(.data.*)
 
 		/* add 4 bytes of extra space for a CRC-32 checksum */
-		. = ALIGN(. + 4, 0x20);
+		. = ALIGN(. + 4, 0x200);
 		_edata = . ;
 	}
 	. = ALIGN(L1_CACHE_BYTES);
arch/x86/boot/header.S +43 -32

117 lines not on this page · raw message

arch/x86/boot/setup.ld +4 -3
index 9b551eacffa8..02e2c0b8c094 100644
@@ -36,16 +36,17 @@ SECTIONS
 	. = ALIGN(16);
 	.data		: { *(.data*) }
 
+	.pecompat	: { *(.pecompat) }
+	PROVIDE(pecompat_fsize = setup_size - pecompat_fstart);
+
 	.signature	: {
 		setup_sig = .;
 		LONG(0x5a5aaa55)
 
-		/* reserve some extra space for the compat section */
-		setup_size = ABSOLUTE(ALIGN(. + 32, 512));
+		setup_size = ABSOLUTE(ALIGN(4096));
 		setup_sects = ABSOLUTE(setup_size / 512);
 	}
 
-
 	. = ALIGN(16);
 	.bss		:
 	{
arch/x86/boot/tools/build.c +2 -88

120 lines not on this page · raw message

Signature · 1 line
2.42.0.283.g2d96d420d3-goog
#29 lore raw
In reply to Ard Biesheuvel
Quoted 51 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

In true x86 fashion, this is a lot more complicated than on other architectures, which have implemented this code/data split with 4k alignment from the beginning. The complicating factor here is that the boot image consists of two different parts, which are stitched together and fixed up using a special build tool.

After this series is applied, the only remaining task performed by the build tool is generating the CRC-32. Even though this checksum is usually wrong (given that distro kernels are signed for secure boot in a way that corrupts the CRC), this feature is retained as we cannot be sure that nobody is relying on this.

This supersedes the work proposed by Evgeniy last year, which did a major rewrite of the build tool in order to clean it up, before updating it to generate the new 4k aligned image layout. As this series proves, the build tool is mostly unnecessary, and we have too many of those already.

Changes since v1:
- drop patch that removed the CRC and the build tool
- do not use fixed setup_size but derive it in the setup.ld linker script
- reorganize the PE header so the .compat section only covers its payload and the padding that follows it
- add hpa's ack to patch #4

Cc Evgeniy Baskov <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Peter Jones <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Gerd Hoffmann <[email protected]>
Cc Kees Cook <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Quoted 9 lines

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64

I've applied these first 8 patches to tip:x86/boot with minor edits. (Please preserve existing comment capitalization conventions ...)

Quoted 7 lines

x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script x86/boot: Derive file size from _edata symbol x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section x86/boot: Increase section and file alignment to 4k/512

The rest conflicted with recent upstream changes, and I suppose it's prudent to test these changes bit by bit anyway.

Thanks,

Ingo

#30 lore raw
Quoted 21 lines · Ingo Molnar
Quoted 9 lines

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64

I've applied these first 8 patches to tip:x86/boot with minor edits. (Please preserve existing comment capitalization conventions ...)

Quoted 7 lines

x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script x86/boot: Derive file size from _edata symbol x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section x86/boot: Increase section and file alignment to 4k/512

Quoted 2 lines

The rest conflicted with recent upstream changes, and I suppose it's prudent to test these changes bit by bit anyway.

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

I've removed it for now - but this side effect was not expected.

Thanks,

Ingo

#31 lore raw
Quoted 14 lines · Ingo Molnar
Quoted 10 lines · Ingo Molnar
Quoted 9 lines

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64

Quoted 1 line
Quoted 1 line

I've applied these first 8 patches to tip:x86/boot with minor edits.

Thanks.

Quoted 2 lines
Quoted 2 lines

(Please preserve existing comment capitalization conventions ...)

Ack

Quoted 11 lines
Quoted 10 lines
Quoted 7 lines

x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script x86/boot: Derive file size from _edata symbol x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section x86/boot: Increase section and file alignment to 4k/512

The rest conflicted with recent upstream changes, and I suppose it's prudent to test these changes bit by bit anyway.

Agreed. So you mean this conflicts with other stuff queued up in -tip already, right?

Quoted 12 lines

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

I've removed it for now - but this side effect was not expected.

No, definitely not expected. I tested various combinations of i386 / x86_64 built with GCC / Clang doing EFI or BIOS boot.

I'll rebase the remaining stuff onto -tip and see if I can reproduce this.

maintainer
#32 lore raw
Quoted 50 lines · Ard Biesheuvel
Quoted 14 lines · Ingo Molnar
Quoted 10 lines · Ingo Molnar
Quoted 9 lines

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64

Quoted 1 line
Quoted 1 line

I've applied these first 8 patches to tip:x86/boot with minor edits.

Thanks.

Quoted 2 lines
Quoted 2 lines

(Please preserve existing comment capitalization conventions ...)

Ack

Quoted 11 lines
Quoted 10 lines
Quoted 7 lines

x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script x86/boot: Derive file size from _edata symbol x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section x86/boot: Increase section and file alignment to 4k/512

The rest conflicted with recent upstream changes, and I suppose it's prudent to test these changes bit by bit anyway.

Agreed. So you mean this conflicts with other stuff queued up in -tip already, right?

Quoted 10 lines

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

Quoted 7 lines
Quoted 2 lines

I've removed it for now - but this side effect was not expected.

No, definitely not expected. I tested various combinations of i386 / x86_64 built with GCC / Clang doing EFI or BIOS boot.

I'll rebase the remaining stuff onto -tip and see if I can reproduce this.

This is actually quite bizarre. x86_64_defconfig has CONFIG_EFI_MIXED=y and i tested that this change produces the exact same bzImage binary in that case.

Could you send me the .config and the QEMU command line perhaps?

#33 lore raw
Quoted 16 lines · Ard Biesheuvel
Quoted 16 lines
Quoted 12 lines

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

I've removed it for now - but this side effect was not expected.

No, definitely not expected. I tested various combinations of i386 / x86_64 built with GCC / Clang doing EFI or BIOS boot.

Quoted 7 lines
Quoted 1 line

I'll rebase the remaining stuff onto -tip and see if I can reproduce this.

This is actually quite bizarre. x86_64_defconfig has CONFIG_EFI_MIXED=y and i tested that this change produces the exact same bzImage binary in that case.

Could you send me the .config and the QEMU command line perhaps?

So the patch below is the delta between v2 and v3 - that is expected to fix the bzImage boot crash, right?

Thanks,

Ingo

arch/x86/boot/setup.ld +1 -1
@@ -41,7 +41,7 @@ SECTIONS
 		LONG(0x5a5aaa55)
 
 		/* Reserve some extra space for the reloc and compat sections */
-		setup_size = ABSOLUTE(ALIGN(. + 64, 512));
+		setup_size = ALIGN(ABSOLUTE(.) + 64, 512);
 		setup_sects = ABSOLUTE(setup_size / 512);
 	}
 
maintainer
#34 lore raw
Quoted 22 lines · Ingo Molnar
Quoted 18 lines · Ard Biesheuvel
Quoted 17 lines
Quoted 12 lines

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

I've removed it for now - but this side effect was not expected.

No, definitely not expected. I tested various combinations of i386 / x86_64 built with GCC / Clang doing EFI or BIOS boot.

I'll rebase the remaining stuff onto -tip and see if I can reproduce this.

Quoted 9 lines
Quoted 5 lines

This is actually quite bizarre. x86_64_defconfig has CONFIG_EFI_MIXED=y and i tested that this change produces the exact same bzImage binary in that case.

Could you send me the .config and the QEMU command line perhaps?

So the patch below is the delta between v2 and v3 - that is expected to fix the bzImage boot crash, right?

Yes.

ld.bfd does something unexpected [to me] here, and the resulting value turns out not to be a multiple of 512 at all.

With this tweak, my claim that this patch does not affect the binary bzImage at all actually holds for ld.bfd as well (provided that CONFIG_EFI_MIXED=y and CONFIG_LOCAL_VERSION_AUTO is disabled)

So if this still does not work in your test, could you please disable CONFIG_LOCAL_VERSION_AUTO and compare the md5sums of the two builds?

Thanks,

Quoted 12 lines
arch/x86/boot/setup.ld +1 -1
@@ -41,7 +41,7 @@ SECTIONS
                LONG(0x5a5aaa55)
 
                /* Reserve some extra space for the reloc and compat sections */
-               setup_size = ABSOLUTE(ALIGN(. + 64, 512));
+               setup_size = ALIGN(ABSOLUTE(.) + 64, 512);
                setup_sects = ABSOLUTE(setup_size / 512);
        }
 
#35 lore raw
Quoted 33 lines · Ard Biesheuvel
Quoted 22 lines · Ingo Molnar
Quoted 18 lines · Ard Biesheuvel
Quoted 17 lines
Quoted 12 lines

So, the first 8 patches broke the x86-64-defconfig-ish Qemu bzImage bootup, due to the 8th patch:

988b52b207a9fe74c3699bda8c2256714926b94b is the first bad commit commit 988b52b207a9fe74c3699bda8c2256714926b94b
Author: Ard Biesheuvel <[email protected]>
Date: Tue Sep 12 09:01:01 2023 +0000

x86/boot: Define setup size in linker script

I've removed it for now - but this side effect was not expected.

No, definitely not expected. I tested various combinations of i386 / x86_64 built with GCC / Clang doing EFI or BIOS boot.

I'll rebase the remaining stuff onto -tip and see if I can reproduce this.

Quoted 9 lines
Quoted 5 lines

This is actually quite bizarre. x86_64_defconfig has CONFIG_EFI_MIXED=y and i tested that this change produces the exact same bzImage binary in that case.

Could you send me the .config and the QEMU command line perhaps?

So the patch below is the delta between v2 and v3 - that is expected to fix the bzImage boot crash, right?

Quoted 8 lines

Yes.

ld.bfd does something unexpected [to me] here, and the resulting value turns out not to be a multiple of 512 at all.

With this tweak, my claim that this patch does not affect the binary bzImage at all actually holds for ld.bfd as well (provided that CONFIG_EFI_MIXED=y and CONFIG_LOCAL_VERSION_AUTO is disabled)

Ok - it boots & works fine for me too now, with the full series applied.

Thanks,

Ingo

#36 lore raw
In reply to Ard Biesheuvel
Quoted 8 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Quoted 5 lines

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

This split is also useful for the work of kexecing the next kernel as an EFI application. With the current EFI stub I have to set the memory both writable and executable which results in W^X warnings with a default config.

What made this more confusing was that the flags of the .text section in current EFI stub bzImages are set to
IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ. So if you load that section according to those flags the EFI stub will quickly run into issues.

I assume current firmware on x86 machines does not set any restricted permissions on the memory. Can someone enlighten me on their behavior?

Quoted 66 lines

In true x86 fashion, this is a lot more complicated than on other architectures, which have implemented this code/data split with 4k alignment from the beginning. The complicating factor here is that the boot image consists of two different parts, which are stitched together and fixed up using a special build tool.

After this series is applied, the only remaining task performed by the build tool is generating the CRC-32. Even though this checksum is usually wrong (given that distro kernels are signed for secure boot in a way that corrupts the CRC), this feature is retained as we cannot be sure that nobody is relying on this.

This supersedes the work proposed by Evgeniy last year, which did a major rewrite of the build tool in order to clean it up, before updating it to generate the new 4k aligned image layout. As this series proves, the build tool is mostly unnecessary, and we have too many of those already.

Changes since v1:
- drop patch that removed the CRC and the build tool
- do not use fixed setup_size but derive it in the setup.ld linker script
- reorganize the PE header so the .compat section only covers its payload and the padding that follows it
- add hpa's ack to patch #4

Cc Evgeniy Baskov <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Peter Jones <[email protected]>
Cc Matthew Garrett <[email protected]>
Cc Gerd Hoffmann <[email protected]>
Cc Kees Cook <[email protected]>
Cc "H. Peter Anvin" <[email protected]>

Ard Biesheuvel (15):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint x86/boot: Drop redundant code setting the root device x86/boot: Grab kernel_info offset from zoffset header directly x86/boot: Drop references to startup_64
x86/boot: Set EFI handover offset directly in header asm x86/boot: Define setup size in linker script
x86/boot: Derive file size from _edata symbol
x86/boot: Construct PE/COFF .text section from assembler x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section
x86/boot: Increase section and file alignment to 4k/512

 arch/x86/boot/Makefile                  |   2 +-
 arch/x86/boot/compressed/vmlinux.lds.S  |   6 +-
 arch/x86/boot/header.S                  | 213 ++++++---------
 arch/x86/boot/setup.ld                  |  14 +-
 arch/x86/boot/tools/build.c             | 273 +-------------------
 drivers/firmware/efi/libstub/Makefile   |   7 -
 drivers/firmware/efi/libstub/x86-stub.c |  46 +---
 7 files changed, 114 insertions(+), 447 deletions(-)
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
maintainer
#37 lore raw
Quoted 21 lines · Jan Hendrik Farr
Quoted 8 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Quoted 5 lines

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

This split is also useful for the work of kexecing the next kernel as an EFI application. With the current EFI stub I have to set the memory both writable and executable which results in W^X warnings with a default config.

Quoted 8 lines

What made this more confusing was that the flags of the .text section in current EFI stub bzImages are set to
IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ. So if you load that section according to those flags the EFI stub will quickly run into issues.

I assume current firmware on x86 machines does not set any restricted permissions on the memory. Can someone enlighten me on their behavior?

No current x86 firmware does not use restricted permissions at all. All memory is mapped with both writable and executable permissions, except maybe the stack.

The x86 Linux kernel has been depending on this behavior too, up until recently (fixes are in -rc now for the v6.6 release). Before this, it would copy its own executable image around in memory.

So EFI based kexec will need to support this behavior if it targets older x86 kernels, although I am skeptical that this is a useful design goal.

I have been experimenting with running the EFI stub code in user space all the way until ExitBootServices(). The same might work for UKI if it is layered cleanly on top of the EFI APIs (rather than poking into system registers or page tables under the hood).

How this would work with signed images etc is TBD but I quite like the idea of running everything in user space and having a minimal purgatory (or none at all) if we can simply populate the entire address space while running unprivileged, and just branch to it in the kexec() syscall. I imagine this being something like a userspace helper that is signed/trusted itself, and gets invoked by the kernel to run EFI images that are trusted and tagged as being executable unprivileged.

#38 lore raw
Quoted 35 lines · Ard Biesheuvel
Quoted 21 lines · Jan Hendrik Farr
Quoted 8 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Quoted 5 lines

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

This split is also useful for the work of kexecing the next kernel as an EFI application. With the current EFI stub I have to set the memory both writable and executable which results in W^X warnings with a default config.

Quoted 8 lines

What made this more confusing was that the flags of the .text section in current EFI stub bzImages are set to
IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ. So if you load that section according to those flags the EFI stub will quickly run into issues.

I assume current firmware on x86 machines does not set any restricted permissions on the memory. Can someone enlighten me on their behavior?

No current x86 firmware does not use restricted permissions at all. All memory is mapped with both writable and executable permissions, except maybe the stack.

Quoted 7 lines

The x86 Linux kernel has been depending on this behavior too, up until recently (fixes are in -rc now for the v6.6 release). Before this, it would copy its own executable image around in memory.

So EFI based kexec will need to support this behavior if it targets older x86 kernels, although I am skeptical that this is a useful design goal.

I don't see this as an important goal either.

Quoted 5 lines

I have been experimenting with running the EFI stub code in user space all the way until ExitBootServices(). The same might work for UKI if it is layered cleanly on top of the EFI APIs (rather than poking into system registers or page tables under the hood).

Quoted 8 lines

How this would work with signed images etc is TBD but I quite like the idea of running everything in user space and having a minimal purgatory (or none at all) if we can simply populate the entire address space while running unprivileged, and just branch to it in the kexec() syscall. I imagine this being something like a userspace helper that is signed/trusted itself, and gets invoked by the kernel to run EFI images that are trusted and tagged as being executable unprivileged.

I've been experimenting with running EFI apps inside kernel space instead. This is the more natural approach for signed images. Sure, a malicious EFI app could do arbitrary stuff in kernel mode, but they're signed. On the other hand running this entirely in user space would at least guarantee that the system can not crash due to a misbehaving EFI app (at least until ExitBootServices()).

The question of whether or not to make this the job of a userspace helper that is signed must have come up when kexec_file_load syscall was added. It would have also been an option at the time to extend trust to a signed version of the userspace kexec tool.

Why was kexec_file_load created instead of restricting kexec_load to a signed version of the kexec userspace tool?

#39 lore raw
Quoted 68 lines · Jan Hendrik Farr
Quoted 35 lines · Ard Biesheuvel
Quoted 21 lines · Jan Hendrik Farr
Quoted 8 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Quoted 5 lines

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

This split is also useful for the work of kexecing the next kernel as an EFI application. With the current EFI stub I have to set the memory both writable and executable which results in W^X warnings with a default config.

Quoted 8 lines

What made this more confusing was that the flags of the .text section in current EFI stub bzImages are set to
IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ. So if you load that section according to those flags the EFI stub will quickly run into issues.

I assume current firmware on x86 machines does not set any restricted permissions on the memory. Can someone enlighten me on their behavior?

No current x86 firmware does not use restricted permissions at all. All memory is mapped with both writable and executable permissions, except maybe the stack.

Quoted 7 lines

The x86 Linux kernel has been depending on this behavior too, up until recently (fixes are in -rc now for the v6.6 release). Before this, it would copy its own executable image around in memory.

So EFI based kexec will need to support this behavior if it targets older x86 kernels, although I am skeptical that this is a useful design goal.

I don't see this as an important goal either.

Quoted 5 lines

I have been experimenting with running the EFI stub code in user space all the way until ExitBootServices(). The same might work for UKI if it is layered cleanly on top of the EFI APIs (rather than poking into system registers or page tables under the hood).

Quoted 8 lines

How this would work with signed images etc is TBD but I quite like the idea of running everything in user space and having a minimal purgatory (or none at all) if we can simply populate the entire address space while running unprivileged, and just branch to it in the kexec() syscall. I imagine this being something like a userspace helper that is signed/trusted itself, and gets invoked by the kernel to run EFI images that are trusted and tagged as being executable unprivileged.

I've been experimenting with running EFI apps inside kernel space instead. This is the more natural approach for signed images. Sure, a malicious EFI app could do arbitrary stuff in kernel mode, but they're signed. On the other hand running this entirely in user space would at least guarantee that the system can not crash due to a misbehaving EFI app (at least until ExitBootServices()).

Quoted 7 lines

The question of whether or not to make this the job of a userspace helper that is signed must have come up when kexec_file_load syscall was added. It would have also been an option at the time to extend trust to a signed version of the userspace kexec tool.

Why was kexec_file_load created instead of restricting kexec_load to a signed version of the kexec userspace tool?

I think one of the reasons is that it is hard to handle dynamic linked libraries, not only the kexec-tools binary.

Thanks
Dave

#40 lore raw
Quoted 75 lines · Dave Young
Quoted 73 lines · Jan Hendrik Farr
Quoted 35 lines · Ard Biesheuvel
Quoted 21 lines · Jan Hendrik Farr
Quoted 8 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Now that the EFI stub boot flow no longer relies on memory that is executable and writable at the same time, we can reorganize the PE/COFF view of the kernel image and expose the decompressor binary's code and r/o data as a .text section and data/bss as a .data section, using 4k alignment and limited permissions.

Quoted 5 lines

Doing so is necessary for compatibility with hardening measures that are being rolled out on x86 PCs built to run Windows (i.e., the majority of them). The EFI boot environment that the Linux EFI stub executes in is especially sensitive to safety issues, given that a vulnerability in the loader of one OS can be abused to attack another.

This split is also useful for the work of kexecing the next kernel as an EFI application. With the current EFI stub I have to set the memory both writable and executable which results in W^X warnings with a default config.

Quoted 8 lines

What made this more confusing was that the flags of the .text section in current EFI stub bzImages are set to
IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ. So if you load that section according to those flags the EFI stub will quickly run into issues.

I assume current firmware on x86 machines does not set any restricted permissions on the memory. Can someone enlighten me on their behavior?

No current x86 firmware does not use restricted permissions at all. All memory is mapped with both writable and executable permissions, except maybe the stack.

Quoted 7 lines

The x86 Linux kernel has been depending on this behavior too, up until recently (fixes are in -rc now for the v6.6 release). Before this, it would copy its own executable image around in memory.

So EFI based kexec will need to support this behavior if it targets older x86 kernels, although I am skeptical that this is a useful design goal.

I don't see this as an important goal either.

Quoted 5 lines

I have been experimenting with running the EFI stub code in user space all the way until ExitBootServices(). The same might work for UKI if it is layered cleanly on top of the EFI APIs (rather than poking into system registers or page tables under the hood).

Quoted 8 lines

How this would work with signed images etc is TBD but I quite like the idea of running everything in user space and having a minimal purgatory (or none at all) if we can simply populate the entire address space while running unprivileged, and just branch to it in the kexec() syscall. I imagine this being something like a userspace helper that is signed/trusted itself, and gets invoked by the kernel to run EFI images that are trusted and tagged as being executable unprivileged.

I've been experimenting with running EFI apps inside kernel space instead. This is the more natural approach for signed images. Sure, a malicious EFI app could do arbitrary stuff in kernel mode, but they're signed. On the other hand running this entirely in user space would at least guarantee that the system can not crash due to a misbehaving EFI app (at least until ExitBootServices()).

The question of whether or not to make this the job of a userspace helper that is signed must have come up when kexec_file_load syscall was added. It would have also been an option at the time to extend trust to a signed version of the userspace kexec tool.

Quoted 5 lines
Quoted 2 lines

Why was kexec_file_load created instead of restricting kexec_load to a signed version of the kexec userspace tool?

I think one of the reasons is that it is hard to handle dynamic linked libraries, not only the kexec-tools binary.

Hmm, another one is that ptrace needs to be disabled in some way, anyway I think it is way too complicated, but I do not remember the details, added Vivek in cc.
See this article: https://lwn.net/Articles/532778/

Quoted 3 lines

Thanks
Dave