mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker
Subsystems (4)
[email protected]
maintainerPATCH 4/17 mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker
From: Yang Shi <[email protected]>
Subject: mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker
Shakeel Butt reported premature oom on kernel with "cgroup_disable=memory" since mem_cgroup_is_root() returns false even though memcg is actually NULL. The drop_caches is also broken.
It is because aeed1d325d42 ("mm/vmscan.c: generalize shrink_slab() calls in shrink_node()") removed the !memcg check before !mem_cgroup_is_root(). And, surprisingly root memcg is allocated even though memory cgroup is disabled by kernel boot parameter.
Add mem_cgroup_disabled() check to make reclaimer work as expected.
Fixes aeed1d325d42 ("mm/vmscan.c: generalize shrink_slab() calls in shrink_node()")
Signed-off-by Yang Shi <[email protected]>
Reported-by Shakeel Butt <[email protected]>
Reviewed-by Shakeel Butt <[email protected]>
Reviewed-by Kirill Tkhai <[email protected]>
Acked-by Michal Hocko <[email protected]>
Cc Jan Hadrava <[email protected]>
Cc Vladimir Davydov <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Qian Cai <[email protected]>
Cc Kirill A. Shutemov <[email protected]>
Cc <[email protected]> [4.19+]
Signed-off-by Andrew Morton <[email protected]>
---
mm/vmscan.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/vmscan.c renamed from mm/vmscan.c~mm-vmscan-check-if-mem-cgroup-is-disabled-or-not-before-calling-memcg-slab-shrinker +8 -1
@@ -699,7 +699,14 @@ static unsigned long shrink_slab(gfp_t gunsigned long ret, freed =0 ;struct shrinker *shrinker; -if (!mem_cgroup_is_root (memcg)) +/* +* The root memcg might be allocated even though memcg is disabled +* via "cgroup_disable=memory" boot parameter. This could make +* mem_cgroup_is_root() return false, then just run memcg slab +* shrink, but skip global shrink. This may result in premature +* oom. +*/ +if (!mem_cgroup_disabled () && !mem_cgroup_is_root (memcg))return shrink_slab_memcg (gfp_mask, nid, memcg, priority);if (!down_read_trylock (&shrinker_rwsem))
_