Messages in this thread Patch in this message | | | From | Vladimir Davydov <> | Subject | [PATCH RESEND -mm 08/12] memcg: do not charge kmalloc_large allocations | Date | Thu, 13 Mar 2014 19:06:46 +0400 |
| |
We don't have a way to track kmalloc_large allocations so that charging them makes kmemcg reparenting impossible. Since such allocations are rare and can't be massively triggered from userspace, let's just ignore them.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Glauber Costa <glommer@gmail.com> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Pekka Enberg <penberg@kernel.org> --- include/linux/slab.h | 2 +- mm/slub.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/slab.h b/include/linux/slab.h index 8091d009cd72..29dbf6f2fd3a 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -364,7 +364,7 @@ kmalloc_order(size_t size, gfp_t flags, unsigned int order) { void *ret; - flags |= (__GFP_COMP | __GFP_KMEMCG); + flags |= __GFP_COMP; ret = (void *) __get_free_pages(flags, order); kmemleak_alloc(ret, size, 1, flags); return ret; diff --git a/mm/slub.c b/mm/slub.c index bd75ec0e2ef8..3ea91fb54f41 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3334,7 +3334,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node) struct page *page; void *ptr = NULL; - flags |= __GFP_COMP | __GFP_NOTRACK | __GFP_KMEMCG; + flags |= __GFP_COMP | __GFP_NOTRACK; page = alloc_pages_node(node, flags, get_order(size)); if (page) ptr = page_address(page); @@ -3404,7 +3404,7 @@ void kfree(const void *x) if (unlikely(!PageSlab(page))) { BUG_ON(!PageCompound(page)); kfree_hook(x); - __free_memcg_kmem_pages(page, compound_order(page)); + __free_pages(page, compound_order(page)); return; } slab_free(page->slab_cache, page, object, _RET_IP_); -- 1.7.10.4
| |