| From 0f1895a9e56d8f7b9de03a4d0e37170c0f5fc9f5 Mon Sep 17 00:00:00 2001 |
| From: Vasily Averin <vvs@virtuozzo.com> |
| Date: Thu, 20 Feb 2020 20:04:18 -0800 |
| Subject: [PATCH] mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() |
| |
| commit 75866af62b439859d5146b7093ceb6b482852683 upstream. |
| |
| for_each_mem_cgroup() increases css reference counter for memory cgroup |
| and requires to use mem_cgroup_iter_break() if the walk is cancelled. |
| |
| Link: http://lkml.kernel.org/r/c98414fb-7e1f-da0f-867a-9340ec4bd30b@virtuozzo.com |
| Fixes: 0a4465d34028 ("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") |
| Signed-off-by: Vasily Averin <vvs@virtuozzo.com> |
| Acked-by: Kirill Tkhai <ktkhai@virtuozzo.com> |
| Acked-by: Michal Hocko <mhocko@suse.com> |
| Reviewed-by: Roman Gushchin <guro@fb.com> |
| Cc: Johannes Weiner <hannes@cmpxchg.org> |
| Cc: Vladimir Davydov <vdavydov.dev@gmail.com> |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/mm/memcontrol.c b/mm/memcontrol.c |
| index 13cd83f5ceb4..3600e85ab053 100644 |
| --- a/mm/memcontrol.c |
| +++ b/mm/memcontrol.c |
| @@ -411,8 +411,10 @@ int memcg_expand_shrinker_maps(int new_id) |
| if (mem_cgroup_is_root(memcg)) |
| continue; |
| ret = memcg_expand_one_shrinker_map(memcg, size, old_size); |
| - if (ret) |
| + if (ret) { |
| + mem_cgroup_iter_break(NULL, memcg); |
| goto unlock; |
| + } |
| } |
| unlock: |
| if (!ret) |
| -- |
| 2.7.4 |
| |
