From: akpm@linux-foundation.org
To: mm-commits@vger.kernel.org, penberg@kernel.org, mhocko@suse.cz,
hannes@cmpxchg.org, cl@linux.com, vdavydov@parallels.com
Subject: + slub-fix-memcg_propagate_slab_attrs.patch added to -mm tree
Date: Fri, 18 Apr 2014 13:08:17 -0700 [thread overview]
Message-ID: <53518631.cuNCoAbpOk1NRWDf%akpm@linux-foundation.org> (raw)
Subject: + slub-fix-memcg_propagate_slab_attrs.patch added to -mm tree
To: vdavydov@parallels.com,cl@linux.com,hannes@cmpxchg.org,mhocko@suse.cz,penberg@kernel.org
From: akpm@linux-foundation.org
Date: Fri, 18 Apr 2014 13:08:17 -0700
The patch titled
Subject: slub: fix memcg_propagate_slab_attrs
has been added to the -mm tree. Its filename is
slub-fix-memcg_propagate_slab_attrs.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/slub-fix-memcg_propagate_slab_attrs.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/slub-fix-memcg_propagate_slab_attrs.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 <vdavydov@parallels.com>
Subject: slub: fix memcg_propagate_slab_attrs
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>
---
mm/slub.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff -puN mm/slub.c~slub-fix-memcg_propagate_slab_attrs mm/slub.c
--- a/mm/slub.c~slub-fix-memcg_propagate_slab_attrs
+++ a/mm/slub.c
@@ -5071,15 +5071,18 @@ static void memcg_propagate_slab_attrs(s
#ifdef CONFIG_MEMCG_KMEM
int i;
char *buffer = NULL;
+ struct kmem_cache *root_cache;
- if (!is_root_cache(s))
+ if (is_root_cache(s))
return;
+ root_cache = s->memcg_params->root_cache;
+
/*
* This mean this cache had no attribute written. Therefore, no point
* in copying default values around
*/
- if (!s->max_attr_size)
+ if (!root_cache->max_attr_size)
return;
for (i = 0; i < ARRAY_SIZE(slab_attrs); i++) {
@@ -5101,7 +5104,7 @@ static void memcg_propagate_slab_attrs(s
*/
if (buffer)
buf = buffer;
- else if (s->max_attr_size < ARRAY_SIZE(mbuf))
+ else if (root_cache->max_attr_size < ARRAY_SIZE(mbuf))
buf = mbuf;
else {
buffer = (char *) get_zeroed_page(GFP_KERNEL);
@@ -5110,7 +5113,7 @@ static void memcg_propagate_slab_attrs(s
buf = buffer;
}
- attr->show(s->memcg_params->root_cache, buf);
+ attr->show(root_cache, buf);
attr->store(s, buf, strlen(buf));
}
_
Patches currently in -mm which might be from vdavydov@parallels.com are
slub-fix-memcg_propagate_slab_attrs.patch
slb-charge-slabs-to-kmemcg-explicitly.patch
mm-get-rid-of-__gfp_kmemcg.patch
mm-get-rid-of-__gfp_kmemcg-fix.patch
slab-document-kmalloc_order.patch
next reply other threads:[~2014-04-18 20:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-18 20:08 akpm [this message]
2014-04-22 10:30 ` + slub-fix-memcg_propagate_slab_attrs.patch added to -mm tree Michal Hocko
2014-04-22 10:52 ` Vladimir Davydov
2014-04-22 12:04 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53518631.cuNCoAbpOk1NRWDf%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=penberg@kernel.org \
--cc=vdavydov@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.