From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757710AbYLEMdV (ORCPT ); Fri, 5 Dec 2008 07:33:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750957AbYLEMdK (ORCPT ); Fri, 5 Dec 2008 07:33:10 -0500 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:62276 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730AbYLEMdJ (ORCPT ); Fri, 5 Dec 2008 07:33:09 -0500 Date: Fri, 5 Dec 2008 21:25:29 +0900 From: Daisuke Nishimura To: LKML , linux-mm Cc: Balbir Singh , KAMEZAWA Hiroyuki , Pavel Emelyanov , Li Zefan , Paul Menage , nishimura@mxp.nes.nec.co.jp Subject: [RFC][PATCH -mmotm 4/4] memcg: change try_to_free_pages to hierarchical_reclaim Message-Id: <20081205212529.8d895526.nishimura@mxp.nes.nec.co.jp> In-Reply-To: <20081205212208.31d904e0.nishimura@mxp.nes.nec.co.jp> References: <20081205212208.31d904e0.nishimura@mxp.nes.nec.co.jp> Organization: NEC Soft, Ltd. X-Mailer: Sylpheed 2.4.8 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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--;