lkml.org 
[lkml]   [2012]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH -V4 05/10] hugetlb: add charge/uncharge calls for HugeTLB alloc/free
    (2012/03/17 2:39), Aneesh Kumar K.V wrote:

    > From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
    >
    > This adds necessary charge/uncharge calls in the HugeTLB code
    >
    > Acked-by: Hillf Danton <dhillf@gmail.com>
    > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>


    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    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 <linux/rmap.h>
    > #include <linux/swap.h>
    > #include <linux/swapops.h>
    > +#include <linux/memcontrol.h>
    > +#include <linux/page_cgroup.h>
    >
    > #include <asm/page.h>
    > #include <asm/pgtable.h>
    > @@ -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() ?

    Thanks,
    -Kame



    \
     
     \ /
      Last update: 2012-03-19 03:45    [W:0.024 / U:1.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site