From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx192.postini.com [74.125.245.192]) by kanga.kvack.org (Postfix) with SMTP id 9DB506B0083 for ; Mon, 19 Mar 2012 03:01:46 -0400 (EDT) Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 19 Mar 2012 06:44:53 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2J6tktf3412038 for ; Mon, 19 Mar 2012 17:55:46 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2J71fZw032366 for ; Mon, 19 Mar 2012 18:01:42 +1100 From: "Aneesh Kumar K.V" Subject: Re: [PATCH -V4 05/10] hugetlb: add charge/uncharge calls for HugeTLB alloc/free In-Reply-To: <4F669CC3.9070007@jp.fujitsu.com> References: <1331919570-2264-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1331919570-2264-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <4F669CC3.9070007@jp.fujitsu.com> Date: Mon, 19 Mar 2012 12:31:36 +0530 Message-ID: <871uopkran.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-linux-mm@kvack.org List-ID: To: KAMEZAWA Hiroyuki Cc: linux-mm@kvack.org, mgorman@suse.de, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org On Mon, 19 Mar 2012 11:41:07 +0900, KAMEZAWA Hiroyuki wrote: > (2012/03/17 2:39), Aneesh Kumar K.V wrote: > > > From: "Aneesh Kumar K.V" > > > > This adds necessary charge/uncharge calls in the HugeTLB code > > > > Acked-by: Hillf Danton > > Signed-off-by: Aneesh Kumar K.V > > > Reviewed-by: KAMEZAWA Hiroyuki > A nitpick below. > > > --- > > mm/hugetlb.c | 21 ++++++++++++++++++++- > > mm/memcontrol.c | 5 +++++ > > 2 files changed, 25 insertions(+), 1 deletions(-) > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > index c672187..91361a0 100644 > > --- a/mm/hugetlb.c > > +++ b/mm/hugetlb.c > > @@ -21,6 +21,8 @@ > > #include > > #include > > #include > > +#include > > +#include > > > > #include > > #include > > @@ -542,6 +544,9 @@ static void free_huge_page(struct page *page) > > BUG_ON(page_mapcount(page)); > > INIT_LIST_HEAD(&page->lru); > > > > + if (mapping) > > + mem_cgroup_hugetlb_uncharge_page(hstate_index(h), > > + pages_per_huge_page(h), page); > > spin_lock(&hugetlb_lock); > > if (h->surplus_huge_pages_node[nid] && huge_page_order(h) < MAX_ORDER) { > > update_and_free_page(h, page); > > @@ -1019,12 +1024,15 @@ static void vma_commit_reservation(struct hstate *h, > > static struct page *alloc_huge_page(struct vm_area_struct *vma, > > unsigned long addr, int avoid_reserve) > > { > > + int ret, idx; > > struct hstate *h = hstate_vma(vma); > > struct page *page; > > + struct mem_cgroup *memcg = NULL; > > > Can't we this initialization in mem_cgroup_hugetlb_charge_page() ? > Will update in the next iteration. -aneesh -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org