linux: implement LoadFile2 initrd loading
Ard Biesheuvel
maintainercover linux: implement LoadFile2 initrd loading
This implements the LoadFile2 initrd loading protocol, which is essentially a callback interface into the bootloader to load the initrd data into a caller provided buffer. This means the bootloader no longer has to contain any policy regarding where to load the initrd (which differs between architectures and kernel versions) and no longer has to manipulate arch specific data structures such as DT or struct bootparams to inform the OS where the initrd resides in memory. This is especially relevant for the upcoming LoongArch support, which does not use either DT or struct bootparams, and would have to rely on the initrd= command line interface, which is deprecated and of limited utility [0].
Sample output from booting a recent Linux/arm64 kernel:
grub> insmod part_msdos
grub> linux (hd0,msdos1)/Image
grub> initrd (hd0,msdos1)/initrd.img
grub> boot
EFI stub: Booting Linux Kernel...
EFI stub: EFI_RNG_PROTOCOL unavailable, KASLR will be disabled EFI stub: Generating empty DTB
EFI stub: Loaded initrd from LINUX_EFI_INITRD_MEDIA_GUID device path EFI stub: Exiting boot services and installing virtual address map...
[ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x411fd070]
This is mostly a resend of my original v2 [1], although I did cherry-pick Nikita's version of the first patch, which incorporates Heinrich's suggestion to simply drop the argv[] argument from grub_initrd_load(). I also included the patch I sent out the other day to remove the pointless header magic number check, and included a fix for the PXE boot issue reported by dann [2].
[0] The initrd= command line loader can only access files that reside on the same volume as the loaded image, which means GRUB would have to present this volume abstraction in order to serve the initrd file. Another reason why this method is problematic is generic EFI zboot, which is being added to Linux, and which calls loadimage on another, embedded PE/COFF image which would also need to expose this volume abstraction.
[1] https://lists.gnu.org/archive/html/grub-devel/2020-10/msg00124.html
[2] https://lists.gnu.org/archive/html/grub-devel/2022-04/msg00055.html
Ard Biesheuvel (8):
efi: move MS-DOS stub out of generic PE header definition arm64/linux: Remove magic number header field check linux/arm: unify ARM/arm64 vs Xen PE/COFF header handling linux/arm: account for COFF headers appearing at unexpected offsets
efi: add definition of LoadFile2 protocol
efi/efinet: Don't close connections at fini_hw() time
efi: implement LoadFile2 initrd loading protocol for Linux
linux: ignore FDT unless we need to modify it
Nikita Ermakov (1):
loader: drop argv[] argument in grub_initrd_load()
grub-core/commands/efi/lsefi.c | 1 + grub-core/kern/efi/efi.c | 5 +- grub-core/loader/arm/linux.c | 2 +- grub-core/loader/arm64/linux.c | 181 +++++++++++++++++--- grub-core/loader/arm64/xen_boot.c | 23 +-- grub-core/loader/efi/fdt.c | 7 +- grub-core/loader/i386/linux.c | 2 +- grub-core/loader/i386/pc/linux.c | 2 +- grub-core/loader/i386/xen.c | 3 +- grub-core/loader/ia64/efi/linux.c | 2 +- grub-core/loader/linux.c | 4 +- grub-core/loader/mips/linux.c | 2 +- grub-core/loader/powerpc/ieee1275/linux.c | 2 +- grub-core/loader/sparc64/ieee1275/linux.c | 2 +- grub-core/net/drivers/efi/efinet.c | 10 +- grub-core/net/net.c | 2 +- include/grub/arm/linux.h | 7 +- include/grub/arm64/linux.h | 5 +- include/grub/efi/api.h | 15 ++ include/grub/efi/efi.h | 4 +- include/grub/efi/pe32.h | 5 +- include/grub/linux.h | 2 +- include/grub/net.h | 3 +- 23 files changed, 226 insertions(+), 65 deletions(-)
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 1/9 loader: drop argv[] argument in grub_initrd_load()
From: Nikita Ermakov <[email protected]>
In the case of an error grub_initrd_load() uses argv[] to print the filename that caused the error. It is also possible to obtain the filename from the file handles and there is no need to duplicate that information in argv[], so let's drop it.
--- grub-core/loader/arm/linux.c | 2 +- grub-core/loader/arm64/linux.c | 2 +- grub-core/loader/i386/linux.c | 2 +- grub-core/loader/i386/pc/linux.c | 2 +- grub-core/loader/i386/xen.c | 3 +-- grub-core/loader/ia64/efi/linux.c | 2 +- grub-core/loader/linux.c | 4 ++-- grub-core/loader/mips/linux.c | 2 +- grub-core/loader/powerpc/ieee1275/linux.c | 2 +- grub-core/loader/sparc64/ieee1275/linux.c | 2 +- include/grub/linux.h | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-)
grub-core/loader/arm/linux.c +1 -1
@@ -422,7 +422,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_dprintf ("loader" ,"Loading initrd to 0x%08x\n" , (grub_addr_t ) initrd_start); -if (grub_initrd_load (&initrd_ctx, argv, (void *) initrd_start)) +if (grub_initrd_load (&initrd_ctx, (void *) initrd_start)) goto fail; initrd_end = initrd_start + size;
grub-core/loader/arm64/linux.c +1 -1
@@ -266,7 +266,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), goto fail; } -if (grub_initrd_load (&initrd_ctx, argv, initrd_mem)) +if (grub_initrd_load (&initrd_ctx, initrd_mem)) goto fail; initrd_start = (grub_addr_t ) initrd_mem;
grub-core/loader/i386/linux.c +1 -1
@@ -1107,7 +1107,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), initrd_mem_target =get_physical_target_address (ch); } -if (grub_initrd_load (&initrd_ctx, argv, initrd_mem)) +if (grub_initrd_load (&initrd_ctx, initrd_mem)) goto fail; grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
grub-core/loader/i386/pc/linux.c +1 -1
@@ -462,7 +462,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), initrd_addr =get_physical_target_address (ch); } -if (grub_initrd_load (&initrd_ctx, argv, initrd_chunk)) +if (grub_initrd_load (&initrd_ctx, initrd_chunk)) goto fail; lh->ramdisk_image = initrd_addr;
grub-core/loader/i386/xen.c +1 -2
@@ -809,8 +809,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),if (err) goto fail; -if (grub_initrd_load (&initrd_ctx, argv, -get_virtual_current_address (ch))) +if (grub_initrd_load (&initrd_ctx,get_virtual_current_address (ch))) goto fail; }
grub-core/loader/ia64/efi/linux.c +1 -1
@@ -563,7 +563,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_dprintf ("linux" ,"[addr=0x%lx, size=0x%lx]\n" , (grub_uint64_t ) initrd_mem, initrd_size); -if (grub_initrd_load (&initrd_ctx, argv, initrd_mem)) +if (grub_initrd_load (&initrd_ctx, initrd_mem)) goto fail; fail:grub_initrd_close (&initrd_ctx);
grub-core/loader/linux.c +2 -2
@@ -271,7 +271,7 @@ grub_initrd_close (struct grub_linux_initrd_context *initrd_ctx)grub_err_t grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, -char *argv[],void *target) +void *target) {grub_uint8_t *ptr = target;int i;
@@ -317,7 +317,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, {if (!grub_errno)grub_error (GRUB_ERR_FILE_READ_ERROR ,N_ ("premature end of file %s" ), - argv[i]); + initrd_ctx->components[i].file->name);grub_initrd_close (initrd_ctx);return grub_errno; }
grub-core/loader/mips/linux.c +1 -1
@@ -452,7 +452,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), initrd_dest =get_physical_target_address (ch) |0x80000000 ; } -if (grub_initrd_load (&initrd_ctx, argv, initrd_src)) +if (grub_initrd_load (&initrd_ctx, initrd_src)) goto fail;#ifdef GRUB_MACHINE_MIPS_QEMU_MIPS
grub-core/loader/powerpc/ieee1275/linux.c +1 -1
@@ -349,7 +349,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_dprintf ("loader" ,"Loading initrd at 0x%x, size 0x%x\n" , addr, size); -if (grub_initrd_load (&initrd_ctx, argv, (void *) addr)) +if (grub_initrd_load (&initrd_ctx, (void *) addr)) goto fail; initrd_addr = addr;
grub-core/loader/sparc64/ieee1275/linux.c +1 -1
@@ -413,7 +413,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_dprintf ("loader" ,"Loading initrd at vaddr 0x%lx, paddr 0x%lx, size 0x%lx\n" , addr, paddr, size); -if (grub_initrd_load (&initrd_ctx, argv, (void *) addr)) +if (grub_initrd_load (&initrd_ctx, (void *) addr)) goto fail; initrd_addr = addr;
include/grub/linux.h +1 -1
@@ -21,4 +21,4 @@ grub_initrd_close (struct grub_linux_initrd_context *initrd_ctx);grub_err_t grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, -char *argv[],void *target); +void *target);
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 2/9 efi: move MS-DOS stub out of generic PE header definition
In reply to Ard BiesheuvelThe PE/COFF spec permits the COFF signature and file header to appear anywhere in the file, and the actual offset is recorded in 4 byte little endian field at offset 0x3c of the image.
When GRUB is emitted as a PE/COFF binary, we reuse the 128 byte MS-DOS stub (even for non-x86 architectures), putting the COFF signature and file header at offset 0x80. However, other PE/COFF images may use different values, and non-x86 Linux kernels use an offset of 0x40 instead.
So let's get rid of the grub_pe32_header struct from pe32.h, given that it does not represent anything defined by the PE/COFF spec. Instead, use the GRUB_PE32_MSDOS_STUB_SIZE macro explicitly to reference the COFF header in the only place in the code where we rely on this.
The remaining fields are moved into a struct grub_coff_image_header, which we will use later to access COFF header fields of arbitrary images (and which may therefore appear at different offsets)
--- grub-core/kern/efi/efi.c | 5 +++-- include/grub/efi/pe32.h | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-)
grub-core/kern/efi/efi.c +3 -2
@@ -302,7 +302,7 @@ grub_addr_tgrub_efi_modules_addr (void) {grub_efi_loaded_image_t *image; -struct grub_pe32_header *header; +struct grub_coff_image_header *header;struct grub_pe32_coff_header *coff_header;struct grub_pe32_section_table *sections;struct grub_pe32_section_table *section;
@@ -313,7 +313,8 @@ grub_efi_modules_addr (void)if (! image)return 0 ; - header = image->image_base; + header = (struct grub_coff_image_header *) ((char *) image->image_base + +GRUB_PE32_MSDOS_STUB_SIZE ); coff_header = &(header->coff_header); sections = (struct grub_pe32_section_table *) ((char *) coff_header
include/grub/efi/pe32.h +1 -4
@@ -254,11 +254,8 @@ struct grub_pe32_section_table#define GRUB_PE32_SIGNATURE_SIZE 4 -struct grub_pe32_header +struct grub_coff_image_header { -/* This should be filled in with GRUB_PE32_MSDOS_STUB. */ -grub_uint8_t msdos_stub[GRUB_PE32_MSDOS_STUB_SIZE ]; -/* This is always PE\0\0. */ char signature[GRUB_PE32_SIGNATURE_SIZE ];
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 3/9 arm64/linux: Remove magic number header field check
In reply to Ard BiesheuvelThe 'ARM\x64' magic number in the file header identifies an image as one that implements the bare metal boot protocol, allowing the loader to simply move the file to a suitably aligned address in memory, with sufficient headroom for the trailing .bss segment (the required memory size is described in the header as well).
Note of this matters for GRUB, as it only supports EFI boot. EFI does not care about this magic number, and nor should GRUB: this prevents us from booting other PE linux images, such as the generic EFI zboot decompressor, which is a pure PE/COFF image, and does not implement the bare metal boot protocol.
So drop the magic number check.
--- grub-core/loader/arm64/linux.c | 3 --- include/grub/arm/linux.h | 1 - include/grub/arm64/linux.h | 1 - 3 files changed, 5 deletions(-)
grub-core/loader/arm64/linux.c +0 -3
@@ -51,9 +51,6 @@ static grub_addr_t initrd_end;grub_err_t grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) { -if (lh->magic !=GRUB_LINUX_ARMXX_MAGIC_SIGNATURE ) -return grub_error (GRUB_ERR_BAD_OS ,"invalid magic number" ); -if ((lh->code0 &0xffff ) !=GRUB_PE32_MAGIC )return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET ,N_ ("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled" ));
include/grub/arm/linux.h +0 -1
@@ -35,7 +35,6 @@ struct linux_arm_kernel_header { };#if defined(__arm__) -# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE# define linux_arch_kernel_header linux_arm_kernel_header#endif
include/grub/arm64/linux.h +0 -1
@@ -39,7 +39,6 @@ struct linux_arm64_kernel_header };#if defined(__aarch64__) -# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE# define linux_arch_kernel_header linux_arm64_kernel_header#endif
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 4/9 linux/arm: unify ARM/arm64 vs Xen PE/COFF header handling
In reply to Ard BiesheuvelXen has its own version of the image header, to account for the additional PE/COFF header fields. Since we are adding references to those in the shared EFI loader code, update the common definitions and drop the Xen specific one which no longer has a purpose.
--- grub-core/loader/arm64/linux.c | 12 +++++----- grub-core/loader/arm64/xen_boot.c | 23 ++++---------------- include/grub/arm/linux.h | 6 +++++ include/grub/arm64/linux.h | 4 ++++ include/grub/efi/efi.h | 4 +++- 5 files changed, 24 insertions(+), 25 deletions(-)
grub-core/loader/arm64/linux.c +7 -5
@@ -49,8 +49,13 @@ static grub_addr_t initrd_start;static grub_addr_t initrd_end;grub_err_t -grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) +grub_arch_efi_linux_load_image_header (grub_file_t file, +struct linux_arch_kernel_header * lh) { +grub_file_seek (file,0 ); +if (grub_file_read (file, lh,sizeof (*lh)) < (long )sizeof (*lh)) +return grub_error (GRUB_ERR_FILE_READ_ERROR ,"failed to read Linux image header" ); +if ((lh->code0 &0xffff ) !=GRUB_PE32_MAGIC )return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET ,N_ ("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled" ));
@@ -301,10 +306,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), kernel_size =grub_file_size (file); -if (grub_file_read (file, &lh,sizeof (lh)) < (long )sizeof (lh)) -return grub_errno; - -if (grub_arch_efi_linux_check_image (&lh) !=GRUB_ERR_NONE ) +if (grub_arch_efi_linux_load_image_header (file, &lh) !=GRUB_ERR_NONE ) goto fail;grub_loader_unset ();
grub-core/loader/arm64/xen_boot.c +4 -19
@@ -31,7 +31,6 @@#include <grub/efi/efi.h> #include <grub/efi/fdtload.h> #include <grub/efi/memory.h> -#include <grub/efi/pe32.h> /* required by struct xen_hypervisor_header */ #include <grub/i18n.h> #include <grub/lib/cmdline.h>
@@ -65,18 +64,6 @@ enum module_type };typedef enum module_type module_type_t ; -struct xen_hypervisor_header -{ -struct linux_arm64_kernel_header efi_head; - -/* This is always PE\0\0. */ -grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE ]; -/* The COFF file header. */ -struct grub_pe32_coff_header coff_header; -/* The Optional header. */ -struct grub_pe64_optional_header optional_header; -}; -struct xen_boot_binary {struct xen_boot_binary *next;
@@ -452,7 +439,7 @@ static grub_err_t grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]) { -struct xen_hypervisor_header sh; +struct linux_arm64_kernel_header lh;grub_file_t file =NULL ;grub_dl_ref (my_mod);
@@ -467,10 +454,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),if (!file) goto fail; -if (grub_file_read (file, &sh,sizeof (sh)) != (long )sizeof (sh)) - goto fail; -if (grub_arch_efi_linux_check_image - ((struct linux_arch_kernel_header *) &sh) !=GRUB_ERR_NONE ) +if (grub_arch_efi_linux_load_image_header (file, &lh) !=GRUB_ERR_NONE ) goto fail;grub_file_seek (file,0 );
@@ -484,7 +468,8 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),return grub_errno; xen_hypervisor->is_hypervisor =1 ; - xen_hypervisor->align = (grub_size_t ) sh.optional_header.section_alignment; + xen_hypervisor->align + = (grub_size_t ) lh.coff_image_header.optional_header.section_alignment;xen_boot_binary_load (xen_hypervisor, file, argc, argv);if (grub_errno ==GRUB_ERR_NONE )
include/grub/arm/linux.h +6 -0
@@ -22,6 +22,8 @@#include "system.h" +#include <grub/efi/pe32.h> +#define GRUB_LINUX_ARM_MAGIC_SIGNATURE 0x016f2818struct linux_arm_kernel_header {
@@ -32,6 +34,10 @@ struct linux_arm_kernel_header {grub_uint32_t end;/* _edata */ grub_uint32_t reserved2[3 ];grub_uint32_t hdr_offset; + +#if definedGRUB_MACHINE_EFI +struct grub_coff_image_header coff_image_header; +#endif };#if defined(__arm__)
include/grub/arm64/linux.h +4 -0
@@ -21,6 +21,8 @@#include <grub/types.h> +#include <grub/efi/pe32.h> +#define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241/* 'ARM\x64' */ /* From linux/Documentation/arm64/booting.txt */
@@ -36,6 +38,8 @@ struct linux_arm64_kernel_headergrub_uint64_t res4;/* reserved */ grub_uint32_t magic;/* Magic number, little endian, "ARM\x64" */ grub_uint32_t hdr_offset;/* Offset of PE/COFF header */ + +struct grub_coff_image_header coff_image_header; };#if defined(__aarch64__)
include/grub/efi/efi.h +3 -1
@@ -102,7 +102,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,void *EXPORT_FUNC (grub_efi_get_firmware_fdt )(void );grub_err_t EXPORT_FUNC (grub_efi_get_ram_base )(grub_addr_t *);#include <grub/cpu/linux.h> -grub_err_t grub_arch_efi_linux_check_image (struct linux_arch_kernel_header *lh); +#include <grub/file.h> +grub_err_t grub_arch_efi_linux_load_image_header (grub_file_t file, +struct linux_arch_kernel_header *lh);grub_err_t grub_arch_efi_linux_boot_image (grub_addr_t addr,grub_size_t size,char *args);#endif
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 5/9 linux/arm: account for COFF headers appearing at unexpected offsets
In reply to Ard BiesheuvelThe way we load the Linux and PE/COFF image headers depends on a fixed placement of the COFF header at offset 0x40 into the file. This is a reasonable default, given that this is where Linux emits it today. However, in order to comply with the PE/COFF spec, which allows this header to appear anywhere in the file, let's ensure that we read the header from where it actually appears in the file if it is not located at offset 0x40.
--- grub-core/loader/arm64/linux.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
grub-core/loader/arm64/linux.c +15 -0
@@ -63,6 +63,21 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,grub_dprintf ("linux" ,"UEFI stub kernel:\n" );grub_dprintf ("linux" ,"PE/COFF header @ %08x\n" , lh->hdr_offset); +/* +* The PE/COFF spec permits the COFF header to appear anywhere in the file, so +* we need to double check whether it was where we expected it, and if not, we +* must load it from the correct offset into the coff_image_header field of +* struct linux_arch_kernel_header. +*/ +if ((grub_uint8_t *) lh + lh->hdr_offset != (grub_uint8_t *) &lh->coff_image_header) + { +grub_file_seek (file, lh->hdr_offset); + +if (grub_file_read (file, &lh->coff_image_header,sizeof (struct grub_coff_image_header )) + !=sizeof (struct grub_coff_image_header )) +return grub_error (GRUB_ERR_FILE_READ_ERROR ,"failed to read COFF image header" ); + } +return GRUB_ERR_NONE ; }
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 6/9 efi: add definition of LoadFile2 protocol
In reply to Ard BiesheuvelIncorporate the EFI_LOAD_FILE2_PROTOCOL GUID and C types from the UEFI spec.
--- grub-core/commands/efi/lsefi.c | 1 + include/grub/efi/api.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
grub-core/commands/efi/lsefi.c +1 -0
@@ -55,6 +55,7 @@ struct known_protocol { GRUB_EFI_ABSOLUTE_POINTER_PROTOCOL_GUID, "absolute pointer" }, { GRUB_EFI_DRIVER_BINDING_PROTOCOL_GUID, "EFI driver binding" }, { GRUB_EFI_LOAD_FILE_PROTOCOL_GUID, "load file" }, + { GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID, "load file2" }, { GRUB_EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID, "simple FS" }, { GRUB_EFI_TAPE_IO_PROTOCOL_GUID, "tape I/O" }, { GRUB_EFI_UNICODE_COLLATION_PROTOCOL_GUID, "unicode collation" },
include/grub/efi/api.h +15 -0
@@ -149,6 +149,11 @@ { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \ } +#define GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID \ + { 0x4006c0c1, 0xfcb3, 0x403e, \ + { 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d } \ + } +#define GRUB_EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID \ { 0x0964e5b22, 0x6459, 0x11d2, \ { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
@@ -1749,6 +1754,16 @@ struct grub_efi_rng_protocol };typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t ; +struct grub_efi_load_file2 +{ +grub_efi_status_t (*load_file)(struct grub_efi_load_file2 *this, +grub_efi_device_path_t *file_path, +grub_efi_boolean_t boot_policy, +grub_efi_uintn_t *buffer_size, +void *buffer); +}; +typedef struct grub_efi_load_file2 grub_efi_load_file2_t ; +#if (GRUB_TARGET_SIZEOF_VOID_P ==4 ) || defined (__ia64__) \ || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ || defined(__riscv)
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 7/9 efi/efinet: Don't close connections at fini_hw() time
In reply to Ard BiesheuvelWhen GRUB runs on top of EFI firmware, it only has access to block and network device abstractions exposed by the firmware, and it is up to the firmware to quiesce the underlying hardware when handing over to the OS.
This is especially important for network devices, to prevent incoming packets from being DMA'd straight into memory after the OS has taken over but before it has managed to reconfigure the network hardware.
GRUB handles this by means of the grub_net_fini_hw() preboot hook, which is executed before calling into the booted image. This means that all network devices disappear or become inoperable before the EFI stub executes on EFI targeted builds. This is problematic as it prevents the EFI stub from calling back into GRUB provided protocols such as LoadFile2 for the initrd, which we will provide in a subsequent patch.
So add a flag that indicates to the network core that EFI network devices should not be closed when grub_net_fini_hw() is called.
--- grub-core/net/drivers/efi/efinet.c | 10 +++++++++- grub-core/net/net.c | 2 +- include/grub/net.h | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-)
grub-core/net/drivers/efi/efinet.c +9 -1
@@ -320,7 +320,15 @@ grub_efinet_findcards (void) card->name =grub_xasprintf ("efinet%d" , i++); card->driver = &efidriver; - card->flags =0 ; +/* +* EFI network devices are abstract SNP protocol instances, and the +* firmware is in charge of ensuring that they will be torn down when the +* OS loader hands off to the OS proper. Closing them as part of the +* preboot cleanup is therefore unnecessary, and undesirable, as it +* prevents us from using the network connection in a protocal callback +* such as LoadFile2 for initrd loading. +*/ + card->flags =GRUB_NET_CARD_NO_CLOSE_ON_FINI_HW ; card->default_address.type =GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET ; grub_memcpy (card->default_address.mac, net->mode->current_address,
grub-core/net/net.c +1 -1
@@ -1787,7 +1787,7 @@ grub_net_fini_hw (int noreturn __attribute__ ((unused))) {struct grub_net_card *card;FOR_NET_CARDS (card) - if (card->opened) + if (card->opened && !(card->flags & GRUB_NET_CARD_NO_CLOSE_ON_FINI_HW)) {if (card->driver->close) card->driver->close (card);
include/grub/net.h +2 -1
@@ -64,7 +64,8 @@ typedef enum grub_net_interface_flagstypedef enum grub_net_card_flags {GRUB_NET_CARD_HWADDRESS_IMMUTABLE =1 , -GRUB_NET_CARD_NO_MANUAL_INTERFACES =2 +GRUB_NET_CARD_NO_MANUAL_INTERFACES =2 , +GRUB_NET_CARD_NO_CLOSE_ON_FINI_HW =4 }grub_net_card_flags_t ;struct grub_net_card ;
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerPATCH RESEND 8/9 efi: implement LoadFile2 initrd loading protocol for Linux
In reply to Ard BiesheuvelRecent Linux kernels will invoke the LoadFile2 protocol installed on a well-known vendor media path to load the initrd if it is exposed by the firmware. Using this method is preferred for two reasons:
- the Linux kernel is in charge of allocating the memory, and so it can implement any placement policy it wants (given that these tend to change between kernel versions),
- it is no longer necessary to modify the device tree provided by the firmware.
So let's install this protocol when handling the 'initrd' command if such a recent kernel was detected (based on the PE/COFF image version), and defer loading the initrd contents until the point where the kernel invokes the LoadFile2 protocol.
--- grub-core/loader/arm64/linux.c | 129 +++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-)
grub-core/loader/arm64/linux.c +128 -1
@@ -48,6 +48,48 @@ static grub_uint32_t cmdline_size;static grub_addr_t initrd_start;static grub_addr_t initrd_end; +static grub_efi_guid_t load_file2_guid =GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID ; +static grub_efi_guid_t device_path_guid =GRUB_EFI_DEVICE_PATH_GUID ; +static struct grub_linux_initrd_context initrd_ctx = {0 ,0 ,0 }; +static grub_efi_handle_t initrd_lf2_handle; +static int initrd_use_loadfile2; + +struct initrd_media_device_path { +grub_efi_vendor_media_device_path_t vendor; +grub_efi_device_path_t end; +}GRUB_PACKED ; + +#define LINUX_EFI_INITRD_MEDIA_GUID \ + { 0x5568e427, 0x68fc, 0x4f3d, \ + { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \ + } + +static struct initrd_media_device_path initrd_lf2_device_path = { + { + { +GRUB_EFI_MEDIA_DEVICE_PATH_TYPE , +GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE , +sizeof (grub_efi_vendor_media_device_path_t), + }, +LINUX_EFI_INITRD_MEDIA_GUID + }, { +GRUB_EFI_END_DEVICE_PATH_TYPE , +GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE , +sizeof (grub_efi_device_path_t) + } +}; + +static grub_efi_status_t +grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this, +grub_efi_device_path_t *device_path, +grub_efi_boolean_t boot_policy, +grub_efi_uintn_t *buffer_size, +void *buffer); + +static grub_efi_load_file2_t initrd_lf2 = { + grub_efi_initrd_load_file2 +}; +grub_err_t grub_arch_efi_linux_load_image_header (grub_file_t file,struct linux_arch_kernel_header * lh)
@@ -78,6 +120,18 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,return grub_error (GRUB_ERR_FILE_READ_ERROR ,"failed to read COFF image header" ); } +/* +* Linux kernels built for any architecture are guaranteed to support the +* LoadFile2 based initrd loading protocol if the image version is >= 1. +*/ +if (lh->coff_image_header.optional_header.major_image_version >=1 ) + initrd_use_loadfile2 =1 ; +else + initrd_use_loadfile2 =0 ; + +grub_dprintf ("linux" ,"LoadFile2 initrd loading %sabled\n" , + initrd_use_loadfile2 ?"en" :"dis" ); +return GRUB_ERR_NONE ; }
@@ -197,6 +251,8 @@ grub_linux_boot (void)static grub_err_t grub_linux_unload (void ) { +grub_efi_boot_services_t *b; +grub_dl_unref (my_mod); loaded =0 ;if (initrd_start)
@@ -208,6 +264,19 @@ grub_linux_unload (void)grub_efi_free_pages ((grub_addr_t ) kernel_addr,GRUB_EFI_BYTES_TO_PAGES (kernel_size));grub_fdt_unload (); + +if (initrd_lf2_handle) + { + b = grub_efi_system_table->boot_services; + b->uninstall_multiple_protocol_interfaces (initrd_lf2_handle, + &load_file2_guid, + &initrd_lf2, + &device_path_guid, + &initrd_lf2_device_path, +NULL ); + initrd_lf2_handle =NULL ; + initrd_use_loadfile2 =0 ; + }return GRUB_ERR_NONE ; }
@@ -247,13 +316,50 @@ allocate_initrd_mem (int initrd_pages) GRUB_EFI_LOADER_DATA); } +static grub_efi_status_t +grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this, +grub_efi_device_path_t *device_path, +grub_efi_boolean_t boot_policy, +grub_efi_uintn_t *buffer_size, +void *buffer) +{ +grub_efi_status_t status =GRUB_EFI_SUCCESS ; +grub_efi_uintn_t initrd_size; + +if (!this || this != &initrd_lf2 || !buffer_size) +return GRUB_EFI_INVALID_PARAMETER ; + +if (device_path->type !=GRUB_EFI_END_DEVICE_PATH_TYPE || + device_path->subtype !=GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE ) +return GRUB_EFI_NOT_FOUND ; + +if (boot_policy) +return GRUB_EFI_UNSUPPORTED ; + + initrd_size =grub_get_initrd_size (&initrd_ctx); +if (!buffer || *buffer_size < initrd_size) + { + *buffer_size = initrd_size; +return GRUB_EFI_BUFFER_TOO_SMALL ; + } + +grub_dprintf ("linux" ,"Providing initrd via LOAD_FILE2_PROTOCOL\n" ); + +if (grub_initrd_load (&initrd_ctx, buffer)) + status =GRUB_EFI_LOAD_ERROR ; + +grub_initrd_close (&initrd_ctx); +return status; +} +static grub_err_t grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),int argc,char *argv[]) { -struct grub_linux_initrd_context initrd_ctx = {0 ,0 ,0 };int initrd_size, initrd_pages;void *initrd_mem =NULL ; +grub_efi_boot_services_t *b; +grub_efi_status_t status;if (argc ==0 ) {
@@ -271,6 +377,27 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),if (grub_initrd_init (argc, argv, &initrd_ctx)) goto fail; +if (initrd_use_loadfile2) + { +if (!initrd_lf2_handle) + { + b = grub_efi_system_table->boot_services; + status = b->install_multiple_protocol_interfaces (&initrd_lf2_handle, + &load_file2_guid, + &initrd_lf2, + &device_path_guid, + &initrd_lf2_device_path, +NULL ); +if (status ==GRUB_EFI_OUT_OF_RESOURCES ) + { +grub_error (GRUB_ERR_OUT_OF_MEMORY ,N_ ("out of memory" )); +return grub_errno; + } + } +grub_dprintf ("linux" ,"Using LoadFile2 initrd loading protocol\n" ); +return GRUB_ERR_NONE ; + } + initrd_size =grub_get_initrd_size (&initrd_ctx);grub_dprintf ("linux" ,"Loading initrd\n" );
Signature · 1 line
2.35.1
Re: [PATCH resend 8/9] efi: implement LoadFile2 initrd loading protocol for Linux
Hi Ard,
Quoted 203 lines · Ard Biesheuvel
Recent Linux kernels will invoke the LoadFile2 protocol installed on a well-known vendor media path to load the initrd if it is exposed by the firmware. Using this method is preferred for two reasons:
- the Linux kernel is in charge of allocating the memory, and so it can implement any placement policy it wants (given that these tend to change between kernel versions),
- it is no longer necessary to modify the device tree provided by the firmware.So let's install this protocol when handling the 'initrd' command if such a recent kernel was detected (based on the PE/COFF image version), and defer loading the initrd contents until the point where the kernel invokes the LoadFile2 protocol.
Signed-off-by Ard Biesheuvel <[email protected]>--- grub-core/loader/arm64/linux.c | 129 +++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-)grub-core/loader/arm64/linux.c +128
-1@@ -48,6 +48,48 @@ static grub_uint32_t cmdline_size;static grub_addr_t initrd_start;static grub_addr_t initrd_end; +static grub_efi_guid_t load_file2_guid =GRUB_EFI_LOAD_FILE2_PROTOCOL_GUID ; +static grub_efi_guid_t device_path_guid =GRUB_EFI_DEVICE_PATH_GUID ; +static struct grub_linux_initrd_context initrd_ctx = {0 ,0 ,0 }; +static grub_efi_handle_t initrd_lf2_handle; +static int initrd_use_loadfile2; + +struct initrd_media_device_path { +grub_efi_vendor_media_device_path_t vendor; +grub_efi_device_path_t end; +}GRUB_PACKED ; + +#define LINUX_EFI_INITRD_MEDIA_GUID \ + { 0x5568e427, 0x68fc, 0x4f3d, \ + { 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68 } \ + } + +static struct initrd_media_device_path initrd_lf2_device_path = { + { + { +GRUB_EFI_MEDIA_DEVICE_PATH_TYPE , +GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE , +sizeof (grub_efi_vendor_media_device_path_t), + }, +LINUX_EFI_INITRD_MEDIA_GUID + }, { +GRUB_EFI_END_DEVICE_PATH_TYPE , +GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE , +sizeof (grub_efi_device_path_t) + } +}; + +static grub_efi_status_t +grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this, +grub_efi_device_path_t *device_path, +grub_efi_boolean_t boot_policy, +grub_efi_uintn_t *buffer_size, +void *buffer); + +static grub_efi_load_file2_t initrd_lf2 = { + grub_efi_initrd_load_file2 +}; +grub_err_t grub_arch_efi_linux_load_image_header (grub_file_t file,struct linux_arch_kernel_header * lh)@@ -78,6 +120,18 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,return grub_error (GRUB_ERR_FILE_READ_ERROR ,"failed to read COFF image header" ); } +/* +* Linux kernels built for any architecture are guaranteed to support the +* LoadFile2 based initrd loading protocol if the image version is >= 1. +*/ +if (lh->coff_image_header.optional_header.major_image_version >=1 ) + initrd_use_loadfile2 =1 ; +else + initrd_use_loadfile2 =0 ; + +grub_dprintf ("linux" ,"LoadFile2 initrd loading %sabled\n" , + initrd_use_loadfile2 ?"en" :"dis" ); +return GRUB_ERR_NONE ; }@@ -197,6 +251,8 @@ grub_linux_boot (void)static grub_err_t grub_linux_unload (void ) { +grub_efi_boot_services_t *b; +grub_dl_unref (my_mod); loaded =0 ;if (initrd_start)@@ -208,6 +264,19 @@ grub_linux_unload (void)grub_efi_free_pages ((grub_addr_t ) kernel_addr,GRUB_EFI_BYTES_TO_PAGES (kernel_size));grub_fdt_unload (); + +if (initrd_lf2_handle) + { + b = grub_efi_system_table->boot_services; + b->uninstall_multiple_protocol_interfaces (initrd_lf2_handle, + &load_file2_guid, + &initrd_lf2, + &device_path_guid, + &initrd_lf2_device_path, +NULL ); + initrd_lf2_handle =NULL ; + initrd_use_loadfile2 =0 ; + }return GRUB_ERR_NONE ; }@@ -247,13 +316,50 @@ allocate_initrd_mem (int initrd_pages) GRUB_EFI_LOADER_DATA); } +static grub_efi_status_t +grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this, +grub_efi_device_path_t *device_path, +grub_efi_boolean_t boot_policy, +grub_efi_uintn_t *buffer_size, +void *buffer) +{ +grub_efi_status_t status =GRUB_EFI_SUCCESS ; +grub_efi_uintn_t initrd_size; + +if (!this || this != &initrd_lf2 || !buffer_size) +return GRUB_EFI_INVALID_PARAMETER ; + +if (device_path->type !=GRUB_EFI_END_DEVICE_PATH_TYPE || + device_path->subtype !=GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE ) +return GRUB_EFI_NOT_FOUND ; + +if (boot_policy) +return GRUB_EFI_UNSUPPORTED ; + + initrd_size =grub_get_initrd_size (&initrd_ctx); +if (!buffer || *buffer_size < initrd_size) + { + *buffer_size = initrd_size; +return GRUB_EFI_BUFFER_TOO_SMALL ; + } + +grub_dprintf ("linux" ,"Providing initrd via LOAD_FILE2_PROTOCOL\n" ); + +if (grub_initrd_load (&initrd_ctx, buffer)) + status =GRUB_EFI_LOAD_ERROR ; + +grub_initrd_close (&initrd_ctx); +return status; +} +static grub_err_t grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),int argc,char *argv[]) { -struct grub_linux_initrd_context initrd_ctx = {0 ,0 ,0 };int initrd_size, initrd_pages;void *initrd_mem =NULL ; +grub_efi_boot_services_t *b; +grub_efi_status_t status;if (argc ==0 ) {@@ -271,6 +377,27 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),if (grub_initrd_init (argc, argv, &initrd_ctx)) goto fail; +if (initrd_use_loadfile2) + { +if (!initrd_lf2_handle) + { + b = grub_efi_system_table->boot_services; + status = b->install_multiple_protocol_interfaces (&initrd_lf2_handle, + &load_file2_guid, + &initrd_lf2, + &device_path_guid, + &initrd_lf2_device_path, +NULL ); +if (status ==GRUB_EFI_OUT_OF_RESOURCES ) + { +grub_error (GRUB_ERR_OUT_OF_MEMORY ,N_ ("out of memory" )); +return grub_errno; + } + } +grub_dprintf ("linux" ,"Using LoadFile2 initrd loading protocol\n" ); +return GRUB_ERR_NONE ; + } + initrd_size =grub_get_initrd_size (&initrd_ctx);grub_dprintf ("linux" ,"Loading initrd\n" );Signature · 1 line
2.35.1
I tested this on u-boot n(which also support load_file2 for the initrd). Even if the user misconfigures the whole thing and try to install the protocol twice everything seems to be handled properly.
Ard Biesheuvel
maintainerPATCH RESEND 9/9 linux: ignore FDT unless we need to modify it
In reply to Ard BiesheuvelNow that we implemented supported for the LoadFile2 protocol for initrd loading, there is no longer a need to pass the initrd parameters via the device tree. This means there is no longer a reason to update the device tree in the first place, and so we can ignore it entirely.
The only remaining reason to deal with the devicetree is if we are using the 'devicetree' command to load one from disk, so tweak the logic in grub_fdt_install() to take that into account.
--- grub-core/loader/arm64/linux.c | 22 ++++++++++---------- grub-core/loader/efi/fdt.c | 7 +++++-- 2 files changed, 16 insertions(+), 13 deletions(-)
grub-core/loader/arm64/linux.c +11 -11
@@ -142,21 +142,21 @@ finalize_params_linux (void)void *fdt; - fdt =grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE ); +/* Set initrd info */ +if (initrd_start && initrd_end > initrd_start) + { + fdt =grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE ); -if (!fdt) - goto failure; +if (!fdt) + goto failure; - node =grub_fdt_find_subnode (fdt,0 ,"chosen" ); -if (node <0 ) - node =grub_fdt_add_subnode (fdt,0 ,"chosen" ); + node =grub_fdt_find_subnode (fdt,0 ,"chosen" ); +if (node <0 ) + node =grub_fdt_add_subnode (fdt,0 ,"chosen" ); -if (node <1 ) - goto failure; +if (node <1 ) + goto failure; -/* Set initrd info */ -if (initrd_start && initrd_end > initrd_start) - {grub_dprintf ("linux" ,"Initrd @ %p-%p\n" , (void *) initrd_start, (void *) initrd_end);
grub-core/loader/efi/fdt.c +5 -2
@@ -89,13 +89,16 @@ grub_fdt_install (void)grub_efi_guid_t fdt_guid =GRUB_EFI_DEVICE_TREE_GUID ;grub_efi_status_t status; +if (!fdt && !loaded_fdt) +return GRUB_ERR_NONE ; + b = grub_efi_system_table->boot_services; - status = b->install_configuration_table (&fdt_guid, fdt); + status = b->install_configuration_table (&fdt_guid, fdt ?: loaded_fdt);if (status !=GRUB_EFI_SUCCESS )return grub_error (GRUB_ERR_IO ,"failed to install FDT" );grub_dprintf ("fdt" ,"Installed/updated FDT configuration table @ %p\n" , - fdt); + fdt ?: loaded_fdt);return GRUB_ERR_NONE ; }
Signature · 1 line
2.35.1
Ard Biesheuvel
maintainerQuoted 40 lines · Ard Biesheuvel
This implements the LoadFile2 initrd loading protocol, which is essentially a callback interface into the bootloader to load the initrd data into a caller provided buffer. This means the bootloader no longer has to contain any policy regarding where to load the initrd (which differs between architectures and kernel versions) and no longer has to manipulate arch specific data structures such as DT or struct bootparams to inform the OS where the initrd resides in memory. This is especially relevant for the upcoming LoongArch support, which does not use either DT or struct bootparams, and would have to rely on the initrd= command line interface, which is deprecated and of limited utility [0].
Sample output from booting a recent Linux/arm64 kernel:
grub> insmod
part_msdos
grub> linux (hd0,msdos1)/Image
grub> initrd (hd0,msdos1)/initrd.img
grub> boot
EFI stub: Booting Linux Kernel...
EFI stub:EFI_RNG_PROTOCOLunavailable, KASLR will be disabled EFI stub: Generating empty DTB
EFI stub: Loaded initrd fromLINUX_EFI_INITRD_MEDIA_GUIDdevice path EFI stub: Exiting boot services and installing virtual address map...[ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x411fd070]This is mostly a resend of my original v2 [1], although I did cherry-pick Nikita's version of the first patch, which incorporates Heinrich's suggestion to simply drop the argv[] argument from
grub_initrd_load(). I also included the patch I sent out the other day to remove the pointless header magic number check, and included a fix for the PXE boot issue reported by dann [2].[0] The initrd= command line loader can only access files that reside on the same volume as the loaded image, which means GRUB would have to present this volume abstraction in order to serve the initrd file. Another reason why this method is problematic is generic EFI zboot, which is being added to Linux, and which calls loadimage on another, embedded PE/COFF image which would also need to expose this volume abstraction.
Quoted 4 lines
[1] https://lists.gnu.org/archive/html/grub-devel/2020-10/msg00124.html
[2] https://lists.gnu.org/archive/html/grub-devel/2022-04/msg00055.html
When cc'ing to this series, please note that i included an incorrect grub-devel@ address too - please remove.
Quoted 49 lines
Cc Daniel Kiper <[email protected]>Cc Nikita Ermakov <[email protected]>Cc Atish Patra <[email protected]>Cc Huacai Chen <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc dann frazier <[email protected]>Cc Julian Andres Klode <[email protected]>Ard Biesheuvel (8):
efi: move MS-DOS stub out of generic PE header definition arm64/linux: Remove magic number header field check linux/arm: unify ARM/arm64 vs Xen PE/COFF header handling linux/arm: account for COFF headers appearing at unexpected offsets
efi: add definition of LoadFile2 protocol
efi/efinet: Don't close connections atfini_hw()time
efi: implement LoadFile2 initrd loading protocol for Linux
linux: ignore FDT unless we need to modify itNikita Ermakov (1):
loader: drop argv[] argument ingrub_initrd_load()grub-core/commands/efi/lsefi.c | 1 + grub-core/kern/efi/efi.c | 5 +- grub-core/loader/arm/linux.c | 2 +- grub-core/loader/arm64/linux.c | 181 +++++++++++++++++--- grub-core/loader/arm64/xen_boot.c | 23 +-- grub-core/loader/efi/fdt.c | 7 +- grub-core/loader/i386/linux.c | 2 +- grub-core/loader/i386/pc/linux.c | 2 +- grub-core/loader/i386/xen.c | 3 +- grub-core/loader/ia64/efi/linux.c | 2 +- grub-core/loader/linux.c | 4 +- grub-core/loader/mips/linux.c | 2 +- grub-core/loader/powerpc/ieee1275/linux.c | 2 +- grub-core/loader/sparc64/ieee1275/linux.c | 2 +- grub-core/net/drivers/efi/efinet.c | 10 +- grub-core/net/net.c | 2 +- include/grub/arm/linux.h | 7 +- include/grub/arm64/linux.h | 5 +- include/grub/efi/api.h | 15 ++ include/grub/efi/efi.h | 4 +- include/grub/efi/pe32.h | 5 +- include/grub/linux.h | 2 +- include/grub/net.h | 3 +- 23 files changed, 226 insertions(+), 65 deletions(-)--
2.35.1