Commit b360edb4 authored Apr 14, 2015 by David Rientjes Committed by Linus Torvalds Apr 14, 2015

mm, mempolicy: migrate_to_node should only migrate to node



migrate_to_node() is intended to migrate a page from one source node to
a target node.

Today, migrate_to_node() could end up migrating to any node, not only
the target node.  This is because the page migration allocator,
new_node_page() does not pass __GFP_THISNODE to
alloc_pages_exact_node().  This causes the target node to be preferred
but allows fallback to any other node in order of affinity.

Prevent this by allocating with __GFP_THISNODE.  If memory is not
available, -ENOMEM will be returned as appropriate.

Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3cb29d11

mm/mempolicy.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -945,7 +945,8 @@ static struct page new_node_page(struct page page, unsigned long node, int **x
		return alloc_huge_page_node(page_hstate(compound_head(page)),
		node);
		else
		return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE, 0);
		return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE \|
		__GFP_THISNODE, 0);
		}

		/*

Admin message