@@ -1558,7 +1558,7 @@ int move_freepages(struct zone *zone,
struct page *page;
unsigned long order;
struct free_area *area;
- int pages_moved = 0, old_mt;
+ int pages_moved = 0, old_mt, region_id;
#ifndef CONFIG_HOLES_IN_ZONE
/*
@@ -1585,7 +1585,23 @@ int move_freepages(struct zone *zone,
continue;
}
+ /*
+ * If the page is in the region allocator, we first move the
+ * region to the MIGRATE_MOVABLE buddy freelists and then move
+ * that page to the freelist of the requested migratetype.
+ * This is because the region allocator operates on whole region-
+ * sized chunks, whereas here we want to move pages in much
+ * smaller chunks.
+ */
order = page_order(page);
+ if (page_in_region_allocator(page)) {
+ region_id = page_zone_region_id(page);
+ __del_from_region_allocator(zone, order, MIGRATE_MOVABLE,
+ region_id);
+
+ continue; /* Try this page again from the buddy-list */
+ }
+
old_mt = get_freepage_migratetype(page);
area = &zone->free_area[order];
move_page_freelist(page, &area->free_list[old_mt],
There are situations in which the memory management subsystem needs to move pages from one migratetype to another, such as when setting up the per-zone migrate reserves (where freepages are moved from MIGRATE_MOVABLE to MIGRATE_RESERVE freelists). But the existing code that does freepage movement is unaware of the region allocator. In other words, it always assumes that the freepages that it is moving are always in the buddy page allocator's freelists. But with the introduction of the region allocator, the freepages could instead reside in the region allocator as well. So teach move_freepages() to check whether the pages are in the buddy page allocator's freelists or the region allocator and handle the two cases appropriately. The region allocator is designed in such a way that it always allocates or receives entire memory regions as a single unit. To retain these semantics during freepage movement, we first move all the pages of that region from the region allocator to the MIGRATE_MOVABLE buddy freelist and then move the requested page(s) from MIGRATE_MOVABLE to the required migratetype. Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> --- mm/page_alloc.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html