From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828Ab0LOFad (ORCPT ); Wed, 15 Dec 2010 00:30:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17492 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750715Ab0LOFac (ORCPT ); Wed, 15 Dec 2010 00:30:32 -0500 Date: Wed, 15 Dec 2010 06:29:10 +0100 From: Andrea Arcangeli To: KAMEZAWA Hiroyuki Cc: Mel Gorman , linux-mm@kvack.org, Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, Marcelo Tosatti , Adam Litke , Avi Kivity , Hugh Dickins , Rik van Riel , Dave Hansen , Benjamin Herrenschmidt , Ingo Molnar , Mike Travis , Christoph Lameter , Chris Wright , bpicco@redhat.com, KOSAKI Motohiro , Balbir Singh , "Michael S. Tsirkin" , Peter Zijlstra , Johannes Weiner , Daisuke Nishimura , Chris Mason , Borislav Petkov Subject: Re: [PATCH 36 of 66] memcg compound Message-ID: <20101215052910.GR5638@random.random> References: <495ffee2d60adab4d18b.1288798091@v2.random> <20101118152628.GY8135@csn.ul.ie> <20101119101041.ffe00712.kamezawa.hiroyu@jp.fujitsu.com> <20101214173817.GH5638@random.random> <20101215091209.8c757ad1.kamezawa.hiroyu@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101215091209.8c757ad1.kamezawa.hiroyu@jp.fujitsu.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Wed, Dec 15, 2010 at 09:12:09AM +0900, KAMEZAWA Hiroyuki wrote: > Thank you. Hmm,..seems not very simple :( I'm sorry. > Please do as you want. I did the below change, let me know if there's any problem with it. What's left is mem_cgroup_move_parent... > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -2503,6 +2503,9 @@ __do_uncharge(struct mem_cgroup *mem, co > > if (!batch->do_batch || test_thread_flag(TIF_MEMDIE)) > > goto direct_uncharge; > > > > + if (page_size != PAGE_SIZE) > > + goto direct_uncharge; > > + > > /* > > * In typical case, batch->memcg == mem. This means we can > > * merge a series of uncharges to an uncharge of res_counter. > > @@ -2511,9 +2514,9 @@ __do_uncharge(struct mem_cgroup *mem, co > > if (batch->memcg != mem) > > goto direct_uncharge; > > /* remember freed charge and uncharge it later */ > > - batch->bytes += page_size; > > + batch->bytes += PAGE_SIZE; > > if (uncharge_memsw) > > - batch->memsw_bytes += page_size; > > + batch->memsw_bytes += PAGE_SIZE; > > return; > > direct_uncharge: > > res_counter_uncharge(&mem->res, page_size); > > > > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with SMTP id 7C5E26B0095 for ; Wed, 15 Dec 2010 00:30:07 -0500 (EST) Date: Wed, 15 Dec 2010 06:29:10 +0100 From: Andrea Arcangeli Subject: Re: [PATCH 36 of 66] memcg compound Message-ID: <20101215052910.GR5638@random.random> References: <495ffee2d60adab4d18b.1288798091@v2.random> <20101118152628.GY8135@csn.ul.ie> <20101119101041.ffe00712.kamezawa.hiroyu@jp.fujitsu.com> <20101214173817.GH5638@random.random> <20101215091209.8c757ad1.kamezawa.hiroyu@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101215091209.8c757ad1.kamezawa.hiroyu@jp.fujitsu.com> Sender: owner-linux-mm@kvack.org To: KAMEZAWA Hiroyuki Cc: Mel Gorman , linux-mm@kvack.org, Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, Marcelo Tosatti , Adam Litke , Avi Kivity , Hugh Dickins , Rik van Riel , Dave Hansen , Benjamin Herrenschmidt , Ingo Molnar , Mike Travis , Christoph Lameter , Chris Wright , bpicco@redhat.com, KOSAKI Motohiro , Balbir Singh , "Michael S. Tsirkin" , Peter Zijlstra , Johannes Weiner , Daisuke Nishimura , Chris Mason , Borislav Petkov List-ID: Hello, On Wed, Dec 15, 2010 at 09:12:09AM +0900, KAMEZAWA Hiroyuki wrote: > Thank you. Hmm,..seems not very simple :( I'm sorry. > Please do as you want. I did the below change, let me know if there's any problem with it. What's left is mem_cgroup_move_parent... > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -2503,6 +2503,9 @@ __do_uncharge(struct mem_cgroup *mem, co > > if (!batch->do_batch || test_thread_flag(TIF_MEMDIE)) > > goto direct_uncharge; > > > > + if (page_size != PAGE_SIZE) > > + goto direct_uncharge; > > + > > /* > > * In typical case, batch->memcg == mem. This means we can > > * merge a series of uncharges to an uncharge of res_counter. > > @@ -2511,9 +2514,9 @@ __do_uncharge(struct mem_cgroup *mem, co > > if (batch->memcg != mem) > > goto direct_uncharge; > > /* remember freed charge and uncharge it later */ > > - batch->bytes += page_size; > > + batch->bytes += PAGE_SIZE; > > if (uncharge_memsw) > > - batch->memsw_bytes += page_size; > > + batch->memsw_bytes += PAGE_SIZE; > > return; > > direct_uncharge: > > res_counter_uncharge(&mem->res, page_size); > > > > > -- 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 policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org