Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

slub: fix memcg_propagate_slab_attrs

Browse Source 
After creating a cache for a memcg we should initialize its sysfs attrs
with the values from its parent.  That's what memcg_propagate_slab_attrs
is for.  Currently it's broken - we clearly muddled root-vs-memcg caches
there.  Let's fix it up.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vladimir Davydov 2014-05-06 12:49:59 -07:00 committed by Linus Torvalds
parent 35738392b6
commit 93030d83b9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mm/slub.c
View File

@ -5071,15 +5071,18 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s)
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG_KMEM
int i; int i;
char *buffer = NULL; char *buffer = NULL;
struct kmem_cache *root_cache;
if (!is_root_cache(s)) if (is_root_cache(s))
return; return;
root_cache = s->memcg_params->root_cache;
/* /*
* This mean this cache had no attribute written. Therefore, no point * This mean this cache had no attribute written. Therefore, no point
* in copying default values around * in copying default values around
*/ */
if (!s->max_attr_size) if (!root_cache->max_attr_size)
return; return;
for (i = 0; i < ARRAY_SIZE(slab_attrs); i++) { for (i = 0; i < ARRAY_SIZE(slab_attrs); i++) {
@ -5101,7 +5104,7 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s)
*/ */
if (buffer) if (buffer)
buf = buffer; buf = buffer;
else if (s->max_attr_size < ARRAY_SIZE(mbuf)) else if (root_cache->max_attr_size < ARRAY_SIZE(mbuf))
buf = mbuf; buf = mbuf;
else { else {
buffer = (char *) get_zeroed_page(GFP_KERNEL); buffer = (char *) get_zeroed_page(GFP_KERNEL);
@ -5110,7 +5113,7 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s)
buf = buffer; buf = buffer;
} }
attr->show(s->memcg_params->root_cache, buf); attr->show(root_cache, buf);
attr->store(s, buf, strlen(buf)); attr->store(s, buf, strlen(buf));
} }