From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by kanga.kvack.org (Postfix) with ESMTP id 99E116B0071 for ; Mon, 19 Jan 2015 06:23:58 -0500 (EST) Received: by mail-pa0-f50.google.com with SMTP id bj1so38315756pad.9 for ; Mon, 19 Jan 2015 03:23:58 -0800 (PST) Received: from mx2.parallels.com (mx2.parallels.com. [199.115.105.18]) by mx.google.com with ESMTPS id gs7si14368988pbc.99.2015.01.19.03.23.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jan 2015 03:23:57 -0800 (PST) From: Vladimir Davydov Subject: [PATCH -mm v2 4/7] slab: use css id for naming per memcg caches Date: Mon, 19 Jan 2015 14:23:22 +0300 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Tejun Heo , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Dave Chinner , Al Viro , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Currently, we use mem_cgroup->kmemcg_id to guarantee kmem_cache->name uniqueness. This is correct, because kmemcg_id is only released on css free after destroying all per memcg caches. However, I am going to change that and release kmemcg_id on css offline, because it is not wise to keep it for so long, wasting valuable entries of memcg_cache_params->memcg_caches arrays. Therefore, to preserve cache name uniqueness, let us switch to css->id. Signed-off-by: Vladimir Davydov --- mm/slab_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 6a5a1dde84c1..7f90acf3a3ff 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -487,6 +487,7 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, struct kmem_cache *root_cache) { static char memcg_name_buf[NAME_MAX + 1]; /* protected by slab_mutex */ + struct cgroup_subsys_state *css = mem_cgroup_css(memcg); struct memcg_cache_array *arr; struct kmem_cache *s = NULL; char *cache_name; @@ -509,10 +510,9 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, if (arr->entries[idx]) goto out_unlock; - cgroup_name(mem_cgroup_css(memcg)->cgroup, - memcg_name_buf, sizeof(memcg_name_buf)); + cgroup_name(css->cgroup, memcg_name_buf, sizeof(memcg_name_buf)); cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name, - idx, memcg_name_buf); + css->id, memcg_name_buf); if (!cache_name) 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