* [PATCH -v2] x86: only load initrd above 4g on second try
@ 2014-09-02 19:09 Yinghai Lu
2014-09-02 21:57 ` Yinghai Lu
0 siblings, 1 reply; 2+ messages in thread
From: Yinghai Lu @ 2014-09-02 19:09 UTC (permalink / raw)
To: Matt Fleming, H. Peter Anvin, Ingo Molnar
Cc: Mantas Mikulėnas, Anders Darander, linux-efi, linux-kernel,
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 <grawity@gmail.com>
Tested-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
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
===================================================================
--- linux-2.6.orig/arch/x86/boot/compressed/eboot.c
+++ linux-2.6/arch/x86/boot/compressed/eboot.c
@@ -1032,7 +1032,6 @@ struct boot_params *make_boot_params(str
int 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(str
memset(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
===================================================================
--- linux-2.6.orig/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ linux-2.6/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -396,6 +396,7 @@ efi_status_t handle_cmdline_files(efi_sy
if (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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -v2] x86: only load initrd above 4g on second try
2014-09-02 19:09 [PATCH -v2] x86: only load initrd above 4g on second try Yinghai Lu
@ 2014-09-02 21:57 ` Yinghai Lu
0 siblings, 0 replies; 2+ messages in thread
From: Yinghai Lu @ 2014-09-02 21:57 UTC (permalink / raw)
To: Matt Fleming, H. Peter Anvin, Ingo Molnar
Cc: Mantas Mikulėnas, Anders Darander, linux-efi,
Linux Kernel Mailing List, Yinghai Lu
On Tue, Sep 2, 2014 at 12:09 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> 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 <grawity@gmail.com>
> Tested-by: Anders Darander <anders@chargestorm.se>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>
> ---
> 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
> ===================================================================
> --- linux-2.6.orig/arch/x86/boot/compressed/eboot.c
> +++ linux-2.6/arch/x86/boot/compressed/eboot.c
> @@ -1032,7 +1032,6 @@ struct boot_params *make_boot_params(str
> int 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(str
>
> memset(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
> ===================================================================
> --- linux-2.6.orig/drivers/firmware/efi/libstub/efi-stub-helper.c
> +++ linux-2.6/drivers/firmware/efi/libstub/efi-stub-helper.c
> @@ -396,6 +396,7 @@ efi_status_t handle_cmdline_files(efi_sy
>
> if (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);
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'
> + efi_printk(sys_table_arg, buf);
> +
> addr = file_addr;
> for (j = 0; j < nr_files; j++) {
> unsigned long size;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-02 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-02 19:09 [PATCH -v2] x86: only load initrd above 4g on second try Yinghai Lu
2014-09-02 21:57 ` Yinghai Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).