x86: only load initrd above 4g on second try
PATCH 1/1 x86: only load initrd above 4g on second try
Mantas found that after commit 4bf7111f5016 ("x86/efi: Support initrd loaded above 4G"), the kernel freezes at the earliest possible moment when trying to boot via UEFI on Asus laptop.
Revert to old way to load initrd under 4G on first try, second try will use above 4G buffer when initrd is too big and does not fit under 4G.
-v2: add print out for second try, and print out files buf address.
--- arch/x86/boot/compressed/eboot.c | 18 +++++++++++------- drivers/firmware/efi/libstub/efi-stub-helper.c | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-)
arch/x86/boot/compressed/eboot.c +11 -7
@@ -1032,7 +1032,6 @@ struct boot_params *make_boot_params(strint i;unsigned long ramdisk_addr;unsigned long ramdisk_size; -unsigned long initrd_addr_max; efi_early = c; sys_table = (efi_system_table_t *)(unsigned long )efi_early->table;
@@ -1095,15 +1094,20 @@ struct boot_params *make_boot_params(strmemset (sdt,0 ,sizeof (*sdt)); -if (hdr->xloadflags &XLF_CAN_BE_LOADED_ABOVE_4G ) - initrd_addr_max =-1UL ; -else - initrd_addr_max = hdr->initrd_addr_max; - status =handle_cmdline_files (sys_table, image, (char *)(unsigned long )hdr->cmd_line_ptr, -"initrd=" , initrd_addr_max, +"initrd=" , hdr->initrd_addr_max, &ramdisk_addr, &ramdisk_size); + +if (status !=EFI_SUCCESS && + hdr->xloadflags &XLF_CAN_BE_LOADED_ABOVE_4G ) { +efi_printk (sys_table,"Trying to load files to higher address\n" ); + status =handle_cmdline_files (sys_table, image, + (char *)(unsigned long )hdr->cmd_line_ptr, +"initrd=" ,-1UL , + &ramdisk_addr, &ramdisk_size); + } +if (status !=EFI_SUCCESS ) goto fail2; hdr->ramdisk_image = ramdisk_addr &0xffffffff ;
drivers/firmware/efi/libstub/efi-stub-helper.c +5 -0
@@ -396,6 +396,7 @@ efi_status_t handle_cmdline_files(efi_syif (file_size_total) {unsigned long addr; +char buf[64 ];/* * Multiple files need to be at consecutive addresses in memory,
@@ -416,6 +417,10 @@ efi_status_t handle_cmdline_files(efi_sy goto free_file_total; } +snprintf (buf,sizeof (buf),"files buf: [%lx,%lx)\n" , + file_addr, file_addr + file_size_total); +efi_printk (sys_table_arg, buf); + addr = file_addr;for (j =0 ; j < nr_files; j++) {unsigned long size;
Quoted 71 lines · Yinghai Lu
Mantas found that after commit
4bf7111f5016("x86/efi: Support initrd loaded above 4G"), the kernel freezes at the earliest possible moment when trying to boot via UEFI on Asus laptop.Revert to old way to load initrd under 4G on first try, second try will use above 4G buffer when initrd is too big and does not fit under 4G.
-v2: add print out for second try, and print out files buf address.
Reported-by Mantas Mikulėnas <[email protected]>Tested-by Anders Darander <[email protected]>Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/boot/compressed/eboot.c | 18 +++++++++++------- drivers/firmware/efi/libstub/efi-stub-helper.c | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-)Index:
linux-2.6/arch/x86/boot/compressed/eboot.c
===================================================================arch/x86/boot/compressed/eboot.c +11
-7@@ -1032,7 +1032,6 @@ struct boot_params *make_boot_params(strint i;unsigned long ramdisk_addr;unsigned long ramdisk_size; -unsigned long initrd_addr_max; efi_early = c; sys_table = (efi_system_table_t *)(unsigned long )efi_early->table;@@ -1095,15 +1094,20 @@ struct boot_params *make_boot_params(strmemset (sdt,0 ,sizeof (*sdt)); -if (hdr->xloadflags &XLF_CAN_BE_LOADED_ABOVE_4G ) - initrd_addr_max =-1UL ; -else - initrd_addr_max = hdr->initrd_addr_max; - status =handle_cmdline_files (sys_table, image, (char *)(unsigned long )hdr->cmd_line_ptr, -"initrd=" , initrd_addr_max, +"initrd=" , hdr->initrd_addr_max, &ramdisk_addr, &ramdisk_size); + +if (status !=EFI_SUCCESS && + hdr->xloadflags &XLF_CAN_BE_LOADED_ABOVE_4G ) { +efi_printk (sys_table,"Trying to load files to higher address\n" ); + status =handle_cmdline_files (sys_table, image, + (char *)(unsigned long )hdr->cmd_line_ptr, +"initrd=" ,-1UL , + &ramdisk_addr, &ramdisk_size); + } +if (status !=EFI_SUCCESS ) goto fail2; hdr->ramdisk_image = ramdisk_addr &0xffffffff ;Index:
linux-2.6/drivers/firmware/efi/libstub/efi-stub-helper.c
===================================================================drivers/firmware/efi/libstub/efi-stub-helper.c +1
-0@@ -396,6 +396,7 @@ efi_status_t handle_cmdline_files(efi_syif (file_size_total) {unsigned long addr; +char buf[64 ];/* * Multiple files need to be at consecutive addresses in memory,
drivers/firmware/efi/libstub/efi-stub-helper.c efi_status_t handle_cmdline_files(efi_sy · line 421
Quoted 5 lines
drivers/firmware/efi/libstub/efi-stub-helper.c +2
-0@@ -416,6 +417,10 @@ efi_status_t handle_cmdline_files(efi_sy goto free_file_total; } +snprintf (buf,sizeof (buf),"files buf: [%lx,%lx)\n" , + file_addr, file_addr + file_size_total);
Sorry, Please ignore this version.
I only did make, but if fails with link.
drivers/firmware/efi/libstub/lib.a(efi-stub-helper.o): In function `handle_cmdline_files':
efi-stub-helper.c:(.text+0xa16): undefined reference to `snprintf'
Quoted 5 lines
drivers/firmware/efi/libstub/efi-stub-helper.c +2
-0+efi_printk (sys_table_arg, buf); + addr = file_addr;for (j =0 ; j < nr_files; j++) {unsigned long size;