Skip to content

Commit f2f29da

Browse files
msizanoen1Ingo Molnar
authored andcommitted
x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions()
While debugging kexec/hibernation hangs and crashes, it turned out that the current implementation of e820__register_nosave_regions() suffers from multiple serious issues: - The end of last region is tracked by PFN, causing it to find holes that aren't there if two consecutive subpage regions are present - The nosave PFN ranges derived from holes are rounded out (instead of rounded in) which makes it inconsistent with how explicitly reserved regions are handled Fix this by: - Treating reserved regions as if they were holes, to ensure consistent handling (rounding out nosave PFN ranges is more correct as the kernel does not use partial pages) - Tracking the end of the last RAM region by address instead of pages to detect holes more precisely These bugs appear to have been introduced about ~18 years ago with the very first version of e820_mark_nosave_regions(), and its flawed assumptions were carried forward uninterrupted through various waves of rewrites and renames. [ mingo: Added Git archeology details, for kicks and giggles. ] Fixes: e8eff5a ("[PATCH] Make swsusp avoid memory holes and reserved memory regions on x86_64") Reported-by: Roberto Ricci <io@r-ricci.it> Tested-by: Roberto Ricci <io@r-ricci.it> Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: David Woodhouse <dwmw@amazon.co.uk> Cc: Len Brown <len.brown@intel.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250406-fix-e820-nosave-v3-1-f3787bc1ee1d@qtmlabs.xyz Closes: https://lore.kernel.org/all/Z4WFjBVHpndct7br@desktop0a/
1 parent 8b37357 commit f2f29da

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

arch/x86/kernel/e820.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -753,22 +753,21 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len)
753753
void __init e820__register_nosave_regions(unsigned long limit_pfn)
754754
{
755755
int i;
756-
unsigned long pfn = 0;
756+
u64 last_addr = 0;
757757

758758
for (i = 0; i < e820_table->nr_entries; i++) {
759759
struct e820_entry *entry = &e820_table->entries[i];
760760

761-
if (pfn < PFN_UP(entry->addr))
762-
register_nosave_region(pfn, PFN_UP(entry->addr));
763-
764-
pfn = PFN_DOWN(entry->addr + entry->size);
765-
766761
if (entry->type != E820_TYPE_RAM)
767-
register_nosave_region(PFN_UP(entry->addr), pfn);
762+
continue;
768763

769-
if (pfn >= limit_pfn)
770-
break;
764+
if (last_addr < entry->addr)
765+
register_nosave_region(PFN_DOWN(last_addr), PFN_UP(entry->addr));
766+
767+
last_addr = entry->addr + entry->size;
771768
}
769+
770+
register_nosave_region(PFN_DOWN(last_addr), limit_pfn);
772771
}
773772

774773
#ifdef CONFIG_ACPI

0 commit comments

Comments
 (0)