mm/oom_kill: remove unreachable __GFP_THISNODE check in constrained_alloc()
Subsystems (2)
PATCH v2 1/1 mm/oom_kill: remove unreachable __GFP_THISNODE check in constrained_alloc()
From: Ye Liu <[email protected]>
The __GFP_THISNODE check in constrained_alloc() is dead code: global OOM is never triggered with __GFP_THISNODE (blocked in __alloc_pages_may_oom before out_of_memory() is called), and memcg OOM returns CONSTRAINT_MEMCG at the top of the function before reaching this point. Remove the check, its stale comment, and update the following comment that referenced __GFP_THISNODE.
---
v2:
- Remove the dead code directly.
- Link: https://lore.kernel.org/all/[email protected]/
mm/oom_kill.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
mm/oom_kill.c +3 -10
@@ -267,18 +267,11 @@ static enum oom_constraint constrained_alloc(struct oom_control *oc)if (!oc->zonelist)return CONSTRAINT_NONE ; -/* -* Reach here only when __GFP_NOFAIL is used. So, we should avoid -* to kill current.We have to random task kill in this case. -* Hopefully, CONSTRAINT_THISNODE...but no way to handle it, now. -*/ -if (oc->gfp_mask & __GFP_THISNODE) -return CONSTRAINT_NONE ;/* -* This is not a __GFP_THISNODE allocation, so a truncated nodemask in -* the page allocator means a mempolicy is in effect. Cpuset policy -* is enforced in get_page_from_freelist(). +* A truncated nodemask in the page allocator means a mempolicy +* is in effect. Cpuset policy is enforced in +* get_page_from_freelist(). */ if (oc->nodemask && !nodes_subset (node_states[N_MEMORY ], *oc->nodemask)) {
Signature · 1 line
2.25.1
Quoted 10 lines · Ye Liu
From: Ye Liu <[email protected]>
The
__GFP_THISNODEcheck inconstrained_alloc()is dead code: global OOM is never triggered with__GFP_THISNODE(blocked in__alloc_pages_may_oombeforeout_of_memory()is called), and memcg OOM returnsCONSTRAINT_MEMCGat the top of the function before reaching this point. Remove the check, its stale comment, and update the following comment that referenced__GFP_THISNODE.Signed-off-by Ye Liu <[email protected]>
Thanks!
Quoted 36 lines
---
v2:
- Remove the dead code directly.
- Link: https://lore.kernel.org/all/[email protected]/mm/oom_kill.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)mm/oom_kill.c +3
-10@@ -267,18 +267,11 @@ static enum oom_constraint constrained_alloc(struct oom_control *oc)if (!oc->zonelist)return CONSTRAINT_NONE ; -/* -* Reach here only when __GFP_NOFAIL is used. So, we should avoid -* to kill current.We have to random task kill in this case. -* Hopefully, CONSTRAINT_THISNODE...but no way to handle it, now. -*/ -if (oc->gfp_mask & __GFP_THISNODE) -return CONSTRAINT_NONE ;/* -* This is not a __GFP_THISNODE allocation, so a truncated nodemask in -* the page allocator means a mempolicy is in effect. Cpuset policy -* is enforced in get_page_from_freelist(). +* A truncated nodemask in the page allocator means a mempolicy +* is in effect. Cpuset policy is enforced in +* get_page_from_freelist(). */ if (oc->nodemask && !nodes_subset (node_states[N_MEMORY ], *oc->nodemask)) {Signature · 1 line
2.25.1
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 10 lines · Ye Liu
From: Ye Liu <[email protected]>
The
__GFP_THISNODEcheck inconstrained_alloc()is dead code: global OOM is never triggered with__GFP_THISNODE(blocked in__alloc_pages_may_oombeforeout_of_memory()is called), and memcg OOM returnsCONSTRAINT_MEMCGat the top of the function before reaching this point. Remove the check, its stale comment, and update the following comment that referenced__GFP_THISNODE.Signed-off-by Ye Liu <[email protected]>