diff options
author | Yang Shi <yang.shi@linux.alibaba.com> | 2019-08-03 00:48:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-03 10:02:00 -0400 |
commit | fa1e512fac717f34e7c12d7a384c46e90a647392 (patch) | |
tree | be1f6e39f770aaeb27c6eb68e3e0d2ed2650a111 | |
parent | 7bc36e3ce91471b6377c8eadc0a2f220a2280083 (diff) |
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 commit 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.
Link: http://lkml.kernel.org/r/1563385526-20805-1-git-send-email-yang.shi@linux.alibaba.com
Fixes: aeed1d325d42 ("mm/vmscan.c: generalize shrink_slab() calls in shrink_node()")
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
Reported-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Jan Hadrava <had@kam.mff.cuni.cz>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: <stable@vger.kernel.org> [4.19+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/vmscan.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 44df66a98f2a..dbdc46a84f63 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -699,7 +699,14 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid, | |||
699 | unsigned long ret, freed = 0; | 699 | unsigned long ret, freed = 0; |
700 | struct shrinker *shrinker; | 700 | struct shrinker *shrinker; |
701 | 701 | ||
702 | if (!mem_cgroup_is_root(memcg)) | 702 | /* |
703 | * The root memcg might be allocated even though memcg is disabled | ||
704 | * via "cgroup_disable=memory" boot parameter. This could make | ||
705 | * mem_cgroup_is_root() return false, then just run memcg slab | ||
706 | * shrink, but skip global shrink. This may result in premature | ||
707 | * oom. | ||
708 | */ | ||
709 | if (!mem_cgroup_disabled() && !mem_cgroup_is_root(memcg)) | ||
703 | return shrink_slab_memcg(gfp_mask, nid, memcg, priority); | 710 | return shrink_slab_memcg(gfp_mask, nid, memcg, priority); |
704 | 711 | ||
705 | if (!down_read_trylock(&shrinker_rwsem)) | 712 | if (!down_read_trylock(&shrinker_rwsem)) |