The patch titled
Subject: mm: initialize hotplugged pages as reserved
has been removed from the -mm tree. Its filename was
mm-initialize-hotplugged-pages-as-reserved.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Subject: mm: initialize hotplugged pages as reserved
Commit 92923ca3aace (mm: meminit: only set page reserved in the memblock
region) broke memory hotplug which expects the memmap for newly added
sections to be reserved until onlined by online_pages_range(). This patch
marks hotplugged pages as reserved when adding new zones.
Signed-off-by: Mel Gorman <mgorman@xxxxxxx>
Reported-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Tested-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Cc: Nathan Zimmer <nzimmer@xxxxxxx>
Cc: Robin Holt <holt@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory_hotplug.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff -puN mm/memory_hotplug.c~mm-initialize-hotplugged-pages-as-reserved mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~mm-initialize-hotplugged-pages-as-reserved
+++ a/mm/memory_hotplug.c
@@ -446,7 +446,7 @@ static int __meminit __add_zone(struct z
int nr_pages = PAGES_PER_SECTION;
int nid = pgdat->node_id;
int zone_type;
- unsigned long flags;
+ unsigned long flags, pfn;
int ret;
zone_type = zone - pgdat->node_zones;
@@ -461,6 +461,14 @@ static int __meminit __add_zone(struct z
pgdat_resize_unlock(zone->zone_pgdat, &flags);
memmap_init_zone(nr_pages, nid, zone_type,
phys_start_pfn, MEMMAP_HOTPLUG);
+
+ /* online_page_range is called later and expects pages reserved */
+ for (pfn = phys_start_pfn; pfn < phys_start_pfn + nr_pages; pfn++) {
+ if (!pfn_valid(pfn))
+ continue;
+
+ SetPageReserved(pfn_to_page(pfn));
+ }
return 0;
}
_
Patches currently in -mm which might be from mgorman@xxxxxxxxxxxxxxxxxxx are
origin.patch
mm-page_isolation-remove-bogus-tests-for-isolated-pages.patch
mm-rename-and-move-get-set_freepage_migratetype.patch
mm-vmscan-never-isolate-more-pages-than-necessary.patch
vmscan-fix-increasing-nr_isolated-incurred-by-putback-unevictable-pages.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
