From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Aneesh Kumar K.V" Subject: Re: [PATCH -V3 3/8] hugetlb: add charge/uncharge calls for HugeTLB alloc/free Date: Wed, 14 Mar 2012 15:52:28 +0530 Message-ID: <87wr6n8ot7.fsf@linux.vnet.ibm.com> References: <1331622432-24683-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1331622432-24683-4-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="utf-8" To: Hillf Danton Cc: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, mgorman-l3A5Bk7waGM@public.gmane.org, kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org, aarcange-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, mhocko-AlSwsSmVLrQ@public.gmane.org, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Tue, 13 Mar 2012 21:20:21 +0800, Hillf Danton wro= te: > On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V > wrote: > > From: "Aneesh Kumar K.V" > > > > This adds necessary charge/uncharge calls in the HugeTLB code > > > > Signed-off-by: Aneesh Kumar K.V > > --- > > =C2=A0mm/hugetlb.c =C2=A0 =C2=A0| =C2=A0 21 ++++++++++++++++++++- > > =C2=A0mm/memcontrol.c | =C2=A0 =C2=A05 +++++ > > =C2=A02 files changed, 25 insertions(+), 1 deletions(-) > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > index fe7aefd..b7152d1 100644 > > --- a/mm/hugetlb.c > > +++ b/mm/hugetlb.c > > @@ -21,6 +21,8 @@ > > =C2=A0#include > > =C2=A0#include > > =C2=A0#include > > +#include > > +#include > > > > =C2=A0#include > > =C2=A0#include > > @@ -542,6 +544,9 @@ static void free_huge_page(struct page *page) > > =C2=A0 =C2=A0 =C2=A0 =C2=A0BUG_ON(page_mapcount(page)); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0INIT_LIST_HEAD(&page->lru); > > > > + =C2=A0 =C2=A0 =C2=A0 if (mapping) > > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mem_cgroup_huget= lb_uncharge_page(h - hstates, > > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0pages_per_huge_page(h), page); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_lock(&hugetlb_lock); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0if (h->surplus_huge_pages_node[nid] && h= uge_page_order(h) < MAX_ORDER) { > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0update_and_f= ree_page(h, page); > > @@ -1019,12 +1024,15 @@ static void vma_commit_reservation(struct h= state *h, > > =C2=A0static struct page *alloc_huge_page(struct vm_area_struct *vm= a, > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned long a= ddr, int avoid_reserve) > > =C2=A0{ > > + =C2=A0 =C2=A0 =C2=A0 int ret, idx; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct hstate *h =3D hstate_vma(vma); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct page *page; > > + =C2=A0 =C2=A0 =C2=A0 struct mem_cgroup *memcg =3D NULL; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct address_space *mapping =3D vma->v= m_file->f_mapping; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct inode *inode =3D mapping->host; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0long chg; > > > > + =C2=A0 =C2=A0 =C2=A0 idx =3D h - hstates; >=20 > Better if hstate index is computed with a tiny inline helper? > Other than that, Will update in the next iteration. >=20 > Acked-by: Hillf Danton >=20 -aneesh From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx153.postini.com [74.125.245.153]) by kanga.kvack.org (Postfix) with SMTP id C8B636B004A for ; Wed, 14 Mar 2012 06:25:01 -0400 (EDT) Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Mar 2012 15:54:58 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2EAMcMo250092 for ; Wed, 14 Mar 2012 15:52:38 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2EFrCqJ020247 for ; Thu, 15 Mar 2012 02:53:13 +1100 From: "Aneesh Kumar K.V" Subject: Re: [PATCH -V3 3/8] hugetlb: add charge/uncharge calls for HugeTLB alloc/free In-Reply-To: References: <1331622432-24683-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1331622432-24683-4-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Date: Wed, 14 Mar 2012 15:52:28 +0530 Message-ID: <87wr6n8ot7.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org List-ID: To: Hillf Danton Cc: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org On Tue, 13 Mar 2012 21:20:21 +0800, Hillf Danton wrote: > On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V > wrote: > > From: "Aneesh Kumar K.V" > > > > This adds necessary charge/uncharge calls in the HugeTLB code > > > > Signed-off-by: Aneesh Kumar K.V > > --- > > =C2=A0mm/hugetlb.c =C2=A0 =C2=A0| =C2=A0 21 ++++++++++++++++++++- > > =C2=A0mm/memcontrol.c | =C2=A0 =C2=A05 +++++ > > =C2=A02 files changed, 25 insertions(+), 1 deletions(-) > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > index fe7aefd..b7152d1 100644 > > --- a/mm/hugetlb.c > > +++ b/mm/hugetlb.c > > @@ -21,6 +21,8 @@ > > =C2=A0#include > > =C2=A0#include > > =C2=A0#include > > +#include > > +#include > > > > =C2=A0#include > > =C2=A0#include > > @@ -542,6 +544,9 @@ static void free_huge_page(struct page *page) > > =C2=A0 =C2=A0 =C2=A0 =C2=A0BUG_ON(page_mapcount(page)); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0INIT_LIST_HEAD(&page->lru); > > > > + =C2=A0 =C2=A0 =C2=A0 if (mapping) > > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mem_cgroup_hugetlb_u= ncharge_page(h - hstates, > > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0pages_per_huge_page(h), page); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_lock(&hugetlb_lock); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0if (h->surplus_huge_pages_node[nid] && huge_= page_order(h) < MAX_ORDER) { > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0update_and_free_= page(h, page); > > @@ -1019,12 +1024,15 @@ static void vma_commit_reservation(struct hstat= e *h, > > =C2=A0static struct page *alloc_huge_page(struct vm_area_struct *vma, > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned long addr, = int avoid_reserve) > > =C2=A0{ > > + =C2=A0 =C2=A0 =C2=A0 int ret, idx; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct hstate *h =3D hstate_vma(vma); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct page *page; > > + =C2=A0 =C2=A0 =C2=A0 struct mem_cgroup *memcg =3D NULL; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct address_space *mapping =3D vma->vm_fi= le->f_mapping; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0struct inode *inode =3D mapping->host; > > =C2=A0 =C2=A0 =C2=A0 =C2=A0long chg; > > > > + =C2=A0 =C2=A0 =C2=A0 idx =3D h - hstates; >=20 > Better if hstate index is computed with a tiny inline helper? > Other than that, Will update in the next iteration. >=20 > Acked-by: Hillf Danton >=20 -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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760726Ab2CNKYF (ORCPT ); Wed, 14 Mar 2012 06:24:05 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:48030 "EHLO e28smtp04.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760574Ab2CNKYB convert rfc822-to-8bit (ORCPT ); Wed, 14 Mar 2012 06:24:01 -0400 From: "Aneesh Kumar K.V" To: Hillf Danton Cc: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH -V3 3/8] hugetlb: add charge/uncharge calls for HugeTLB alloc/free In-Reply-To: References: <1331622432-24683-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1331622432-24683-4-git-send-email-aneesh.kumar@linux.vnet.ibm.com> User-Agent: Notmuch/0.11.1+190~g31a336a (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Wed, 14 Mar 2012 15:52:28 +0530 Message-ID: <87wr6n8ot7.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT x-cbid: 12031410-5564-0000-0000-000001CC03F2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 13 Mar 2012 21:20:21 +0800, Hillf Danton wrote: > On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V > wrote: > > From: "Aneesh Kumar K.V" > > > > This adds necessary charge/uncharge calls in the HugeTLB code > > > > Signed-off-by: Aneesh Kumar K.V > > --- > >  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 fe7aefd..b7152d1 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(h - hstates, > > +                                                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; > >        struct address_space *mapping = vma->vm_file->f_mapping; > >        struct inode *inode = mapping->host; > >        long chg; > > > > +       idx = h - hstates; > > Better if hstate index is computed with a tiny inline helper? > Other than that, Will update in the next iteration. > > Acked-by: Hillf Danton > -aneesh