On Mon, Apr 15, 2024 at 11:22:58PM +0000, Ashish Kalra wrote: > From: Ashish Kalra <ashish.kalra@xxxxxxx> > > For kexec use case, need to use and stick to the EFI memmap passed > from the first kernel via boot-params/setup data, hence, > skip efi_arch_mem_reserve() during kexec. Please use this or similar scheme when formulating your commit messages. This above is too laconic. 1. Prepare the context for the explanation briefly. 2. Explain the problem at hand. 3. "It happens because of <...>" 4. "Fix it by doing X" 5. "(Potentially do Y)." And some of those above are optional depending on the issue being explained. For more detailed info, see Documentation/process/submitting-patches.rst, Section "2) Describe your changes". > Additionally during SNP guest kexec testing discovered that EFI memmap > is corrupted during chained kexec. That sentence needs sanitization. > kexec_enter_virtual_mode() during late init will remap the efi_memmap > physical pages allocated in efi_arch_mem_reserve() via memblock & then s/&/and/ This is not code. Please take a greater care when writing commit messages - they're not write-only. > subsequently cause random EFI memmap corruption once memblock is > freed/teared-down. "torn down" > Suggested-by: Dave Young <dyoung@xxxxxxxxxx> > [Dave Young: checking the md attribute instead of checking the efi_setup] > Signed-off-by: Ashish Kalra <ashish.kalra@xxxxxxx> > --- > arch/x86/platform/efi/quirks.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c > index f0cc00032751..982f5e50a4b3 100644 > --- a/arch/x86/platform/efi/quirks.c > +++ b/arch/x86/platform/efi/quirks.c > @@ -258,12 +258,28 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) > int num_entries; > void *new; > > - if (efi_mem_desc_lookup(addr, &md) || > - md.type != EFI_BOOT_SERVICES_DATA) { > + /* > + * For kexec use case, we need to use the EFI memmap passed from the first Make all your text impersonal - no "we", "I", etc. > + * kernel via setup data, so we need to skip this. What exactly do we need to skip? If the EFI memory descriptor lookup fails? > + * Additionally kexec_enter_virtual_mode() during late init will remap > + * the efi_memmap physical pages allocated here via memboot & then > + * subsequently cause random EFI memmap corruption once memblock is freed. > + */ Why is that comment here and what is its relevance to the line it is above of? > + if (efi_mem_desc_lookup(addr, &md)) { > pr_err("Failed to lookup EFI memory descriptor for %pa\n", &addr); > return; > } > > + if (md.type != EFI_BOOT_SERVICES_DATA) { > + pr_err("Skip reserving non EFI Boot Service Data memory for %pa\n", &addr); What is this pr_err() useful for? > + return; > + } > + > + /* Kexec copied the efi memmap from the first kernel, thus skip the case */ kexec? This is a generic function - what does it have to do with kexec? The subject of this patch is: Subject: [PATCH v5 1/3] efi/x86: skip efi_arch_mem_reserve() in case of kexec and yet, nothing skips this function - it adds a bunch of checks, printks and early returns with the intent that those early returns happen on kexec and thus the actual memremap doesn't happen there. So it is some sort of: let's check things which will be true in a kexec-ed kernel and thus avoid the function by returning early. But I have no clue. It sounds to me like you need to go back up, to the 10000ft view and explain how exactly this efi_mem_reserve() causes trouble for the kexec-ed kernel so that we can think of a proper solution, not some random hackery. Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette _______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec