From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by kanga.kvack.org (Postfix) with ESMTP id 211856B003A for ; Wed, 26 Mar 2014 11:28:13 -0400 (EDT) Received: by mail-lb0-f182.google.com with SMTP id n15so1640578lbi.13 for ; Wed, 26 Mar 2014 08:28:12 -0700 (PDT) Received: from relay.parallels.com (relay.parallels.com. [195.214.232.42]) by mx.google.com with ESMTPS id la3si14690783lbc.91.2014.03.26.08.28.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Mar 2014 08:28:11 -0700 (PDT) From: Vladimir Davydov Subject: [PATCH -mm 3/4] fork: charge threadinfo to memcg explicitly Date: Wed, 26 Mar 2014 19:28:06 +0400 Message-ID: <8f98a5160b9e17947cbb25e91944f332679b9c9c.1395846845.git.vdavydov@parallels.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, mhocko@suse.cz, glommer@gmail.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, devel@openvz.org We have only a few places where we actually want to charge kmem so instead of intruding into the general page allocation path with __GFP_KMEMCG it's better to explictly charge kmem there. All kmem charges will be easier to follow that way. This is a step toward removing __GFP_KMEMCG. It makes fork charge task threadinfo pages explicitly instead of passing __GFP_KMEMCG to alloc_pages. Signed-off-by: Vladimir Davydov Cc: Johannes Weiner Cc: Michal Hocko Cc: Glauber Costa --- kernel/fork.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index f4b09bc15f3a..8209780cf732 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -150,15 +150,22 @@ void __weak arch_release_thread_info(struct thread_info *ti) static struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node) { - struct page *page = alloc_pages_node(node, THREADINFO_GFP_ACCOUNTED, - THREAD_SIZE_ORDER); + struct page *page; + struct mem_cgroup *memcg = NULL; + if (!memcg_kmem_newpage_charge(THREADINFO_GFP_ACCOUNTED, &memcg, + THREAD_SIZE_ORDER)) + return NULL; + page = alloc_pages_node(node, THREADINFO_GFP, THREAD_SIZE_ORDER); + memcg_kmem_commit_charge(page, memcg, THREAD_SIZE_ORDER); return page ? page_address(page) : NULL; } static inline void free_thread_info(struct thread_info *ti) { - free_memcg_kmem_pages((unsigned long)ti, THREAD_SIZE_ORDER); + if (ti) + memcg_kmem_uncharge_pages(virt_to_page(ti), THREAD_SIZE_ORDER); + free_pages((unsigned long)ti, THREAD_SIZE_ORDER); } # else static struct kmem_cache *thread_info_cache; -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org