Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760992Ab3DCNFI (ORCPT ); Wed, 3 Apr 2013 09:05:08 -0400 Received: from mx2.parallels.com ([199.115.105.18]:43640 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757056Ab3DCNFG (ORCPT ); Wed, 3 Apr 2013 09:05:06 -0400 Message-ID: <515C2923.5020803@parallels.com> Date: Wed, 3 Apr 2013 17:05:39 +0400 From: Glauber Costa User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: Li Zefan CC: , LKML , Cgroups , Tejun Heo , Michal Hocko , KAMEZAWA Hiroyuki , Johannes Weiner Subject: Re: [RFC][PATCH 2/7] memcg: don't use mem_cgroup_get() when creating a kmemcg cache References: <515BF233.6070308@huawei.com> <515BF275.5080408@huawei.com> In-Reply-To: <515BF275.5080408@huawei.com> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1828 Lines: 59 On 04/03/2013 01:12 PM, Li Zefan wrote: > Use css_get()/css_put() instead of mem_cgroup_get()/mem_cgroup_put(). > > Signed-off-by: Li Zefan > --- > mm/memcontrol.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 43ca91d..dafacb8 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3191,7 +3191,7 @@ void memcg_release_cache(struct kmem_cache *s) > list_del(&s->memcg_params->list); > mutex_unlock(&memcg->slab_caches_mutex); > > - mem_cgroup_put(memcg); > + css_put(&memcg->css); > out: > kfree(s->memcg_params); > } > @@ -3350,16 +3350,18 @@ static struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg, > > mutex_lock(&memcg_cache_mutex); > new_cachep = cachep->memcg_params->memcg_caches[idx]; > - if (new_cachep) > + if (new_cachep) { > + css_put(&memcg->css); > goto out; > + } > > new_cachep = kmem_cache_dup(memcg, cachep); > if (new_cachep == NULL) { > new_cachep = cachep; > + css_put(&memcg->css); > goto out; > } > > - mem_cgroup_get(memcg); > atomic_set(&new_cachep->memcg_params->nr_pages , 0); > > cachep->memcg_params->memcg_caches[idx] = new_cachep; > @@ -3449,8 +3451,6 @@ static void memcg_create_cache_work_func(struct work_struct *w) > > cw = container_of(w, struct create_work, work); > memcg_create_kmem_cache(cw->memcg, cw->cachep); > - /* Drop the reference gotten when we enqueued. */ > - css_put(&cw->memcg->css); > kfree(cw); > } > > At first look, this one seems all right. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/