* Re: [PATCH] x86/boot: Fix boot failure regression
2019-08-21 19:25 ` [PATCH] x86/boot: Fix boot failure regression John Hubbard
@ 2019-08-21 19:46 ` Neil MacLeod
2019-08-21 21:24 ` Thomas Gleixner
2019-08-23 1:10 ` [tip: x86/urgent] x86/boot: Fix boot regression caused by bootparam sanitizing tip-bot2 for John Hubbard
1 sibling, 1 reply; 5+ messages in thread
From: Neil MacLeod @ 2019-08-21 19:46 UTC (permalink / raw)
To: John Hubbard
Cc: H . Peter Anvin, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
gregkh, x86, LKML, stable
I can confirm 5.3-rc5 is booting again from internal M2 drive on
Skylake i5 NUC with this commit - many thanks!
Regards
Neil
On Wed, 21 Aug 2019 at 20:25, John Hubbard <jhubbard@nvidia.com> wrote:
>
> commit a90118c445cc ("x86/boot: Save fields explicitly, zero out
> everything else") had two errors:
>
> * It preserved boot_params.acpi_rsdp_addr, and
> * It failed to preserve boot_params.hdr
>
> Therefore, zero out acpi_rsdp_addr, and preserve hdr.
>
> Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else")
> Reported-by: Neil MacLeod <neil@nmacleod.com>
> Suggested-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: H. Peter Anvin <hpa@zytor.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
> arch/x86/include/asm/bootparam_utils.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
> index f5e90a849bca..9e5f3c722c33 100644
> --- a/arch/x86/include/asm/bootparam_utils.h
> +++ b/arch/x86/include/asm/bootparam_utils.h
> @@ -59,7 +59,6 @@ static void sanitize_boot_params(struct boot_params *boot_params)
> BOOT_PARAM_PRESERVE(apm_bios_info),
> BOOT_PARAM_PRESERVE(tboot_addr),
> BOOT_PARAM_PRESERVE(ist_info),
> - BOOT_PARAM_PRESERVE(acpi_rsdp_addr),
> BOOT_PARAM_PRESERVE(hd0_info),
> BOOT_PARAM_PRESERVE(hd1_info),
> BOOT_PARAM_PRESERVE(sys_desc_table),
> @@ -71,6 +70,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
> BOOT_PARAM_PRESERVE(eddbuf_entries),
> BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
> BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
> + BOOT_PARAM_PRESERVE(hdr),
> BOOT_PARAM_PRESERVE(e820_table),
> BOOT_PARAM_PRESERVE(eddbuf),
> };
> --
> 2.22.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: x86/urgent] x86/boot: Fix boot regression caused by bootparam sanitizing
2019-08-21 19:25 ` [PATCH] x86/boot: Fix boot failure regression John Hubbard
2019-08-21 19:46 ` Neil MacLeod
@ 2019-08-23 1:10 ` tip-bot2 for John Hubbard
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot2 for John Hubbard @ 2019-08-23 1:10 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, stable, John Hubbard, Thomas Gleixner, Neil MacLeod
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7846f58fba964af7cb8cf77d4d13c33254725211
Gitweb: https://git.kernel.org/tip/7846f58fba964af7cb8cf77d4d13c33254725211
Author: John Hubbard <jhubbard@nvidia.com>
AuthorDate: Wed, 21 Aug 2019 12:25:13 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 21 Aug 2019 22:37:09 +02:00
x86/boot: Fix boot regression caused by bootparam sanitizing
commit a90118c445cc ("x86/boot: Save fields explicitly, zero out everything
else") had two errors:
* It preserved boot_params.acpi_rsdp_addr, and
* It failed to preserve boot_params.hdr
Therefore, zero out acpi_rsdp_addr, and preserve hdr.
Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else")
Reported-by: Neil MacLeod <neil@nmacleod.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com
---
arch/x86/include/asm/bootparam_utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
index 9e5f3c7..f5e90a8 100644
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -59,6 +59,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
BOOT_PARAM_PRESERVE(apm_bios_info),
BOOT_PARAM_PRESERVE(tboot_addr),
BOOT_PARAM_PRESERVE(ist_info),
+ BOOT_PARAM_PRESERVE(acpi_rsdp_addr),
BOOT_PARAM_PRESERVE(hd0_info),
BOOT_PARAM_PRESERVE(hd1_info),
BOOT_PARAM_PRESERVE(sys_desc_table),
@@ -70,7 +71,6 @@ static void sanitize_boot_params(struct boot_params *boot_params)
BOOT_PARAM_PRESERVE(eddbuf_entries),
BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
- BOOT_PARAM_PRESERVE(hdr),
BOOT_PARAM_PRESERVE(e820_table),
BOOT_PARAM_PRESERVE(eddbuf),
};
^ permalink raw reply related [flat|nested] 5+ messages in thread