Commit 93f39eea authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds

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: default avatarVladimir Davydov <vdavydov@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 073ee1c6
...@@ -3135,7 +3135,8 @@ void memcg_free_cache_params(struct kmem_cache *s) ...@@ -3135,7 +3135,8 @@ void memcg_free_cache_params(struct kmem_cache *s)
static void memcg_kmem_create_cache(struct mem_cgroup *memcg, static void memcg_kmem_create_cache(struct mem_cgroup *memcg,
struct kmem_cache *root_cache) 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; struct kmem_cache *cachep;
int id; int id;
...@@ -3151,12 +3152,6 @@ static void memcg_kmem_create_cache(struct mem_cgroup *memcg, ...@@ -3151,12 +3152,6 @@ static void memcg_kmem_create_cache(struct mem_cgroup *memcg,
if (cache_from_memcg_idx(root_cache, id)) if (cache_from_memcg_idx(root_cache, id))
return; return;
if (!memcg_name_buf) {
memcg_name_buf = kmalloc(NAME_MAX + 1, GFP_KERNEL);
if (!memcg_name_buf)
return;
}
cgroup_name(memcg->css.cgroup, memcg_name_buf, NAME_MAX + 1); cgroup_name(memcg->css.cgroup, memcg_name_buf, NAME_MAX + 1);
cachep = kmem_cache_create_memcg(memcg, root_cache, memcg_name_buf); cachep = kmem_cache_create_memcg(memcg, root_cache, memcg_name_buf);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment