[PATCH] Add __GFP_THISNODE to avoid fallback to other nodes and ignore cpuset/memory policy restrictions
Add a new gfp flag __GFP_THISNODE to avoid fallback to other nodes. This flag is essential if a kernel component requires memory to be located on a certain node. It will be needed for alloc_pages_node() to force allocation on the indicated node and for alloc_pages() to force allocation on the current node. Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Andy Whitcroft <apw@shadowen.org> Cc: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
056c62418c
commit
9b819d204c
@@ -1290,7 +1290,7 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order)
|
||||
|
||||
if ((gfp & __GFP_WAIT) && !in_interrupt())
|
||||
cpuset_update_task_memory_state();
|
||||
if (!pol || in_interrupt())
|
||||
if (!pol || in_interrupt() || (gfp & __GFP_THISNODE))
|
||||
pol = &default_policy;
|
||||
if (pol->policy == MPOL_INTERLEAVE)
|
||||
return alloc_page_interleave(gfp, order, interleave_nodes(pol));
|
||||
|
@@ -893,6 +893,9 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order,
|
||||
* See also cpuset_zone_allowed() comment in kernel/cpuset.c.
|
||||
*/
|
||||
do {
|
||||
if (unlikely((gfp_mask & __GFP_THISNODE) &&
|
||||
(*z)->zone_pgdat != zonelist->zones[0]->zone_pgdat))
|
||||
break;
|
||||
if ((alloc_flags & ALLOC_CPUSET) &&
|
||||
!cpuset_zone_allowed(*z, gfp_mask))
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user