Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e276d2a authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

kernel, cpuset: remove exception for __GFP_THISNODE 



Nothing calls __cpuset_node_allowed() with __GFP_THISNODE set anymore, so
remove the obscure comment about it and its special-case exception.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Pravin Shelar <pshelar@nicira.com>
Cc: Jarno Rajahalme <jrajahalme@nicira.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5265047a

kernel/cpuset.c

+5 −13
Original line number Diff line number Diff line
@@ -2453,20 +2453,12 @@ static struct cpuset *nearest_hardwall_ancestor(struct cpuset *cs) 
 * @node: is this an allowed node?

 * @gfp_mask: memory allocation flags

 *

 * If we're in interrupt, yes, we can always allocate.  If __GFP_THISNODE is

 * set, yes, we can always allocate.  If node is in our task's mems_allowed,

 * yes.  If it's not a __GFP_HARDWALL request and this node is in the nearest

 * hardwalled cpuset ancestor to this task's cpuset, yes.  If the task has been

 * OOM killed and has access to memory reserves as specified by the TIF_MEMDIE

 * flag, yes.

 * If we're in interrupt, yes, we can always allocate.  If @node is set in

 * current's mems_allowed, yes.  If it's not a __GFP_HARDWALL request and this

 * node is set in the nearest hardwalled cpuset ancestor to current's cpuset,

 * yes.  If current has access to memory reserves due to TIF_MEMDIE, yes.

 * Otherwise, no.

 *

 * The __GFP_THISNODE placement logic is really handled elsewhere,

 * by forcibly using a zonelist starting at a specified node, and by

 * (in get_page_from_freelist()) refusing to consider the zones for

 * any node on the zonelist except the first.  By the time any such

 * calls get to this routine, we should just shut up and say 'yes'.

 *

 * GFP_USER allocations are marked with the __GFP_HARDWALL bit,

 * and do not allow allocations outside the current tasks cpuset

 * unless the task has been OOM killed as is marked TIF_MEMDIE.
@@ -2502,7 +2494,7 @@ int __cpuset_node_allowed(int node, gfp_t gfp_mask) 
	int allowed;			/* is allocation in zone z allowed? */

	unsigned long flags;



	if (in_interrupt() || (gfp_mask & __GFP_THISNODE))

	if (in_interrupt())

		return 1;

	if (node_isset(node, current->mems_allowed))

		return 1;