(2012/03/17 2:39), Aneesh Kumar K.V wrote:
> From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
>
> This adds necessary charge/uncharge calls in the HugeTLB code
>
> Acked-by: Hillf Danton <dhillf@xxxxxxxxx>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. 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: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>