From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by kanga.kvack.org (Postfix) with ESMTP id 792176B00EE for ; Wed, 27 Jul 2011 01:54:58 -0400 (EDT) Received: from m4.gw.fujitsu.co.jp (unknown [10.0.50.74]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 2984B3EE0AE for ; Wed, 27 Jul 2011 14:54:55 +0900 (JST) Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id F081445DE4F for ; Wed, 27 Jul 2011 14:54:54 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id CE53645DE4D for ; Wed, 27 Jul 2011 14:54:54 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id C02E41DB803F for ; Wed, 27 Jul 2011 14:54:54 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.240.81.133]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 7DC571DB802F for ; Wed, 27 Jul 2011 14:54:54 +0900 (JST) Date: Wed, 27 Jul 2011 14:47:42 +0900 From: KAMEZAWA Hiroyuki Subject: [PATCH v4 2/5] memcg : pass scan nodemask Message-Id: <20110727144742.420cf69c.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20110727144438.a9fdfd5b.kamezawa.hiroyu@jp.fujitsu.com> References: <20110727144438.a9fdfd5b.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 List-ID: To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , Michal Hocko , "nishimura@mxp.nes.nec.co.jp" pass memcg's nodemask to try_to_free_pages(). try_to_free_pages can take nodemask as its argument but memcg doesn't pass it. Considering memcg can be used with cpuset on big NUMA, memcg should pass nodemask if available. Now, memcg maintain nodemask with periodic updates. pass it. Signed-off-by: KAMEZAWA Hiroyuki --- include/linux/memcontrol.h | 2 +- mm/memcontrol.c | 8 ++++++-- mm/vmscan.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) Index: mmotm-0710/include/linux/memcontrol.h =================================================================== --- mmotm-0710.orig/include/linux/memcontrol.h +++ mmotm-0710/include/linux/memcontrol.h @@ -117,7 +117,7 @@ extern void mem_cgroup_end_migration(str */ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg); int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg); -int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); +int mem_cgroup_select_victim_node(struct mem_cgroup *memcg, nodemask_t **mask); unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid, unsigned int lrumask); struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, Index: mmotm-0710/mm/memcontrol.c =================================================================== --- mmotm-0710.orig/mm/memcontrol.c +++ mmotm-0710/mm/memcontrol.c @@ -1602,10 +1602,11 @@ static void mem_cgroup_may_update_nodema * * Now, we use round-robin. Better algorithm is welcomed. */ -int mem_cgroup_select_victim_node(struct mem_cgroup *mem) +int mem_cgroup_select_victim_node(struct mem_cgroup *mem, nodemask_t **mask) { int node; + *mask = NULL; mem_cgroup_may_update_nodemask(mem); node = mem->last_scanned_node; @@ -1620,6 +1621,8 @@ int mem_cgroup_select_victim_node(struct */ if (unlikely(node == MAX_NUMNODES)) node = numa_node_id(); + else + *mask = &mem->scan_nodes; mem->last_scanned_node = node; return node; @@ -1667,8 +1670,9 @@ static void mem_cgroup_numascan_init(str } #else -int mem_cgroup_select_victim_node(struct mem_cgroup *mem) +int mem_cgroup_select_victim_node(struct mem_cgroup *mem, nodemask_t **mask) { + *mask = NULL; return 0; } Index: mmotm-0710/mm/vmscan.c =================================================================== --- mmotm-0710.orig/mm/vmscan.c +++ mmotm-0710/mm/vmscan.c @@ -2280,6 +2280,7 @@ unsigned long try_to_free_mem_cgroup_pag unsigned long nr_reclaimed; unsigned long start, end; int nid; + nodemask_t *mask; struct scan_control sc = { .may_writepage = !laptop_mode, .may_unmap = 1, @@ -2302,7 +2303,7 @@ unsigned long try_to_free_mem_cgroup_pag * take care of from where we get pages. So the node where we start the * scan does not need to be the current node. */ - nid = mem_cgroup_select_victim_node(mem_cont); + nid = mem_cgroup_select_victim_node(mem_cont, &mask); zonelist = NODE_DATA(nid)->node_zonelists; -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org