lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 26 Feb 2014 19:05:13 +0400 From: Vladimir Davydov <vdavydov@...allels.com> To: <akpm@...ux-foundation.org> CC: <hannes@...xchg.org>, <mhocko@...e.cz>, <glommer@...il.com>, <linux-kernel@...r.kernel.org>, <linux-mm@...ck.org>, <devel@...nvz.org>, Christoph Lameter <cl@...ux-foundation.org>, Pekka Enberg <penberg@...nel.org> Subject: [PATCH -mm 08/12] memcg: do not charge kmalloc_large allocations 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. Cc: Johannes Weiner <hannes@...xchg.org> Cc: Michal Hocko <mhocko@...e.cz> Cc: Glauber Costa <glommer@...il.com> Cc: Christoph Lameter <cl@...ux-foundation.org> Cc: Pekka Enberg <penberg@...nel.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 fa995823de60..d8b8659bfa64 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3332,7 +3332,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); @@ -3402,7 +3402,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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists