From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by kanga.kvack.org (Postfix) with ESMTP id 31DF36B0036 for ; Thu, 19 Dec 2013 01:32:37 -0500 (EST) Received: by mail-lb0-f173.google.com with SMTP id z5so261403lbh.18 for ; Wed, 18 Dec 2013 22:32:36 -0800 (PST) Received: from relay.parallels.com (relay.parallels.com. [195.214.232.42]) by mx.google.com with ESMTPS id y9si1117391laa.40.2013.12.18.22.32.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 18 Dec 2013 22:32:35 -0800 (PST) Message-ID: <52B292FD.8040603@parallels.com> Date: Thu, 19 Dec 2013 10:32:29 +0400 From: Vladimir Davydov MIME-Version: 1.0 Subject: Re: [PATCH 2/6] memcg, slab: kmem_cache_create_memcg(): free memcg params on error References: <6f02b2d079ffd0990ae335339c803337b13ecd8c.1387372122.git.vdavydov@parallels.com> <9420ad797a2cfa14c23ad1ba6db615a2a51ffee0.1387372122.git.vdavydov@parallels.com> <20131218170649.GC31080@dhcp22.suse.cz> In-Reply-To: <20131218170649.GC31080@dhcp22.suse.cz> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Michal Hocko Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, devel@openvz.org, Johannes Weiner , Glauber Costa , Christoph Lameter , Pekka Enberg , Andrew Morton On 12/18/2013 09:06 PM, Michal Hocko wrote: > On Wed 18-12-13 17:16:53, Vladimir Davydov wrote: >> Plus, rename memcg_register_cache() to memcg_init_cache_params(), >> because it actually does not register the cache anywhere, but simply >> initialize kmem_cache::memcg_params. > I've almost missed this is a memory leak fix. Yeah, the comment is poor, sorry about that. Will fix it. > I do not mind renaming and the name but wouldn't > memcg_alloc_cache_params suit better? As you wish. I don't have a strong preference for memcg_init_cache_params. Thanks. > >> Signed-off-by: Vladimir Davydov >> Cc: Michal Hocko >> Cc: Johannes Weiner >> Cc: Glauber Costa >> Cc: Christoph Lameter >> Cc: Pekka Enberg >> Cc: Andrew Morton >> --- >> include/linux/memcontrol.h | 13 +++++++++---- >> mm/memcontrol.c | 9 +++++++-- >> mm/slab_common.c | 3 ++- >> 3 files changed, 18 insertions(+), 7 deletions(-) >> >> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h >> index b3e7a66..b357ae3 100644 >> --- a/include/linux/memcontrol.h >> +++ b/include/linux/memcontrol.h >> @@ -497,8 +497,9 @@ void __memcg_kmem_commit_charge(struct page *page, >> void __memcg_kmem_uncharge_pages(struct page *page, int order); >> >> int memcg_cache_id(struct mem_cgroup *memcg); >> -int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, >> - struct kmem_cache *root_cache); >> +int memcg_init_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s, >> + struct kmem_cache *root_cache); >> +void memcg_free_cache_params(struct kmem_cache *s); >> void memcg_release_cache(struct kmem_cache *cachep); >> void memcg_cache_list_add(struct mem_cgroup *memcg, struct kmem_cache *cachep); >> >> @@ -641,12 +642,16 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg) >> } >> >> static inline int >> -memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, >> - struct kmem_cache *root_cache) >> +memcg_init_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s, >> + struct kmem_cache *root_cache) >> { >> return 0; >> } >> >> +static inline void memcg_free_cache_params(struct kmem_cache *s); >> +{ >> +} >> + >> static inline void memcg_release_cache(struct kmem_cache *cachep) >> { >> } >> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >> index bf5e894..e6ad6ff 100644 >> --- a/mm/memcontrol.c >> +++ b/mm/memcontrol.c >> @@ -3195,8 +3195,8 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups) >> return 0; >> } >> >> -int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, >> - struct kmem_cache *root_cache) >> +int memcg_init_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s, >> + struct kmem_cache *root_cache) >> { >> size_t size; >> >> @@ -3224,6 +3224,11 @@ int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, >> return 0; >> } >> >> +void memcg_free_cache_params(struct kmem_cache *s) >> +{ >> + kfree(s->memcg_params); >> +} >> + >> void memcg_release_cache(struct kmem_cache *s) >> { >> struct kmem_cache *root; >> diff --git a/mm/slab_common.c b/mm/slab_common.c >> index 5d6f743..62712fe 100644 >> --- a/mm/slab_common.c >> +++ b/mm/slab_common.c >> @@ -208,7 +208,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size, >> goto out_free_cache; >> } >> >> - err = memcg_register_cache(memcg, s, parent_cache); >> + err = memcg_init_cache_params(memcg, s, parent_cache); >> if (err) >> goto out_free_cache; >> >> @@ -238,6 +238,7 @@ out_unlock: >> return s; >> >> out_free_cache: >> + memcg_free_cache_params(s); >> kfree(s->name); >> kmem_cache_free(kmem_cache, s); >> goto out_unlock; >> -- >> 1.7.10.4 >> -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org