Merge into ubuntu : disable_lf2 : lp:~xypron/grub : Git : Code : grub

Status:

Merged

Merged at revision:

c411c65c28035c4b7a6e5e25f04376513dd039a8

Proposed branch:

~xypron/grub:disable_lf2

Merge into:

~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Diff against target:

78 lines (+64/-0)

2 files modified

debian/patches/series (+1/-0)
debian/patches/ubuntu-disable-LOAD-FILE2-protocol-for-initrd-on-ARM.patch (+63/-0)

Undecided

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
dann frazier		2022-04-13	Approve on 2022-04-15
Review via email: mp+419407@code.launchpad.net

Commit message

Disable LOAD FILE2 protocol for initrd on ARM

RISC-V cannot load the initrd without the LOAD FILE2 protocol.

Currently the LOAD FILE2 protocol does not work with PXE due to a preboot
hook invoking grub_net_fini_hw().

So let's disable this for ARM until a solution has been agreed on with

Revision history for this message

Julian Andres Klode (juliank) wrote on 2022-04-13:

#

I can't see this from the patch itself, but is the variable initialized at the declaration? Because it is set explicitly to 0 later if kernel not new enough, so I am wondering

Revision history for this message

Heinrich Schuchardt (xypron) wrote on 2022-04-14:

#

The variable is static. Thus it is initialized to 0.

grub-core/loader/efi/linux.c:56:
static int initrd_use_loadfile2;

Revision history for this message

dann frazier (dannf) wrote on 2022-04-15:

#

Download full text (11.2 KiB)

Thanks @xypron, unfortunately it isn't avoiding the arm64 issue for me (see below). I'll debug locally.

script/lexer.c:336: token 288 text [setparams]
script/script.c:50: malloc 0x401fffdd4b40
script/script.c:50: malloc 0x401fffdd4b00
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4aa0
script/lexer.c:336: token 289 text []
script/script.c:50: malloc 0x401fffdd48c0
script/script.c:50: malloc 0x401fffdd4880
script/lexer.c:336: token 289 text [Try or Install Ubuntu Server]
script/script.c:50: malloc 0x401fffdd4820
script/script.c:50: malloc 0x401fffdd47c0
script/lexer.c:336: token 289 text []
script/script.c:50: malloc 0x401fffdd4760
script/script.c:50: malloc 0x401fffdd4720
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd46c0
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd4660
script/script.c:50: malloc 0x401fffdd4620
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd45c0
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd44a0
kern/verifiers.c:214: string: setparams Try or Install Ubuntu Server, type: 2
script/script.c:65: free 0x401fffdd44a0
script/script.c:65: free 0x401fffdd4c00
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd45c0
script/script.c:65: free 0x401fffdd4620
script/script.c:65: free 0x401fffdd4660
script/script.c:65: free 0x401fffdd46c0
script/script.c:65: free 0x401fffdd4720
script/script.c:65: free 0x401fffdd4760
script/script.c:65: free 0x401fffdd47c0
script/script.c:65: free 0x401fffdd4820
script/script.c:65: free 0x401fffdd4880
script/script.c:65: free 0x401fffdd48c0
script/script.c:65: free 0x401fffdd4aa0
script/script.c:65: free 0x401fffdd4b00
script/script.c:65: free 0x401fffdd4b40
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
script/lexer.c:336: token 288 text [set]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4ac0
script/lexer.c:336: token 289 text [gfxpayload=keep]
script/script.c:50: malloc 0x401fffdd48e0
script/script.c:50: malloc 0x401fffdd48a0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4840
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd47e0
script/script.c:50: malloc 0x401fffdd47a0
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd4740
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd4700
kern/verifiers.c:214: string: set gfxpayload=keep, type: 2
script/script.c:65: free 0x401fffdd4700
script/script.c:65: ...

Thanks @xypron, unfortunately it isn't avoiding the arm64 issue for me (see below). I'll debug locally.

script/lexer.c:336: token 288 text [setparams]
script/script.c:50: malloc 0x401fffdd4b40
script/script.c:50: malloc 0x401fffdd4b00
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4aa0
script/lexer.c:336: token 289 text []
script/script.c:50: malloc 0x401fffdd48c0
script/script.c:50: malloc 0x401fffdd4880
script/lexer.c:336: token 289 text [Try or Install Ubuntu Server]
script/script.c:50: malloc 0x401fffdd4820
script/script.c:50: malloc 0x401fffdd47c0
script/lexer.c:336: token 289 text []
script/script.c:50: malloc 0x401fffdd4760
script/script.c:50: malloc 0x401fffdd4720
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd46c0
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd4660
script/script.c:50: malloc 0x401fffdd4620
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd45c0
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd44a0
kern/verifiers.c:214: string: setparams Try or Install Ubuntu Server, type: 2
script/script.c:65: free 0x401fffdd44a0
script/script.c:65: free 0x401fffdd4c00
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd45c0
script/script.c:65: free 0x401fffdd4620
script/script.c:65: free 0x401fffdd4660
script/script.c:65: free 0x401fffdd46c0
script/script.c:65: free 0x401fffdd4720
script/script.c:65: free 0x401fffdd4760
script/script.c:65: free 0x401fffdd47c0
script/script.c:65: free 0x401fffdd4820
script/script.c:65: free 0x401fffdd4880
script/script.c:65: free 0x401fffdd48c0
script/script.c:65: free 0x401fffdd4aa0
script/script.c:65: free 0x401fffdd4b00
script/script.c:65: free 0x401fffdd4b40
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
script/lexer.c:336: token 288 text [set]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4ac0
script/lexer.c:336: token 289 text [gfxpayload=keep]
script/script.c:50: malloc 0x401fffdd48e0
script/script.c:50: malloc 0x401fffdd48a0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4840
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd47e0
script/script.c:50: malloc 0x401fffdd47a0
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd4740
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd4700
kern/verifiers.c:214: string: set gfxpayload=keep, type: 2
script/script.c:65: free 0x401fffdd4700
script/script.c:65: free 0x401fffdd4c00
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd4740
script/script.c:65: free 0x401fffdd47a0
script/script.c:65: free 0x401fffdd47e0
script/script.c:65: free 0x401fffdd4840
script/script.c:65: free 0x401fffdd48a0
script/script.c:65: free 0x401fffdd48e0
script/script.c:65: free 0x401fffdd4ac0
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
script/lexer.c:336: token 288 text [linux]
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd49e0
script/lexer.c:336: token 289 text [/casper/vmlinuz]
script/script.c:50: malloc 0x401fffdd4800
script/script.c:50: malloc 0x401fffdd47c0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4760
script/lexer.c:336: token 289 text [root=/dev/ram0]
script/script.c:50: malloc 0x401fffdd4700
script/script.c:50: malloc 0x401fffdd46c0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4660
script/lexer.c:336: token 289 text [ramdisk_size=1500000]
script/script.c:50: malloc 0x401fffdd4600
script/script.c:50: malloc 0x401fffdd45a0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4480
script/lexer.c:336: token 289 text [ip=dhcp]
script/script.c:50: malloc 0x401fffdd4420
script/script.c:50: malloc 0x401fffdd4300
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd42a0
script/lexer.c:336: token 289 text
[url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/20220411/jammy-live-ser
ver-arm64.iso]
script/script.c:50: malloc 0x401fffdd4080
script/script.c:50: malloc 0x401fffdd3fe0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd3f80
script/lexer.c:336: token 289 text [---]
script/script.c:50: malloc 0x401fffdd3f20
script/script.c:50: malloc 0x401fffdd3ee0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd3e80
script/lexer.c:336: token 288 text [debug]
script/script.c:50: malloc 0x401fffdd3e20
script/script.c:50: malloc 0x401fffdd3de0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd3d80
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd3d20
script/script.c:50: malloc 0x401fffdd3ce0
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd3c80
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4ba0
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd4b20
commands/wildcard.c:535: no expansion needed
commands/wildcard.c:594: paths[0] = `/casper/vmlinuz'
kern/verifiers.c:214: string: linux /casper/vmlinuz root=/dev/ram0
ramdisk_size=1500000 ip=dhcp
url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/20220411/jammy-live-serv
er-arm64.iso --- debug, type: 2
kern/disk.c:196: Opening `tftp,10.229.58.66'...
disk/efi/efidisk.c:482: opening tftp
kern/disk.c:281: Opening `tftp,10.229.58.66' failed.
kern/disk.c:295: Closing `tftp'.
kern/verifiers.c:88: file: /casper/vmlinuz type: 3
loader/efi/linux.c:80: UEFI stub kernel:
loader/efi/linux.c:81: PE/COFF header @ 00000040
loader/efi/linux.c:95: LoadFile2 initrd loading enabled
loader/efi/linux.c:459: kernel file size: 46496128
loader/efi/linux.c:461: kernel numpages: 11352
loader/efi/linux.c:478: kernel @ 0xa1e43000
kern/verifiers.c:214: string: /casper/vmlinuz root=/dev/ram0
ramdisk_size=1500000 ip=dhcp
url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/20220411/jammy-live-serv
er-arm64.iso --- debug, type: 0
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
script/script.c:65: free 0x401fffdd4ba0
script/script.c:65: free 0x401fffdd3c80
script/script.c:65: free 0x401fffdd3ce0
script/script.c:65: free 0x401fffdd3d20
script/script.c:65: free 0x401fffdd3d80
script/script.c:65: free 0x401fffdd3de0
script/script.c:65: free 0x401fffdd3e20
script/script.c:65: free 0x401fffdd3e80
script/script.c:65: free 0x401fffdd3ee0
script/script.c:65: free 0x401fffdd3f20
script/script.c:65: free 0x401fffdd3f80
script/script.c:65: free 0x401fffdd3fe0
script/script.c:65: free 0x401fffdd4080
script/script.c:65: free 0x401fffdd42a0
script/script.c:65: free 0x401fffdd4300
script/script.c:65: free 0x401fffdd4420
script/script.c:65: free 0x401fffdd4480
script/script.c:65: free 0x401fffdd45a0
script/script.c:65: free 0x401fffdd4600
script/script.c:65: free 0x401fffdd4660
script/script.c:65: free 0x401fffdd46c0
script/script.c:65: free 0x401fffdd4700
script/script.c:65: free 0x401fffdd4760
script/script.c:65: free 0x401fffdd47c0
script/script.c:65: free 0x401fffdd4800
script/script.c:65: free 0x401fffdd49e0
script/script.c:65: free 0x401fffdd4c00
script/script.c:65: free 0x401fffdd4c40
script/lexer.c:336: token 288 text [initrd]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4ac0
script/lexer.c:336: token 289 text [/casper/initrd]
script/script.c:50: malloc 0x401fffdd48e0
script/script.c:50: malloc 0x401fffdd48a0
script/script.c:163: arglist
script/script.c:50: malloc 0x401fffdd4840
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd47e0
script/script.c:50: malloc 0x401fffdd47a0
script/script.c:198: cmdline
script/script.c:50: malloc 0x401fffdd4740
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4c00
script/script.c:294: append command
script/script.c:50: malloc 0x401fffdd4700
commands/wildcard.c:535: no expansion needed
commands/wildcard.c:594: paths[0] = `/casper/initrd'
kern/verifiers.c:214: string: initrd /casper/initrd, type: 2
kern/disk.c:196: Opening `tftp,10.229.58.66'...
disk/efi/efidisk.c:482: opening tftp
kern/disk.c:281: Opening `tftp,10.229.58.66' failed.
kern/disk.c:295: Closing `tftp'.
kern/verifiers.c:88: file: /casper/initrd type: 131076
loader/efi/linux.c:396: LoadFile2 initrd loading protocol installed
script/script.c:65: free 0x401fffdd4700
script/script.c:65: free 0x401fffdd4c00
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd4740
script/script.c:65: free 0x401fffdd47a0
script/script.c:65: free 0x401fffdd47e0
script/script.c:65: free 0x401fffdd4840
script/script.c:65: free 0x401fffdd48a0
script/script.c:65: free 0x401fffdd48e0
script/script.c:65: free 0x401fffdd4ac0
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
script/lexer.c:336: token 259 text [
]
script/script.c:50: malloc 0x401fffdd4b60
script/script.c:50: malloc 0x401fffdd4b20
script/lexer.c:336: token 0 text []
script/script.c:50: malloc 0x401fffdd4c40
script/script.c:50: malloc 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4ae0
script/script.c:65: free 0x401fffdd4c40
script/script.c:65: free 0x401fffdd4b20
script/script.c:65: free 0x401fffdd4b60
loader/efi/linux.c:141: Installed/updated FDT configuration table @ 0x0
loader/efi/linux.c:191: linux command line: 'BOOT_IMAGE=/casper/vmlinuz
root=/dev/ram0 ramdisk_size=1500000 ip=dhcp
url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/20220411/jammy-live-serv
er-arm64.iso --- debug'
kern/efi/sb.c:111: UEFI Secure Boot state: Disabled
loader/efi/peimage.c:215: PE-COFF header checked
loader/efi/peimage.c:282: sections loaded
loader/efi/peimage.c:493: no relocations
loader/efi/peimage.c:709: Executing image loaded at 0x9f0b0000
Entry point 0xa0fb8428
Size 0x02d90000
EFI stub: Booting Linux Kernel...
EFI stub: Generating empty DTB
loader/efi/linux.c:348: Providing initrd via LOAD_FILE2_PROTOCOL
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
net/net.c:1596: error receiving: 28: couldn't send network packet
error: couldn't send network packet.
EFI stub: Loaded initrd from LINUX_EFI_INITRD_MEDIA_GUID device path
EFI stub: Exiting boot services...

review: Disapprove

Revision history for this message

dann frazier (dannf) wrote on 2022-04-15:

#

Sorry, it helps if I quilt push the patch. Retrying...

Revision history for this message

dann frazier (dannf) wrote on 2022-04-15:

#

OK, after wiping the egg off of my face, I can confirm it works :)

Let me know if you'd like me to merge/upload, or if Foundations already plans to do so. (I don't know, for example, if there are other fixes for known bugs that should be applied at the same time).

review: Approve

 diff --git a/debian/patches/series b/debian/patches/series
 index 24509f9..e8cf74c 100644
 --- a/debian/patches/series
 +++ b/debian/patches/series
@@ -125,3 +125,4 @@ efivar-check-that-efivarfs-is-writeable.patch
  linuxefi-do-not-validate-kernels-twice.patch
  fdt-add-debug-output-to-devicetree-command.patch
  efi-EFI-Device-Tree-Fixup-Protocol.patch
++ubuntu-disable-LOAD-FILE2-protocol-for-initrd-on-ARM.patch
 diff --git a/debian/patches/ubuntu-disable-LOAD-FILE2-protocol-for-initrd-on-ARM.patch b/debian/patches/ubuntu-disable-LOAD-FILE2-protocol-for-initrd-on-ARM.patch
 new file mode 100644
 index 0000000..b7f7f23
 --- /dev/null
 +++ b/debian/patches/ubuntu-disable-LOAD-FILE2-protocol-for-initrd-on-ARM.patch
@@ -0,0 +1,63 @@
++From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
++Date: Wed, 13 Apr 2022 18:51:37 +0200
++Subject: ubuntu: disable LOAD FILE2 protocol for initrd on ARM
++
++RISC-V cannot load the initrd without the LOAD FILE2 protocol.
++
++Currently the LOAD FILE2 protocol does not work with PXE due to a preboot
++hook invoking grub_net_fini_hw().
++
++So let's disable this for ARM until a solution has been agreed on with
++upstream.
++
++Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
++---
++ grub-core/loader/efi/linux.c | 18 +++++++++++++++---
++ 1 file changed, 15 insertions(+), 3 deletions(-)
++
++diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
++index 24abc0c0b..6dd31966d 100644
++--- a/grub-core/loader/efi/linux.c
+++++ b/grub-core/loader/efi/linux.c
++@@ -67,8 +67,10 @@ struct grub_arm64_linux_pe_header
++ grub_err_t
++ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
++ {
+++#ifdef __riscv
++   struct grub_pe32_coff_header *coff_header;
++   struct grub_pe32_optional_header *optional_header;
+++#endif
++
++   if (lh->magic != GRUB_LINUX_ARCH_MAGIC_SIGNATURE)
++     return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
++@@ -80,17 +82,27 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
++   grub_dprintf ("linux", "UEFI stub kernel:\n");
++   grub_dprintf ("linux", "PE/COFF header @ %08x\n", lh->hdr_offset);
++
++-  coff_header = (struct grub_pe32_coff_header *)((unsigned long)lh + lh->hdr_offset);
++-  optional_header = (struct grub_pe32_optional_header *)(coff_header + 1);
++-
++   /*
++    * Linux kernels built for any architecture are guaranteed to support the
++    * LoadFile2 based initrd loading protocol if the image version is >= 1.
++    */
+++#ifdef __riscv
+++  /*
+++   * RISC-V cannot load the initrd without the LOAD FILE2 protocol.
+++   *
+++   * Currently the LOAD FILE2 protocol does not work with PXE due to a preboot
+++   * hook invoking grub_net_fini_hw().
+++   *
+++   * TODO: clarify if the preboot hook is needed
+++   */
+++  coff_header = (struct grub_pe32_coff_header *)((unsigned long)lh + lh->hdr_offset);
+++  optional_header = (struct grub_pe32_optional_header *)(coff_header + 1);
+++
++   if (optional_header->major_image_version >= 1)
++     initrd_use_loadfile2 = 1;
++    else
++     initrd_use_loadfile2 = 0;
+++#endif
++
++   grub_dprintf ("linux", "LoadFile2 initrd loading %sabled\n",
++ 		initrd_use_loadfile2 ? "en" : "dis");

grub

Merge ~xypron/grub:disable_lf2 into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Commit message

Description of the change

Preview Diff

Subscribers