From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx121.postini.com [74.125.245.121]) by kanga.kvack.org (Postfix) with SMTP id 8FC3E6B004A for ; Wed, 15 Feb 2012 19:11:01 -0500 (EST) Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 0A3923EE0B5 for ; Thu, 16 Feb 2012 09:11:00 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id E468145DEB8 for ; Thu, 16 Feb 2012 09:10:59 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id C29C245DEB2 for ; Thu, 16 Feb 2012 09:10:59 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id B13781DB803E for ; Thu, 16 Feb 2012 09:10:59 +0900 (JST) Received: from m106.s.css.fujitsu.com (m106.s.css.fujitsu.com [10.240.81.146]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 5123E1DB8038 for ; Thu, 16 Feb 2012 09:10:59 +0900 (JST) Date: Thu, 16 Feb 2012 09:09:39 +0900 From: KAMEZAWA Hiroyuki Subject: Re: [PATCH 1/2] memcg: fix page_referencies cgroup filter on global reclaim Message-Id: <20120216090939.ce2d1f28.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20120215162830.13902.60256.stgit@zurg> References: <20120215162830.13902.60256.stgit@zurg> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Konstantin Khlebnikov Cc: linux-mm@kvack.org, Andrew Morton , Johannes Weiner , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org On Wed, 15 Feb 2012 20:28:30 +0400 Konstantin Khlebnikov wrote: > Global memory reclaimer should't skip referencies for any pages, > even if they are shared between different cgroups. > > This patch adds scan_control->current_mem_cgroup, which points to currently > shrinking sub-cgroup in hierarchy, at global reclaim it always NULL. > > Signed-off-by: Konstantin Khlebnikov seems ok to me. How about you, Johannes ? Acked-by: KAMEZAWA Hiroyuki > --- > mm/vmscan.c | 18 ++++++++++++++---- > 1 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 531abcc..b069fac 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -109,6 +109,12 @@ struct scan_control { > struct mem_cgroup *target_mem_cgroup; > > /* > + * Currently reclaiming memory cgroup in hierarchy, > + * NULL for global reclaim. > + */ > + struct mem_cgroup *current_mem_cgroup; > + > + /* > * Nodemask of nodes allowed by the caller. If NULL, all nodes > * are scanned. > */ > @@ -703,13 +709,13 @@ enum page_references { > }; > > static enum page_references page_check_references(struct page *page, > - struct mem_cgroup_zone *mz, > struct scan_control *sc) > { > int referenced_ptes, referenced_page; > unsigned long vm_flags; > > - referenced_ptes = page_referenced(page, 1, mz->mem_cgroup, &vm_flags); > + referenced_ptes = page_referenced(page, 1, > + sc->current_mem_cgroup, &vm_flags); > referenced_page = TestClearPageReferenced(page); > > /* Lumpy reclaim - ignore references */ > @@ -830,7 +836,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, > } > } > > - references = page_check_references(page, mz, sc); > + references = page_check_references(page, sc); > switch (references) { > case PAGEREF_ACTIVATE: > goto activate_locked; > @@ -1744,7 +1750,7 @@ static void shrink_active_list(unsigned long nr_to_scan, > continue; > } > > - if (page_referenced(page, 0, mz->mem_cgroup, &vm_flags)) { > + if (page_referenced(page, 0, sc->current_mem_cgroup, &vm_flags)) { > nr_rotated += hpage_nr_pages(page); > /* > * Identify referenced, file-backed active pages and > @@ -2163,6 +2169,9 @@ static void shrink_zone(int priority, struct zone *zone, > .zone = zone, > }; > > + if (!global_reclaim(sc)) > + sc->current_mem_cgroup = memcg; > + > shrink_mem_cgroup_zone(priority, &mz, sc); > /* > * Limit reclaim has historically picked one memcg and > @@ -2478,6 +2487,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg, > .may_swap = !noswap, > .order = 0, > .target_mem_cgroup = memcg, > + .current_mem_cgroup = memcg, > }; > struct mem_cgroup_zone mz = { > .mem_cgroup = memcg, > > -- > 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 -- 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