Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753232Ab2FKJVh (ORCPT ); Mon, 11 Jun 2012 05:21:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41540 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753003Ab2FKJVf (ORCPT ); Mon, 11 Jun 2012 05:21:35 -0400 Date: Mon, 11 Jun 2012 11:21:33 +0200 From: Michal Hocko To: "Aneesh Kumar K.V" 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 Subject: Re: [PATCH -V8 14/16] hugetlb/cgroup: add charge/uncharge calls for HugeTLB alloc/free Message-ID: <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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1339232401-14392-15-git-send-email-aneesh.kumar@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2039 Lines: 58 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 [...] -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/