Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755766AbYFXFpt (ORCPT ); Tue, 24 Jun 2008 01:45:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751406AbYFXFpm (ORCPT ); Tue, 24 Jun 2008 01:45:42 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:44425 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751165AbYFXFpl (ORCPT ); Tue, 24 Jun 2008 01:45:41 -0400 Date: Tue, 24 Jun 2008 14:51:27 +0900 From: KAMEZAWA Hiroyuki To: Daisuke Nishimura Cc: linux-mm@kvack.org, balbir@linux.vnet.ibm.com, xemul@openvz.org, linux-kernel@vger.kernel.org Subject: [PATCH] memcg: end migration fix (was [bad page] memcg: another bad page at page migration (2.6.26-rc5-mm3 + patch collection)) Message-Id: <20080624145127.539eb5ff.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20080623145341.0a365c67.nishimura@mxp.nes.nec.co.jp> References: <20080623145341.0a365c67.nishimura@mxp.nes.nec.co.jp> Organization: Fujitsu X-Mailer: Sylpheed 2.4.2 (GTK+ 2.10.11; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2038 Lines: 58 Hi, Nishimura-san. thank you for all your help. I think this one is......hopefully. == In general, mem_cgroup's charge on ANON page is removed when page_remove_rmap() is called. At migration, the newpage is remapped again by remove_migration_ptes(). But pte may be already changed (by task exits). It is charged at page allocation but have no chance to be uncharged in that case because it is never added to rmap. Handle that corner case in mem_cgroup_end_migration(). Signed-off-by: KAMEZAWA Hiroyuki --- mm/memcontrol.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) Index: test2-2.6.26-rc5-mm3/mm/memcontrol.c =================================================================== --- test2-2.6.26-rc5-mm3.orig/mm/memcontrol.c +++ test2-2.6.26-rc5-mm3/mm/memcontrol.c @@ -747,10 +747,22 @@ int mem_cgroup_prepare_migration(struct /* remove redundant charge if migration failed*/ void mem_cgroup_end_migration(struct page *newpage) { - /* At success, page->mapping is not NULL and nothing to do. */ + /* + * At success, page->mapping is not NULL. + * special rollback care is necessary when + * 1. at migration failure. (newpage->mapping is cleared in this case) + * 2. the newpage was moved but not remapped again because the task + * exits and the newpage is obsolete. In this case, the new page + * may be a swapcache. So, we just call mem_cgroup_uncharge_page() + * always for avoiding mess. The page_cgroup will be removed if + * unnecessary. File cache pages is still on radix-tree. Don't + * care it. + */ if (!newpage->mapping) __mem_cgroup_uncharge_common(newpage, MEM_CGROUP_CHARGE_TYPE_FORCE); + else if (PageAnon(newpage)) + mem_cgroup_uncharge_page(newpage); } /* -- 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/