Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754975Ab0GBFtr (ORCPT ); Fri, 2 Jul 2010 01:49:47 -0400 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:46309 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754647Ab0GBFtn (ORCPT ); Fri, 2 Jul 2010 01:49:43 -0400 From: Naoya Horiguchi To: Andi Kleen Cc: Andrew Morton , Mel Gorman , Wu Fengguang , "Jun'ichi Nomura" , linux-mm , LKML Subject: [PATCH 4/7] hugetlb: add hugepage check in mem_cgroup_{register,end}_migration() Date: Fri, 2 Jul 2010 14:47:23 +0900 Message-Id: <1278049646-29769-5-git-send-email-n-horiguchi@ah.jp.nec.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278049646-29769-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1278049646-29769-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1232 Lines: 40 Currently memory cgroup doesn't charge hugepage, so avoid calling these functions in hugepage migration context. Signed-off-by: Naoya Horiguchi Signed-off-by: Jun'ichi Nomura --- mm/memcontrol.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git v2.6.35-rc3-hwpoison/mm/memcontrol.c v2.6.35-rc3-hwpoison/mm/memcontrol.c index c6ece0a..fed32de 100644 --- v2.6.35-rc3-hwpoison/mm/memcontrol.c +++ v2.6.35-rc3-hwpoison/mm/memcontrol.c @@ -2504,6 +2504,8 @@ int mem_cgroup_prepare_migration(struct page *page, if (mem_cgroup_disabled()) return 0; + if (PageHuge(page)) + return 0; pc = lookup_page_cgroup(page); lock_page_cgroup(pc); @@ -2591,6 +2593,9 @@ void mem_cgroup_end_migration(struct mem_cgroup *mem, if (!mem) return; + if (PageHuge(oldpage)) + return; + /* blocks rmdir() */ cgroup_exclude_rmdir(&mem->css); /* at migration success, oldpage->mapping is NULL. */ -- 1.7.1 -- 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/