The patch titled
Subject: mem-hotplug: use GFP_HIGHUSER_MOVABLE and alloc from next node in alloc_migrate_target()
has been removed from the -mm tree. Its filename was
mem-hotplug-use-gfp_highuser_movable-and-alloc-from-next-node-in-alloc_migrate_target.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Subject: mem-hotplug: use GFP_HIGHUSER_MOVABLE and alloc from next node in alloc_migrate_target()
alloc_migrate_target() is called from migrate_pages(), and the page is
always from user space, so we can add __GFP_HIGHMEM directly.
Second, when we offline a node, the new page should alloced from other
nodes instead of the current node, because re-migrate is a waste of time.
Link: http://lkml.kernel.org/r/5786F81B.1070502@xxxxxxxxxx
Signed-off-by: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_isolation.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff -puN mm/page_isolation.c~mem-hotplug-use-gfp_highuser_movable-and-alloc-from-next-node-in-alloc_migrate_target mm/page_isolation.c
--- a/mm/page_isolation.c~mem-hotplug-use-gfp_highuser_movable-and-alloc-from-next-node-in-alloc_migrate_target
+++ a/mm/page_isolation.c
@@ -283,20 +283,16 @@ int test_pages_isolated(unsigned long st
struct page *alloc_migrate_target(struct page *page, unsigned long private,
int **resultp)
{
- gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
-
/*
- * TODO: allocate a destination hugepage from a nearest neighbor node,
+ * TODO: allocate a destination page from a nearest neighbor node,
* accordance with memory policy of the user process if possible. For
* now as a simple work-around, we use the next node for destination.
*/
+ int nid = next_node_in(page_to_nid(page), node_online_map);
+
if (PageHuge(page))
return alloc_huge_page_node(page_hstate(compound_head(page)),
- next_node_in(page_to_nid(page),
- node_online_map));
-
- if (PageHighMem(page))
- gfp_mask |= __GFP_HIGHMEM;
-
- return alloc_page(gfp_mask);
+ nid);
+ else
+ return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0);
}
_
Patches currently in -mm which might be from qiuxishi@xxxxxxxxxx are
--
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
