Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756681AbYFYKLw (ORCPT ); Wed, 25 Jun 2008 06:11:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754869AbYFYKLo (ORCPT ); Wed, 25 Jun 2008 06:11:44 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:59636 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754697AbYFYKLo (ORCPT ); Wed, 25 Jun 2008 06:11:44 -0400 Date: Wed, 25 Jun 2008 19:10:11 +0900 From: KOSAKI Motohiro To: LKML , linux-mm , Andrew Morton , Lee Schermerhorn , Rik van Riel , KAMEZAWA Hiroyuki , Balbir Singh Subject: [-mm][PATCH 9/10] memcg: fix mem_cgroup_end_migration() race Cc: kosaki.motohiro@jp.fujitsu.com In-Reply-To: <20080625185717.D84C.KOSAKI.MOTOHIRO@jp.fujitsu.com> References: <20080625185717.D84C.KOSAKI.MOTOHIRO@jp.fujitsu.com> Message-Id: <20080625190914.D867.KOSAKI.MOTOHIRO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.42 [ja] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2061 Lines: 58 = From: KAMEZAWA Hiroyuki 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 Acked-by: Balbir Singh Signed-off-by: KOSAKI Motohiro --- mm/memcontrol.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) Index: b/mm/memcontrol.c =================================================================== --- a/mm/memcontrol.c +++ b/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/