| Message ID | 20200614122653.98829-1-songmuchun@bytedance.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: memcontrol: Fix do not put the css reference | expand |
On Sun, Jun 14, 2020 at 08:26:53PM +0800, Muchun Song wrote: > We should put the css reference when memory allocation failed. > > Fixes: f0a3a24b532d ("mm: memcg/slab: rework non-root kmem_cache lifecycle management") > Signed-off-by: Muchun Song <songmuchun@bytedance.com> > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Good catch, thank you! Acked-by: Roman Gushchin <guro@fb.com> > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 0b38b6ad547d..2323d811ee8e 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2772,8 +2772,10 @@ static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, > return; > > cw = kmalloc(sizeof(*cw), GFP_NOWAIT | __GFP_NOWARN); > - if (!cw) > + if (!cw) { > + css_put(&memcg->css); > return; > + } > > cw->memcg = memcg; > cw->cachep = cachep; > -- > 2.11.0 >
On Sun 14-06-20 20:26:53, Muchun Song wrote: > We should put the css reference when memory allocation failed. > > Fixes: f0a3a24b532d ("mm: memcg/slab: rework non-root kmem_cache lifecycle management") > Signed-off-by: Muchun Song <songmuchun@bytedance.com> This looks like a stable tree material to me. Acked-by: Michal Hocko <mhocko@suse.com> > --- > mm/memcontrol.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 0b38b6ad547d..2323d811ee8e 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2772,8 +2772,10 @@ static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, > return; > > cw = kmalloc(sizeof(*cw), GFP_NOWAIT | __GFP_NOWARN); > - if (!cw) > + if (!cw) { > + css_put(&memcg->css); > return; > + } > > cw->memcg = memcg; > cw->cachep = cachep; > -- > 2.11.0
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0b38b6ad547d..2323d811ee8e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2772,8 +2772,10 @@ static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, return; cw = kmalloc(sizeof(*cw), GFP_NOWAIT | __GFP_NOWARN); - if (!cw) + if (!cw) { + css_put(&memcg->css); return; + } cw->memcg = memcg; cw->cachep = cachep;
We should put the css reference when memory allocation failed. Fixes: f0a3a24b532d ("mm: memcg/slab: rework non-root kmem_cache lifecycle management") Signed-off-by: Muchun Song <songmuchun@bytedance.com> --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)