From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by e28smtp04.in.ibm.com (8.13.1/8.13.1) with ESMTP id mB5Dse5a015738 for ; Fri, 5 Dec 2008 19:24:40 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mB5DrnLe3375336 for ; Fri, 5 Dec 2008 19:23:49 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.13.1/8.13.3) with ESMTP id mB5DsdJH009814 for ; Sat, 6 Dec 2008 00:54:40 +1100 Date: Fri, 5 Dec 2008 19:24:53 +0530 From: Balbir Singh Subject: Re: [RFC][PATCH -mmotm 4/4] memcg: change try_to_free_pages to hierarchical_reclaim Message-ID: <20081205135453.GC10004@balbir.in.ibm.com> Reply-To: balbir@linux.vnet.ibm.com References: <20081205212208.31d904e0.nishimura@mxp.nes.nec.co.jp> <20081205212529.8d895526.nishimura@mxp.nes.nec.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20081205212529.8d895526.nishimura@mxp.nes.nec.co.jp> Sender: owner-linux-mm@kvack.org Return-Path: To: Daisuke Nishimura Cc: LKML , linux-mm , KAMEZAWA Hiroyuki , Pavel Emelyanov , Li Zefan , Paul Menage List-ID: * Daisuke Nishimura [2008-12-05 21:25:29]: > mem_cgroup_hierarchicl_reclaim() works properly even when !use_hierarchy now, > so, instead of try_to_free_mem_cgroup_pages(), it should be used in many cases. > Yes, that was by design. The design is such that use_hierarchy is set for all children when the parent has it set and the resource counters are also linked, such that the charge propagates to the root of the current hierarchy and not any further. > The only exception is force_empty. The group has no children in this case. > > > Signed-off-by: Daisuke Nishimura > --- > mm/memcontrol.c | 12 ++++-------- > 1 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index ab04725..c0b4f37 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1399,8 +1399,7 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask) > rcu_read_unlock(); > > do { > - progress = try_to_free_mem_cgroup_pages(mem, gfp_mask, true, > - get_swappiness(mem)); > + progress = mem_cgroup_hierarchical_reclaim(mem, gfp_mask, true); > progress += mem_cgroup_check_under_limit(mem); > } while (!progress && --retry); > > @@ -1467,10 +1466,8 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, > if (!ret) > break; > > - progress = try_to_free_mem_cgroup_pages(memcg, > - GFP_KERNEL, > - false, > - get_swappiness(memcg)); > + progress = mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, > + false); > if (!progress) retry_count--; > } > > @@ -1514,8 +1511,7 @@ int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg, > break; > > oldusage = res_counter_read_u64(&memcg->memsw, RES_USAGE); > - try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL, true, > - get_swappiness(memcg)); > + mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, true); > curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE); > if (curusage >= oldusage) > retry_count--; > Looks good to me Acked-by: Balbir Singh -- Balbir -- 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