Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 29ef680ae7c2
("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>

authored by

Haifeng Xu and committed by
Andrew Morton
857f2139 0a2dc6ac

+3 -10
+3 -10
mm/memcontrol.c
··· 2024 2024 if (locked) 2025 2025 mem_cgroup_oom_notify(memcg); 2026 2026 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); 2037 2030 2038 2031 if (locked) { 2039 2032 mem_cgroup_oom_unlock(memcg);