Date: Thu, 10 Dec 2009 01:11:42 +0900
From: Daisuke Nishimura <d-nishimura@mtf.biglobe.ne.jp>
To: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org,
       KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
       Balbir Singh <balbir@linux.vnet.ibm.com>,
       Pavel Emelyanov <xemul@openvz.org>, linux-kernel@vger.kernel.org,
       stable@kernel.org, nishimura@mxp.nes.nec.co.jp
Subject: Re: [PATCH] [TRIVIAL] memcg: fix memory.memsw.usage_in_bytes for
 root cgroup
Message-Id: <20091210011142.bd64a736.d-nishimura@mtf.biglobe.ne.jp>
In-Reply-To: <1260373738-17179-1-git-send-email-kirill@shutemov.name>
References: <1260373738-17179-1-git-send-email-kirill@shutemov.name>
Reply-To: nishimura@mxp.nes.nec.co.jp
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1174
Lines: 37

(Added Cc: Andrew Morton <akpm@linux-foundation.org>)

On Wed,  9 Dec 2009 17:48:58 +0200
"Kirill A. Shutemov" <kirill@shutemov.name> wrote:

> We really want to take MEM_CGROUP_STAT_SWAPOUT into account.
> 
Nice catch!

	Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>

> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
> Cc: stable@kernel.org
> ---
>  mm/memcontrol.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index f99f599..6314015 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2541,6 +2541,7 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
>  			val += idx_val;
>  			mem_cgroup_get_recursive_idx_stat(mem,
>  				MEM_CGROUP_STAT_SWAPOUT, &idx_val);
> +			val += idx_val;
>  			val <<= PAGE_SHIFT;
>  		} else
>  			val = res_counter_read_u64(&mem->memsw, name);

Regards,
Daisuke Nishimura.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/