From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187AbZHUJio (ORCPT ); Fri, 21 Aug 2009 05:38:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755220AbZHUJin (ORCPT ); Fri, 21 Aug 2009 05:38:43 -0400 Received: from e28smtp07.in.ibm.com ([59.145.155.7]:33778 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755215AbZHUJim (ORCPT ); Fri, 21 Aug 2009 05:38:42 -0400 Date: Fri, 21 Aug 2009 15:05:48 +0530 From: Balbir Singh To: Daisuke Nishimura Cc: LKML , linux-mm , Andrew Morton , KAMEZAWA Hiroyuki Subject: Re: [PATCH -mmotm] memcg: show swap usage in stat file Message-ID: <20090821093548.GD29572@balbir.in.ibm.com> Reply-To: balbir@linux.vnet.ibm.com References: <20090821152549.038e6953.nishimura@mxp.nes.nec.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20090821152549.038e6953.nishimura@mxp.nes.nec.co.jp> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * nishimura@mxp.nes.nec.co.jp [2009-08-21 15:25:49]: > We now count MEM_CGROUP_STAT_SWAPOUT, so we can show swap usage. > It would be useful for users to show swap usage in memory.stat file, > because they don't need calculate memsw.usage - res.usage to know swap usage. > > Signed-off-by: Daisuke Nishimura > --- > mm/memcontrol.c | 17 ++++++++++++++--- > 1 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 8b06c05..ae80de0 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2663,6 +2663,7 @@ enum { > MCS_MAPPED_FILE, > MCS_PGPGIN, > MCS_PGPGOUT, > + MCS_SWAP, > MCS_INACTIVE_ANON, > MCS_ACTIVE_ANON, > MCS_INACTIVE_FILE, > @@ -2684,6 +2685,7 @@ struct { > {"mapped_file", "total_mapped_file"}, > {"pgpgin", "total_pgpgin"}, > {"pgpgout", "total_pgpgout"}, > + {"swap", "total_swap"}, > {"inactive_anon", "total_inactive_anon"}, > {"active_anon", "total_active_anon"}, > {"inactive_file", "total_inactive_file"}, > @@ -2708,6 +2710,10 @@ static int mem_cgroup_get_local_stat(struct mem_cgroup *mem, void *data) > s->stat[MCS_PGPGIN] += val; > val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_PGPGOUT_COUNT); > s->stat[MCS_PGPGOUT] += val; > + if (do_swap_account) { > + val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_SWAPOUT); > + s->stat[MCS_SWAP] += val; > + } > > /* per zone stat */ > val = mem_cgroup_get_local_zonestat(mem, LRU_INACTIVE_ANON); > @@ -2739,8 +2745,11 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, > memset(&mystat, 0, sizeof(mystat)); > mem_cgroup_get_local_stat(mem_cont, &mystat); > > - for (i = 0; i < NR_MCS_STAT; i++) > + for (i = 0; i < NR_MCS_STAT; i++) { > + if (i == MCS_SWAP && !do_swap_account) > + continue; May be worth encapsulating in a function like memcg_show_swapout > cb->fill(cb, memcg_stat_strings[i].local_name, mystat.stat[i]); > + } > > /* Hierarchical information */ > { > @@ -2753,9 +2762,11 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, > > memset(&mystat, 0, sizeof(mystat)); > mem_cgroup_get_total_stat(mem_cont, &mystat); > - for (i = 0; i < NR_MCS_STAT; i++) > + for (i = 0; i < NR_MCS_STAT; i++) { > + if (i == MCS_SWAP && !do_swap_account) > + continue; > cb->fill(cb, memcg_stat_strings[i].total_name, mystat.stat[i]); > - > + } > > #ifdef CONFIG_DEBUG_VM > cb->fill(cb, "inactive_ratio", calc_inactive_ratio(mem_cont, NULL)); Overall, looks good Reviewed-by: Balbir Singh -- Balbir