Skip to content

Commit 6e276d2

Browse files
rientjestorvalds
authored andcommitted
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: David Rientjes <rientjes@google.com> Acked-by: Vlastimil 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 5265047 commit 6e276d2

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

kernel/cpuset.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,20 +2453,12 @@ static struct cpuset *nearest_hardwall_ancestor(struct cpuset *cs)
24532453
* @node: is this an allowed node?
24542454
* @gfp_mask: memory allocation flags
24552455
*
2456-
* If we're in interrupt, yes, we can always allocate. If __GFP_THISNODE is
2457-
* set, yes, we can always allocate. If node is in our task's mems_allowed,
2458-
* yes. If it's not a __GFP_HARDWALL request and this node is in the nearest
2459-
* hardwalled cpuset ancestor to this task's cpuset, yes. If the task has been
2460-
* OOM killed and has access to memory reserves as specified by the TIF_MEMDIE
2461-
* flag, yes.
2456+
* If we're in interrupt, yes, we can always allocate. If @node is set in
2457+
* current's mems_allowed, yes. If it's not a __GFP_HARDWALL request and this
2458+
* node is set in the nearest hardwalled cpuset ancestor to current's cpuset,
2459+
* yes. If current has access to memory reserves due to TIF_MEMDIE, yes.
24622460
* Otherwise, no.
24632461
*
2464-
* The __GFP_THISNODE placement logic is really handled elsewhere,
2465-
* by forcibly using a zonelist starting at a specified node, and by
2466-
* (in get_page_from_freelist()) refusing to consider the zones for
2467-
* any node on the zonelist except the first. By the time any such
2468-
* calls get to this routine, we should just shut up and say 'yes'.
2469-
*
24702462
* GFP_USER allocations are marked with the __GFP_HARDWALL bit,
24712463
* and do not allow allocations outside the current tasks cpuset
24722464
* 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)
25022494
int allowed; /* is allocation in zone z allowed? */
25032495
unsigned long flags;
25042496

2505-
if (in_interrupt() || (gfp_mask & __GFP_THISNODE))
2497+
if (in_interrupt())
25062498
return 1;
25072499
if (node_isset(node, current->mems_allowed))
25082500
return 1;

0 commit comments

Comments
 (0)