Skip to content

Commit 857f213

Browse files
hfxspakpm00
authored andcommitted
memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize()
mem_cgroup_oom_synchronize() is only used when the memcg oom handling is handed over to the edge of the #PF path. Since commit 29ef680 ("memcg, oom: move out_of_memory back to the charge path") this is the case only when the kernel memcg oom killer is disabled (current->memcg_in_oom is only set if memcg->oom_kill_disable). Therefore a check for oom_kill_disable in mem_cgroup_oom_synchronize() is not required. Link: https://lkml.kernel.org/r/20230419030739.115845-1-haifeng.xu@shopee.com Signed-off-by: Haifeng Xu <haifeng.xu@shopee.com> Suggested-by: Michal Hocko <mhocko@suse.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: Shakeel Butt <shakeelb@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 0a2dc6a commit 857f213

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

mm/memcontrol.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,16 +2024,9 @@ bool mem_cgroup_oom_synchronize(bool handle)
20242024
if (locked)
20252025
mem_cgroup_oom_notify(memcg);
20262026

2027-
if (locked && !READ_ONCE(memcg->oom_kill_disable)) {
2028-
mem_cgroup_unmark_under_oom(memcg);
2029-
finish_wait(&memcg_oom_waitq, &owait.wait);
2030-
mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask,
2031-
current->memcg_oom_order);
2032-
} else {
2033-
schedule();
2034-
mem_cgroup_unmark_under_oom(memcg);
2035-
finish_wait(&memcg_oom_waitq, &owait.wait);
2036-
}
2027+
schedule();
2028+
mem_cgroup_unmark_under_oom(memcg);
2029+
finish_wait(&memcg_oom_waitq, &owait.wait);
20372030

20382031
if (locked) {
20392032
mem_cgroup_oom_unlock(memcg);

0 commit comments

Comments
 (0)