mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] x86/kexec: do not reserve kexec setup_data in kexec e820 table
@ 2020-02-12 11:04 Dave Young
  2020-02-24  7:14 ` Dave Young
  2020-02-24 10:51 ` [tip: x86/kdump] x86/kexec: Do not reserve EFI setup_data in the " tip-bot2 for Dave Young
  0 siblings, 2 replies; 4+ messages in thread
From: Dave Young @ 2020-02-12 11:04 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov; +Cc: x86, linux-kernel, kexec

The e820 table for kexec kernel always takes setup_data as reserved.
It is reasonable for the setup_data passed by the 1st kernel boot loader,
for example SETUP_PCI etc.  But SETUP_EFI is used by kexec itself to
enable EFI in 2nd kernel, also kexec setups it every time. Thus it
is pointless to reserve kexec prepared setup_data.

1st physical boot: no SETUP_EFI
kexec load new kernel and prepare a SETUP_EFI setup_data, then reboot
 -> 2nd kernel sees SETUP_EFI, reserves in both e820 and kexec e820
    another kexec load prepare a new SETUP_EFI, then reboot
    -> 3rd kernel has two SETUP_EFI ranges reserved
       -> and so on..

Thus skip SETUP_EFI while reserving setup_data for kexec kernel.

Signed-off-by: Dave Young <dyoung@redhat.com>
---
 arch/x86/kernel/e820.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- linux-x86.orig/arch/x86/kernel/e820.c
+++ linux-x86/arch/x86/kernel/e820.c
@@ -999,7 +999,9 @@ void __init e820__reserve_setup_data(voi
 	while (pa_data) {
 		data = early_memremap(pa_data, sizeof(*data));
 		e820__range_update(pa_data, sizeof(*data)+data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);
-		e820__range_update_kexec(pa_data, sizeof(*data)+data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);
+		/* Skip kexec passed setup_data */
+		if (data->type != SETUP_EFI)
+			e820__range_update_kexec(pa_data, sizeof(*data)+data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);
 
 		if (data->type == SETUP_INDIRECT &&
 		    ((struct setup_indirect *)data->data)->type != SETUP_INDIRECT) {


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-02-25  1:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-12 11:04 [PATCH] x86/kexec: do not reserve kexec setup_data in kexec e820 table Dave Young
2020-02-24  7:14 ` Dave Young
2020-02-24 10:51 ` [tip: x86/kdump] x86/kexec: Do not reserve EFI setup_data in the " tip-bot2 for Dave Young
2020-02-25  1:49   ` Dave Young

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®