| Message ID | c98414fb-7e1f-da0f-867a-9340ec4bd30b@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | memcg: lost css_put in memcg_expand_shrinker_maps() | expand |
On 11.02.2020 14:20, Vasily Averin wrote: > for_each_mem_cgroup() increases css reference counter for memory cgroup > and requires to use mem_cgroup_iter_break() if the walk is cancelled. > > Cc: stable@vger.kernel.org > Fixes commit 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> Thanks! > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 6c83cf4..e2da615 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -409,8 +409,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) >
On Tue 11-02-20 14:20:10, Vasily Averin wrote: > for_each_mem_cgroup() increases css reference counter for memory cgroup > and requires to use mem_cgroup_iter_break() if the walk is cancelled. > > Cc: stable@vger.kernel.org > Fixes commit 0a4465d34028("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Fixes: 0a4465d34028("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Is the usual format. > Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Acked-by: Michal Hocko <mhocko@suse.com> Thanks! > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 6c83cf4..e2da615 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -409,8 +409,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) > -- > 1.8.3.1
On Tue, Feb 11, 2020 at 02:20:10PM +0300, Vasily Averin wrote: > for_each_mem_cgroup() increases css reference counter for memory cgroup > and requires to use mem_cgroup_iter_break() if the walk is cancelled. > > Cc: stable@vger.kernel.org > Fixes commit 0a4465d34028("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") > > Signed-off-by: Vasily Averin <vvs@virtuozzo.com> Reviewed-by: Roman Gushchin <guro@fb.com> Thank you! > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 6c83cf4..e2da615 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -409,8 +409,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) > -- > 1.8.3.1 >
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6c83cf4..e2da615 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -409,8 +409,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)
for_each_mem_cgroup() increases css reference counter for memory cgroup and requires to use mem_cgroup_iter_break() if the walk is cancelled. Cc: stable@vger.kernel.org Fixes commit 0a4465d34028("mm, memcg: assign memcg-aware shrinkers bitmap to memcg") Signed-off-by: Vasily Averin <vvs@virtuozzo.com> --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)