mm-page_alloc-fix-and-rework-pfn-handling-in-memmap_init_zone.patch removed from -mm tree
The patch titled
Subject: mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
has been removed from the -mm tree. Its filename was
mm-page_alloc-fix-and-rework-pfn-handling-in-memmap_init_zone.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
Let's update the pfn manually whenever we continue the loop. This makes the code easier to read but also less error prone (and we can directly fix one issue).
When overlap_memmap_init() returns true, pfn is updated to "memblock_region_memory_end_pfn(r)". So it already points at the *next* pfn to process. Incrementing the pfn another time is wrong, we might leave one uninitialized. I spotted this by inspecting the code, so I have no idea if this is relevant in practise (with kernelcore=mirror).
emmap_init_zone")
---
mm/page_alloc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-fix-and-rework-pfn-handling-in-memmap_init_zone +6 -3
@@ -5905,18 +5905,20 @@ void __meminit memmap_init_zone(unsigned }#endif -for (pfn = start_pfn; pfn < end_pfn; pfn++) { +for (pfn = start_pfn; pfn < end_pfn; ) {/* * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory. */ if (context ==MEMMAP_EARLY ) {if (!early_pfn_valid (pfn)) { - pfn =next_pfn (pfn) -1 ; + pfn =next_pfn (pfn);continue ; } -if (!early_pfn_in_nid (pfn, nid)) +if (!early_pfn_in_nid (pfn, nid)) { + pfn++;continue ; + }if (overlap_memmap_init (zone, &pfn))continue ;if (defer_init (nid, pfn, end_pfn))
@@ -5944,6 +5946,7 @@ void __meminit memmap_init_zone(unsignedset_pageblock_migratetype (page,MIGRATE_MOVABLE );cond_resched (); } + pfn++; } }
_
Patches currently in -mm which might be from [email protected] are
drivers-base-memoryc-cache-memory-blocks-in-xarray-to-accelerate-lookup-fix.patch