From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail190.messagelabs.com (mail190.messagelabs.com [216.82.249.51]) by kanga.kvack.org (Postfix) with SMTP id 4E6456B005A for ; Thu, 11 Jun 2009 04:05:26 -0400 (EDT) Received: from m5.gw.fujitsu.co.jp ([10.0.50.75]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n5B85Wm1030913 for (envelope-from kamezawa.hiroyu@jp.fujitsu.com); Thu, 11 Jun 2009 17:05:33 +0900 Received: from smail (m5 [127.0.0.1]) by outgoing.m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 7B71145DE57 for ; Thu, 11 Jun 2009 17:05:32 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (s5.gw.fujitsu.co.jp [10.0.50.95]) by m5.gw.fujitsu.co.jp (Postfix) with ESMTP id 506AC45DE51 for ; Thu, 11 Jun 2009 17:05:32 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 29B001DB805A for ; Thu, 11 Jun 2009 17:05:32 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id CA38B1DB8038 for ; Thu, 11 Jun 2009 17:05:31 +0900 (JST) Date: Thu, 11 Jun 2009 17:04:00 +0900 From: KAMEZAWA Hiroyuki Subject: [PATCH 3/3] memcg: fix LRU rotation of isolate_lru_pages with memcg Message-Id: <20090611170400.638bdb90.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20090611165535.cf46bf29.kamezawa.hiroyu@jp.fujitsu.com> References: <20090611165535.cf46bf29.kamezawa.hiroyu@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "kosaki.motohiro@jp.fujitsu.com" , "nishimura@mxp.nes.nec.co.jp" , "balbir@linux.vnet.ibm.com" , "akpm@linux-foundation.org" , apw@canonical.com, riel@redhat.com, minchan.kim@gmail.com, mel@csn.ul.ie List-ID: From: KAMEZAWA Hiroyuki This patch tries to fix memcg's lru rotation logic to make memcg use the same logic as global LRU does. Now, at __isolate_lru_page() retruns -EBUSY, the page is rotated to the tail of LRU in global LRU's isolate LRU pages. But in memcg, it's not handled. This makes memcg do the same behavior as global LRU and rotate LRU in the page is busy. Acked-by: Balbir Singh Reviewed-by: Daisuke Nishimura Signed-off-by: KAMEZAWA Hiroyuki --- Index: lumpy-reclaim-trial/mm/vmscan.c =================================================================== --- lumpy-reclaim-trial.orig/mm/vmscan.c 2009-06-10 19:48:28.000000000 +0900 +++ lumpy-reclaim-trial/mm/vmscan.c 2009-06-10 20:06:55.000000000 +0900 @@ -844,7 +844,6 @@ */ ClearPageLRU(page); ret = 0; - mem_cgroup_del_lru(page); } return ret; @@ -892,12 +891,14 @@ switch (__isolate_lru_page(page, mode, file)) { case 0: list_move(&page->lru, dst); + mem_cgroup_del_lru(page); nr_taken++; break; case -EBUSY: /* else it is being freed elsewhere */ list_move(&page->lru, src); + mem_cgroup_rotate_lru_list(page, page_lru(page)); continue; default: @@ -941,6 +942,7 @@ break; if (__isolate_lru_page(cursor_page, mode, file) == 0) { list_move(&cursor_page->lru, dst); + mem_cgroup_del_lru(page); nr_taken++; scan++; break; Index: lumpy-reclaim-trial/mm/memcontrol.c =================================================================== --- lumpy-reclaim-trial.orig/mm/memcontrol.c 2009-06-10 17:30:23.000000000 +0900 +++ lumpy-reclaim-trial/mm/memcontrol.c 2009-06-10 20:05:21.000000000 +0900 @@ -649,6 +649,7 @@ int zid = zone_idx(z); struct mem_cgroup_per_zone *mz; int lru = LRU_FILE * !!file + !!active; + int ret; BUG_ON(!mem_cont); mz = mem_cgroup_zoneinfo(mem_cont, nid, zid); @@ -666,9 +667,19 @@ continue; scan++; - if (__isolate_lru_page(page, mode, file) == 0) { + ret = __isolate_lru_page(page, mode, file); + switch (ret) { + case 0: list_move(&page->lru, dst); + mem_cgroup_del_lru(page); nr_taken++; + break; + case -EBUSY: + /* we don't affect global LRU but rotate in our LRU */ + mem_cgroup_rotate_lru_list(page, page_lru(page)); + break; + default: + break; } } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org