From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx146.postini.com [74.125.245.146]) by kanga.kvack.org (Postfix) with SMTP id DA8A36B0106 for ; Mon, 11 Jun 2012 06:29:18 -0400 (EDT) Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Jun 2012 15:59:16 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5BATDcv10944776 for ; Mon, 11 Jun 2012 15:59:13 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5BFxiLe005676 for ; Tue, 12 Jun 2012 01:59:44 +1000 From: "Aneesh Kumar K.V" Subject: Re: [PATCH -V8 14/16] hugetlb/cgroup: add charge/uncharge calls for HugeTLB alloc/free In-Reply-To: <20120611092133.GI12402@tiehlicka.suse.cz> References: <1339232401-14392-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1339232401-14392-15-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <20120611092133.GI12402@tiehlicka.suse.cz> Date: Mon, 11 Jun 2012 15:59:11 +0530 Message-ID: <8762ay5eh4.fsf@skywalker.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: Michal Hocko Cc: linux-mm@kvack.org, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, rientjes@google.com, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Michal Hocko writes: > On Sat 09-06-12 14:29:59, Aneesh Kumar K.V wrote: >> From: "Aneesh Kumar K.V" >> >> This adds necessary charge/uncharge calls in the HugeTLB code. We do >> hugetlb cgroup charge in page alloc and uncharge in compound page destructor. >> >> Signed-off-by: Aneesh Kumar K.V >> --- >> mm/hugetlb.c | 16 +++++++++++++++- >> mm/hugetlb_cgroup.c | 7 +------ >> 2 files changed, 16 insertions(+), 7 deletions(-) >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index bf79131..4ca92a9 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -628,6 +628,8 @@ static void free_huge_page(struct page *page) >> BUG_ON(page_mapcount(page)); >> >> spin_lock(&hugetlb_lock); >> + hugetlb_cgroup_uncharge_page(hstate_index(h), >> + pages_per_huge_page(h), page); >> if (h->surplus_huge_pages_node[nid] && huge_page_order(h) < MAX_ORDER) { >> /* remove the page from active list */ >> list_del(&page->lru); >> @@ -1116,7 +1118,10 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, >> struct hstate *h = hstate_vma(vma); >> struct page *page; >> long chg; >> + int ret, idx; >> + struct hugetlb_cgroup *h_cg; >> >> + idx = hstate_index(h); >> /* >> * Processes that did not create the mapping will have no >> * reserves and will not have accounted against subpool >> @@ -1132,6 +1137,11 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, >> if (hugepage_subpool_get_pages(spool, chg)) >> return ERR_PTR(-ENOSPC); >> >> + ret = hugetlb_cgroup_charge_page(idx, pages_per_huge_page(h), &h_cg); > > So we do not have any page yet and hugetlb_cgroup_charge_cgroup sound > more appropriate > Will do -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/ . Don't email: email@kvack.org