From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + memcg-memcg_kmem_create_cache-make-memcg_name_buf.patch added to -mm tree Date: Thu, 08 May 2014 15:08:56 -0700 Message-ID: <536c0078.wJRMWOBam3O2LfPY%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41959 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755749AbaEHWI5 (ORCPT ); Thu, 8 May 2014 18:08:57 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, mhocko@suse.cz, hannes@cmpxchg.org, vdavydov@parallels.com Subject: + memcg-memcg_kmem_create_cache-make-memcg_name_buf.patch added to -mm tree To: vdavydov@parallels.com,hannes@cmpxchg.org,mhocko@suse.cz From: akpm@linux-foundation.org Date: Thu, 08 May 2014 15:08:56 -0700 The patch titled Subject: memcg: memcg_kmem_create_cache: make memcg_name_buf statically allocated has been added to the -mm tree. Its filename is memcg-memcg_kmem_create_cache-make-memcg_name_buf.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memcg-memcg_kmem_create_cache-make-memcg_name_buf.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memcg-memcg_kmem_create_cache-make-memcg_name_buf.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Vladimir Davydov Subject: memcg: memcg_kmem_create_cache: make memcg_name_buf statically allocated It isn't worth complicating the code by allocating it on the first access, because it only takes 256 bytes. Signed-off-by: Vladimir Davydov Cc: Michal Hocko Cc: Johannes Weiner Signed-off-by: Andrew Morton --- mm/memcontrol.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff -puN mm/memcontrol.c~memcg-memcg_kmem_create_cache-make-memcg_name_buf mm/memcontrol.c --- a/mm/memcontrol.c~memcg-memcg_kmem_create_cache-make-memcg_name_buf +++ a/mm/memcontrol.c @@ -3134,7 +3134,8 @@ void memcg_free_cache_params(struct kmem static void memcg_kmem_create_cache(struct mem_cgroup *memcg, struct kmem_cache *root_cache) { - static char *memcg_name_buf; /* protected by memcg_slab_mutex */ + static char memcg_name_buf[NAME_MAX + 1]; /* protected by + memcg_slab_mutex */ struct kmem_cache *cachep; int id; @@ -3150,12 +3151,6 @@ static void memcg_kmem_create_cache(stru if (cache_from_memcg_idx(root_cache, id)) return; - if (!memcg_name_buf) { - memcg_name_buf = kmalloc(NAME_MAX + 1, GFP_KERNEL); - if (!memcg_name_buf) - return; - }