On Tue, 13 Mar 2012 21:20:21 +0800, Hillf Danton [off-list ref] wrote:

On Tue, Mar 13, 2012 at 3:07 PM, Aneesh Kumar K.V
[off-list ref] wrote:

quoted

From: "Aneesh Kumar K.V" <redacted>

This adds necessary charge/uncharge calls in the HugeTLB code

Signed-off-by: Aneesh Kumar K.V <redacted>
---
 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 <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(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 <redacted>

-aneesh