Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759305Ab1FQW1n (ORCPT ); Fri, 17 Jun 2011 18:27:43 -0400 Received: from smtp-out.google.com ([74.125.121.67]:18866 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755449Ab1FQW1j convert rfc822-to-8bit (ORCPT ); Fri, 17 Jun 2011 18:27:39 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ynkGSZPHwZWkxkfv6Yzo5+2GcOe40r4ah7TYB/STsC0awOLaZabFA7IGCCEHrhm6Tn ANmeZ98/yg/GtiRJW7Ew== MIME-Version: 1.0 In-Reply-To: <20110616125443.23584d78.kamezawa.hiroyu@jp.fujitsu.com> References: <20110616124730.d6960b8b.kamezawa.hiroyu@jp.fujitsu.com> <20110616125443.23584d78.kamezawa.hiroyu@jp.fujitsu.com> Date: Fri, 17 Jun 2011 15:27:36 -0700 Message-ID: Subject: Re: [PATCH 5/7] Fix not good check of mem_cgroup_local_usage() From: Ying Han To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , "nishimura@mxp.nes.nec.co.jp" , "bsingharora@gmail.com" , Michal Hocko , "hannes@cmpxchg.org" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4173 Lines: 124 On Wed, Jun 15, 2011 at 8:54 PM, KAMEZAWA Hiroyuki wrote: > From fcfc6ee9847b0b2571cd6e9847572d7c70e1e2b2 Mon Sep 17 00:00:00 2001 > From: KAMEZAWA Hiroyuki > Date: Thu, 16 Jun 2011 09:23:54 +0900 > Subject: [PATCH 5/7] Fix not good check of mem_cgroup_local_usage() > > Now, mem_cgroup_local_usage(memcg) is used as hint for scanning memory > cgroup hierarchy. If it returns true, the memcg has some reclaimable memory. > > But this function doesn't take care of > ?- unevictable pages > ?- anon pages on swapless system. > > This patch fixes the function to use LRU information. > For NUMA, for avoid scanning, numa scan bitmap is used. If it's > empty, some more precise check will be done. > > Signed-off-by: KAMEZAWA Hiroyuki > --- > ?mm/memcontrol.c | ? 43 +++++++++++++++++++++++++++++++++---------- > ?1 files changed, 33 insertions(+), 10 deletions(-) > > Index: mmotm-0615/mm/memcontrol.c > =================================================================== > --- mmotm-0615.orig/mm/memcontrol.c > +++ mmotm-0615/mm/memcontrol.c > @@ -632,15 +632,6 @@ static long mem_cgroup_read_stat(struct > ? ? ? ?return val; > ?} > > -static long mem_cgroup_local_usage(struct mem_cgroup *mem) > -{ > - ? ? ? long ret; > - > - ? ? ? ret = mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS); > - ? ? ? ret += mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE); > - ? ? ? return ret; > -} > - > ?static void mem_cgroup_swap_statistics(struct mem_cgroup *mem, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bool charge) > ?{ > @@ -1713,6 +1704,23 @@ static void mem_cgroup_numascan_init(str > ? ? ? ?mutex_init(&mem->numascan_mutex); > ?} > > +static bool mem_cgroup_reclaimable(struct mem_cgroup *mem, bool noswap) > +{ > + ? ? ? if (!nodes_empty(mem->scan_nodes)) > + ? ? ? ? ? ? ? return true; > + ? ? ? /* slow path */ > + ? ? ? if (mem_cgroup_get_local_zonestat(mem, LRU_INACTIVE_FILE)) > + ? ? ? ? ? ? ? return true; > + ? ? ? if (mem_cgroup_get_local_zonestat(mem, LRU_ACTIVE_FILE)) > + ? ? ? ? ? ? ? return true; Wondering if we can simplify this like: if (mem_cgroup_nr_file_lru_pages(mem)) return true; > + ? ? ? if (noswap || !total_swap_pages) > + ? ? ? ? ? ? ? return false; > + ? ? ? if (mem_cgroup_get_local_zonestat(mem, LRU_INACTIVE_ANON)) > + ? ? ? ? ? ? ? return true; > + ? ? ? if (mem_cgroup_get_local_zonestat(mem, LRU_ACTIVE_ANON)) > + ? ? ? ? ? ? ? return true; the same: if (mem_cgroup_nr_anon_lru_pages(mem)) return true; > + ? ? ? return false; > +} The two functions above are part of memory.numa_stat patch which is in mmotm i believe. Just feel the functionality a bit duplicate except the noswap parameter and scan_nodes. --Ying > ?#else > ?int mem_cgroup_select_victim_node(struct mem_cgroup *mem) > ?{ > @@ -1722,6 +1730,21 @@ static void mem_cgroup_numascan_init(str > ?{ > ? ? ? ?return 0; > ?} > + > +static bool mem_cgroup_reclaimable(struct mem_cgroup *mem, bool noswap) > +{ > + ? ? ? if (mem_cgroup_get_zonestat_node(mem, 0, LRU_INACTIVE_FILE)) > + ? ? ? ? ? ? ? return true; > + ? ? ? if (mem_cgroup_get_zonestat_node(mem, 0, LRU_ACTIVE_FILE)) > + ? ? ? ? ? ? ? return true; > + ? ? ? if (noswap || !total_swap_pages) > + ? ? ? ? ? ? ? return false; > + ? ? ? if (mem_cgroup_get_zonestat_node(mem, 0, LRU_INACTIVE_ANON)) > + ? ? ? ? ? ? ? return true; > + ? ? ? if (mem_cgroup_get_zonestat_node(mem, 0, LRU_ACTIVE_ANON)) > + ? ? ? ? ? ? ? return true; > + ? ? ? return false; > +} > ?#endif > > > @@ -1811,7 +1834,7 @@ again: > > ? ? ? ?while (visit--) { > ? ? ? ? ? ? ? ?victim = mem_cgroup_select_victim(root_mem); > - ? ? ? ? ? ? ? if (!mem_cgroup_local_usage(victim)) { > + ? ? ? ? ? ? ? if (!mem_cgroup_reclaimable(victim, noswap)) { > ? ? ? ? ? ? ? ? ? ? ? ?/* this cgroup's local usage == 0 */ > ? ? ? ? ? ? ? ? ? ? ? ?css_put(&victim->css); > ? ? ? ? ? ? ? ? ? ? ? ?continue; > > -- 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/