mm-memory_hotplug-dont-access-uninitialized-memmaps-in-shrink_pgdat_span.patch removed from -mm tree
The patch titled
Subject: mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span()
has been removed from the -mm tree. Its filename was
mm-memory_hotplug-dont-access-uninitialized-memmaps-in-shrink_pgdat_span.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span()
We might use the nid of memmaps that were never initialized. For example, if the memmap was poisoned, we will crash the kernel in pfn_to_nid() right now. Let's use the calculated boundaries of the separate zones instead. This now also avoids having to iterate over a whole bunch of subsections again, after shrinking one zone.
Before commit d0dc12e86b31 ("mm/memory_hotplug: optimize memory hotplug"), the memmap was initialized to 0 and the node was set to the right value. After that commit, the node might be garbage.
We'll have to fix shrink_zone_span() next.
---
mm/memory_hotplug.c | 74 +++++++++--------------------------------- 1 file changed, 16 insertions(+), 58 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-dont-access-uninitialized-memmaps-in-shrink_pgdat_span +16 -58
@@ -436,67 +436,25 @@ static void shrink_zone_span(struct zonezone_span_writeunlock (zone); } -static void shrink_pgdat_span (struct pglist_data *pgdat, -unsigned long start_pfn,unsigned long end_pfn) +static void update_pgdat_span (struct pglist_data *pgdat) { -unsigned long pgdat_start_pfn = pgdat->node_start_pfn; -unsigned long p =pgdat_end_pfn (pgdat);/* pgdat_end_pfn namespace clash */ -unsigned long pgdat_end_pfn = p; -unsigned long pfn; -int nid = pgdat->node_id; - -if (pgdat_start_pfn == start_pfn) { -/* -* If the section is smallest section in the pgdat, it need -* shrink pgdat->node_start_pfn and pgdat->node_spanned_pages. -* In this case, we find second smallest valid mem_section -* for shrinking zone. -*/ - pfn =find_smallest_section_pfn (nid,NULL , end_pfn, - pgdat_end_pfn); -if (pfn) { - pgdat->node_start_pfn = pfn; - pgdat->node_spanned_pages = pgdat_end_pfn - pfn; - } - }else if (pgdat_end_pfn == end_pfn) { -/* -* If the section is biggest section in the pgdat, it need -* shrink pgdat->node_spanned_pages. -* In this case, we find second biggest valid mem_section for -* shrinking zone. -*/ - pfn =find_biggest_section_pfn (nid,NULL , pgdat_start_pfn, - start_pfn); -if (pfn) - pgdat->node_spanned_pages = pfn - pgdat_start_pfn +1 ; - } - -/* -* If the section is not biggest or smallest mem_section in the pgdat, -* it only creates a hole in the pgdat. So in this case, we need not -* change the pgdat. -* But perhaps, the pgdat has only hole data. Thus it check the pgdat -* has only hole or not. -*/ - pfn = pgdat_start_pfn; -for (; pfn < pgdat_end_pfn; pfn +=PAGES_PER_SUBSECTION ) { -if (unlikely (!pfn_valid (pfn))) -continue ; - -if (pfn_to_nid (pfn) != nid) -continue ; - -/* Skip range to be removed */ -if (pfn >= start_pfn && pfn < end_pfn) -continue ; +unsigned long node_start_pfn =0 , node_end_pfn =0 ; +struct zone *zone; -/* If we find valid section, we have nothing to do */ -return ; +for (zone = pgdat->node_zones; + zone < pgdat->node_zones +MAX_NR_ZONES ; zone++) { +unsigned long zone_end_pfn = zone->zone_start_pfn + + zone->spanned_pages; + +/* No need to lock the zones, they can't change. */ +if (zone_end_pfn > node_end_pfn) + node_end_pfn = zone_end_pfn; +if (zone->zone_start_pfn < node_start_pfn) + node_start_pfn = zone->zone_start_pfn; } -/* The pgdat has no valid section */ - pgdat->node_start_pfn =0 ; - pgdat->node_spanned_pages =0 ; + pgdat->node_start_pfn = node_start_pfn; + pgdat->node_spanned_pages = node_end_pfn - node_start_pfn; } static void __remove_zone(struct zone *zone, unsigned long start_pfn,
@@ -507,7 +465,7 @@ static void __remove_zone(struct zone *zpgdat_resize_lock (zone->zone_pgdat, &flags);shrink_zone_span (zone, start_pfn, start_pfn + nr_pages); -shrink_pgdat_span (pgdat, start_pfn, start_pfn + nr_pages); +update_pgdat_span (pgdat);pgdat_resize_unlock (zone->zone_pgdat, &flags); }
_
Patches currently in -mm which might be from [email protected] are
mm-memory_hotplug-export-generic_online_page.patch hv_balloon-use-generic_online_page.patch mm-memory_hotplug-remove-__online_page_free-and-__online_page_increment_counters.patch mm-memory_hotplug-dont-access-uninitialized-memmaps-in-shrink_zone_span.patch mm-memory_hotplug-shrink-zones-when-offlining-memory.patch mm-memory_hotplug-poison-memmap-in-remove_pfn_range_from_zone.patch mm-memory_hotplug-we-always-have-a-zone-in-find_smallestbiggest_section_pfn.patch mm-memory_hotplug-dont-check-for-all-holes-in-shrink_zone_span.patch mm-memory_hotplug-drop-local-variables-in-shrink_zone_span.patch mm-memory_hotplug-cleanup-__remove_pages.patch