From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758635Ab1E0BRK (ORCPT ); Thu, 26 May 2011 21:17:10 -0400 Received: from smtp-out.google.com ([74.125.121.67]:4021 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380Ab1E0BRI convert rfc822-to-8bit (ORCPT ); Thu, 26 May 2011 21:17:08 -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=Tjy+eUmJVlyfXpR+l55OBs/UW72j5yqPhcCgayMR60ak44RMZJ4TtRLd/OuO930zG4 JmvhRY5Sq88Y6RK58aLQ== MIME-Version: 1.0 In-Reply-To: <20110526143631.adc2c911.kamezawa.hiroyu@jp.fujitsu.com> References: <20110526141047.dc828124.kamezawa.hiroyu@jp.fujitsu.com> <20110526143631.adc2c911.kamezawa.hiroyu@jp.fujitsu.com> Date: Thu, 26 May 2011 18:17:04 -0700 Message-ID: Subject: Re: [RFC][PATCH v3 10/10] memcg : reclaim statistics 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" , "balbir@linux.vnet.ibm.com" 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 Hi Kame: I applied the patch on top of mmotm-2011-05-12-15-52. After boot up, i keep getting the following crash by reading the /dev/cgroup/memory/memory.reclaim_stat [ 200.776366] Kernel panic - not syncing: Fatal exception [ 200.781591] Pid: 7535, comm: cat Tainted: G D W 2.6.39-mcg-DEV #130 [ 200.788463] Call Trace: [ 200.790916] [] panic+0x91/0x194 [ 200.797096] [] oops_end+0xae/0xbe [ 200.803450] [] die+0x5a/0x63 [ 200.809366] [] do_trap+0x121/0x130 [ 200.814427] [] do_divide_error+0x90/0x99 [#1] SMP [ 200.821395] [] ? mem_cgroup_reclaim_stat_read+0x28/0xf0 [ 200.829624] [] ? page_add_new_anon_rmap+0x7e/0x90 [ 200.837372] [] ? handle_pte_fault+0x28a/0x775 [ 200.844773] [] divide_error+0x15/0x20 [ 200.851471] [] ? mem_cgroup_reclaim_stat_read+0x28/0xf0 [ 200.859729] [] cgroup_seqfile_show+0x38/0x46 [ 200.867036] [] ? cgroup_lock+0x17/0x17 [ 200.872444] [] seq_read+0x182/0x361 [ 200.878984] [] vfs_read+0xab/0x107 [ 200.885403] [] sys_read+0x4a/0x6e [ 200.891764] [] sysenter_dispatch+0x7/0x27 I will debug it, but like to post here in case i missed some patches in between. --Ying On Wed, May 25, 2011 at 10:36 PM, KAMEZAWA Hiroyuki wrote: > > This patch adds a file memory.reclaim_stat. > > This file shows following. > == > recent_scan_success_ratio 12 # recent reclaim/scan ratio. > limit_scan_pages 671 # scan caused by hitting limit. > limit_freed_pages 538 # freed pages by limit_scan > limit_elapsed_ns 518555076 # elapsed time in LRU scanning by limit. > soft_scan_pages 0 # scan caused by softlimit. > soft_freed_pages 0 # freed pages by soft_scan. > soft_elapsed_ns 0 # elapsed time in LRU scanning by softlimit. > margin_scan_pages 16744221 # scan caused by auto-keep-margin > margin_freed_pages 565943 # freed pages by auto-keep-margin. > margin_elapsed_ns 5545388791 # elapsed time in LRU scanning by auto-keep-margin > > This patch adds a new file rather than adding more stats to memory.stat. By it, > this support "reset" accounting by > > # echo 0 > .../memory.reclaim_stat > > This is good for debug and tuning. > > TODO: > - add Documentaion. > > Signed-off-by: KAMEZAWA Hiroyuki > --- > mm/memcontrol.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 79 insertions(+), 8 deletions(-) > > Index: memcg_async/mm/memcontrol.c > =================================================================== > --- memcg_async.orig/mm/memcontrol.c > +++ memcg_async/mm/memcontrol.c > @@ -216,6 +216,13 @@ static void mem_cgroup_update_margin_to_ > static void mem_cgroup_may_async_reclaim(struct mem_cgroup *mem); > static void mem_cgroup_reflesh_scan_ratio(struct mem_cgroup *mem); > > +enum scan_type { > + LIMIT_SCAN, /* scan memory because memcg hits limit */ > + SOFT_SCAN, /* scan memory because of soft limit */ > + MARGIN_SCAN, /* scan memory for making margin to limit */ > + NR_SCAN_TYPES, > +}; > + > /* > * The memory controller data structure. The memory controller controls both > * page cache and RSS per cgroup. We would eventually like to provide > @@ -300,6 +307,13 @@ struct mem_cgroup { > unsigned long scanned; > unsigned long reclaimed; > unsigned long next_scanratio_update; > + /* For statistics */ > + struct { > + unsigned long nr_scanned_pages; > + unsigned long nr_reclaimed_pages; > + unsigned long elapsed_ns; > + } scan_stat[NR_SCAN_TYPES]; > + > /* > * percpu counter. > */ > @@ -1426,7 +1440,9 @@ unsigned int mem_cgroup_swappiness(struc > > static void __mem_cgroup_update_scan_ratio(struct mem_cgroup *mem, > unsigned long scanned, > - unsigned long reclaimed) > + unsigned long reclaimed, > + unsigned long elapsed, > + enum scan_type type) > { > unsigned long limit; > > @@ -1439,6 +1455,9 @@ static void __mem_cgroup_update_scan_rat > mem->scanned /= 2; > mem->reclaimed /= 2; > } > + mem->scan_stat[type].nr_scanned_pages += scanned; > + mem->scan_stat[type].nr_reclaimed_pages += reclaimed; > + mem->scan_stat[type].elapsed_ns += elapsed; > spin_unlock(&mem->scan_stat_lock); > } > > @@ -1448,6 +1467,8 @@ static void __mem_cgroup_update_scan_rat > * @root : root memcg of hierarchy walk. > * @scanned : scanned pages > * @reclaimed: reclaimed pages. > + * @elapsed: used time for memory reclaim > + * @type : scan type as LIMIT_SCAN, SOFT_SCAN, MARGIN_SCAN. > * > * record scan/reclaim ratio to the memcg both to a child and it's root > * mem cgroup, which is a reclaim target. This value is used for > @@ -1457,11 +1478,14 @@ static void __mem_cgroup_update_scan_rat > static void mem_cgroup_update_scan_ratio(struct mem_cgroup *mem, > struct mem_cgroup *root, > unsigned long scanned, > - unsigned long reclaimed) > + unsigned long reclaimed, > + unsigned long elapsed, > + int type) > { > - __mem_cgroup_update_scan_ratio(mem, scanned, reclaimed); > + __mem_cgroup_update_scan_ratio(mem, scanned, reclaimed, elapsed, type); > if (mem != root) > - __mem_cgroup_update_scan_ratio(root, scanned, reclaimed); > + __mem_cgroup_update_scan_ratio(root, scanned, reclaimed, > + elapsed, type); > > } > > @@ -1906,6 +1930,7 @@ static int mem_cgroup_hierarchical_recla > bool is_kswapd = false; > unsigned long excess; > unsigned long nr_scanned; > + unsigned long start, end, elapsed; > > excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT; > > @@ -1947,18 +1972,24 @@ static int mem_cgroup_hierarchical_recla > } > /* we use swappiness of local cgroup */ > if (check_soft) { > + start = sched_clock(); > ret = mem_cgroup_shrink_node_zone(victim, gfp_mask, > noswap, zone, &nr_scanned); > + end = sched_clock(); > + elapsed = end - start; > *total_scanned += nr_scanned; > mem_cgroup_soft_steal(victim, is_kswapd, ret); > mem_cgroup_soft_scan(victim, is_kswapd, nr_scanned); > mem_cgroup_update_scan_ratio(victim, > - root_mem, nr_scanned, ret); > + root_mem, nr_scanned, ret, elapsed, SOFT_SCAN); > } else { > + start = sched_clock(); > ret = try_to_free_mem_cgroup_pages(victim, gfp_mask, > noswap, &nr_scanned); > + end = sched_clock(); > + elapsed = end - start; > mem_cgroup_update_scan_ratio(victim, > - root_mem, nr_scanned, ret); > + root_mem, nr_scanned, ret, elapsed, LIMIT_SCAN); > } > css_put(&victim->css); > /* > @@ -4003,7 +4034,7 @@ static void mem_cgroup_async_shrink_work > struct delayed_work *dw = to_delayed_work(work); > struct mem_cgroup *mem, *victim; > long nr_to_reclaim; > - unsigned long nr_scanned, nr_reclaimed; > + unsigned long nr_scanned, nr_reclaimed, start, end; > int delay = 0; > > mem = container_of(dw, struct mem_cgroup, async_work); > @@ -4022,9 +4053,12 @@ static void mem_cgroup_async_shrink_work > if (!victim) > goto finish_scan; > > + start = sched_clock(); > nr_reclaimed = mem_cgroup_shrink_rate_limited(victim, nr_to_reclaim, > &nr_scanned); > - mem_cgroup_update_scan_ratio(victim, mem, nr_scanned, nr_reclaimed); > + end = sched_clock(); > + mem_cgroup_update_scan_ratio(victim, mem, nr_scanned, nr_reclaimed, > + end - start, MARGIN_SCAN); > css_put(&victim->css); > > /* If margin is enough big, stop */ > @@ -4680,6 +4714,38 @@ static int mem_control_stat_show(struct > return 0; > } > > +static int mem_cgroup_reclaim_stat_read(struct cgroup *cont, struct cftype *cft, > + struct cgroup_map_cb *cb) > +{ > + struct mem_cgroup *mem = mem_cgroup_from_cont(cont); > + u64 val; > + int i; /* for indexing scan_stat[] */ > + > + val = mem->reclaimed * 100 / mem->scanned; > + cb->fill(cb, "recent_scan_success_ratio", val); > + i = LIMIT_SCAN; > + cb->fill(cb, "limit_scan_pages", mem->scan_stat[i].nr_scanned_pages); > + cb->fill(cb, "limit_freed_pages", mem->scan_stat[i].nr_reclaimed_pages); > + cb->fill(cb, "limit_elapsed_ns", mem->scan_stat[i].elapsed_ns); > + i = SOFT_SCAN; > + cb->fill(cb, "soft_scan_pages", mem->scan_stat[i].nr_scanned_pages); > + cb->fill(cb, "soft_freed_pages", mem->scan_stat[i].nr_reclaimed_pages); > + cb->fill(cb, "soft_elapsed_ns", mem->scan_stat[i].elapsed_ns); > + i = MARGIN_SCAN; > + cb->fill(cb, "margin_scan_pages", mem->scan_stat[i].nr_scanned_pages); > + cb->fill(cb, "margin_freed_pages", mem->scan_stat[i].nr_reclaimed_pages); > + cb->fill(cb, "margin_elapsed_ns", mem->scan_stat[i].elapsed_ns); > + return 0; > +} > + > +static int mem_cgroup_reclaim_stat_reset(struct cgroup *cgrp, unsigned int event) > +{ > + struct mem_cgroup *mem = mem_cgroup_from_cont(cgrp); > + memset(mem->scan_stat, 0, sizeof(mem->scan_stat)); > + return 0; > +} > + > + > /* > * User flags for async_control is a subset of mem->async_flags. But > * this needs to be defined independently to hide implemation details. > @@ -5163,6 +5229,11 @@ static struct cftype mem_cgroup_files[] > .open = mem_control_numa_stat_open, > }, > #endif > + { > + .name = "reclaim_stat", > + .read_map = mem_cgroup_reclaim_stat_read, > + .trigger = mem_cgroup_reclaim_stat_reset, > + } > }; > > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by kanga.kvack.org (Postfix) with ESMTP id 0B9216B0011 for ; Thu, 26 May 2011 21:17:10 -0400 (EDT) Received: from hpaq7.eem.corp.google.com (hpaq7.eem.corp.google.com [172.25.149.7]) by smtp-out.google.com with ESMTP id p4R1H72f005947 for ; Thu, 26 May 2011 18:17:07 -0700 Received: from qwh5 (qwh5.prod.google.com [10.241.194.197]) by hpaq7.eem.corp.google.com with ESMTP id p4R1H57i018649 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Thu, 26 May 2011 18:17:06 -0700 Received: by qwh5 with SMTP id 5so888895qwh.34 for ; Thu, 26 May 2011 18:17:05 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20110526143631.adc2c911.kamezawa.hiroyu@jp.fujitsu.com> References: <20110526141047.dc828124.kamezawa.hiroyu@jp.fujitsu.com> <20110526143631.adc2c911.kamezawa.hiroyu@jp.fujitsu.com> Date: Thu, 26 May 2011 18:17:04 -0700 Message-ID: Subject: Re: [RFC][PATCH v3 10/10] memcg : reclaim statistics From: Ying Han Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org List-ID: To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , "nishimura@mxp.nes.nec.co.jp" , "balbir@linux.vnet.ibm.com" Hi Kame: I applied the patch on top of mmotm-2011-05-12-15-52. After boot up, i keep getting the following crash by reading the /dev/cgroup/memory/memory.reclaim_stat [ 200.776366] Kernel panic - not syncing: Fatal exception [ 200.781591] Pid: 7535, comm: cat Tainted: G D W 2.6.39-mcg-DEV #1= 30 [ 200.788463] Call Trace: [ 200.790916] [] panic+0x91/0x194 [ 200.797096] [] oops_end+0xae/0xbe [ 200.803450] [] die+0x5a/0x63 [ 200.809366] [] do_trap+0x121/0x130 [ 200.814427] [] do_divide_error+0x90/0x99 [#1] SMP [ 200.821395] [] ? mem_cgroup_reclaim_stat_read+0x28/0x= f0 [ 200.829624] [] ? page_add_new_anon_rmap+0x7e/0x90 [ 200.837372] [] ? handle_pte_fault+0x28a/0x775 [ 200.844773] [] divide_error+0x15/0x20 [ 200.851471] [] ? mem_cgroup_reclaim_stat_read+0x28/0x= f0 [ 200.859729] [] cgroup_seqfile_show+0x38/0x46 [ 200.867036] [] ? cgroup_lock+0x17/0x17 [ 200.872444] [] seq_read+0x182/0x361 [ 200.878984] [] vfs_read+0xab/0x107 [ 200.885403] [] sys_read+0x4a/0x6e [ 200.891764] [] sysenter_dispatch+0x7/0x27 I will debug it, but like to post here in case i missed some patches in bet= ween. --Ying On Wed, May 25, 2011 at 10:36 PM, KAMEZAWA Hiroyuki wrote: > > This patch adds a file memory.reclaim_stat. > > This file shows following. > =3D=3D > recent_scan_success_ratio =A012 # recent reclaim/scan ratio. > limit_scan_pages 671 =A0 =A0 =A0 =A0 =A0# scan caused by hitting limit. > limit_freed_pages 538 =A0 =A0 =A0 =A0 # freed pages by limit_scan > limit_elapsed_ns 518555076 =A0 =A0# elapsed time in LRU scanning by limit= . > soft_scan_pages 0 =A0 =A0 =A0 =A0 =A0 =A0 # scan caused by softlimit. > soft_freed_pages 0 =A0 =A0 =A0 =A0 =A0 =A0# freed pages by soft_scan. > soft_elapsed_ns 0 =A0 =A0 =A0 =A0 =A0 =A0 # elapsed time in LRU scanning = by softlimit. > margin_scan_pages 16744221 =A0 =A0# scan caused by auto-keep-margin > margin_freed_pages 565943 =A0 =A0 # freed pages by auto-keep-margin. > margin_elapsed_ns 5545388791 =A0# elapsed time in LRU scanning by auto-ke= ep-margin > > This patch adds a new file rather than adding more stats to memory.stat. = By it, > this support "reset" accounting by > > =A0# echo 0 > .../memory.reclaim_stat > > This is good for debug and tuning. > > TODO: > =A0- add Documentaion. > > Signed-off-by: KAMEZAWA Hiroyuki > --- > =A0mm/memcontrol.c | =A0 87 +++++++++++++++++++++++++++++++++++++++++++++= +++++------ > =A01 file changed, 79 insertions(+), 8 deletions(-) > > Index: memcg_async/mm/memcontrol.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- memcg_async.orig/mm/memcontrol.c > +++ memcg_async/mm/memcontrol.c > @@ -216,6 +216,13 @@ static void mem_cgroup_update_margin_to_ > =A0static void mem_cgroup_may_async_reclaim(struct mem_cgroup *mem); > =A0static void mem_cgroup_reflesh_scan_ratio(struct mem_cgroup *mem); > > +enum scan_type { > + =A0 =A0 =A0 LIMIT_SCAN, =A0 =A0 /* scan memory because memcg hits limit= */ > + =A0 =A0 =A0 SOFT_SCAN, =A0 =A0 =A0/* scan memory because of soft limit = */ > + =A0 =A0 =A0 MARGIN_SCAN, =A0 =A0/* scan memory for making margin to lim= it */ > + =A0 =A0 =A0 NR_SCAN_TYPES, > +}; > + > =A0/* > =A0* The memory controller data structure. The memory controller controls= both > =A0* page cache and RSS per cgroup. We would eventually like to provide > @@ -300,6 +307,13 @@ struct mem_cgroup { > =A0 =A0 =A0 =A0unsigned long =A0 scanned; > =A0 =A0 =A0 =A0unsigned long =A0 reclaimed; > =A0 =A0 =A0 =A0unsigned long =A0 next_scanratio_update; > + =A0 =A0 =A0 /* For statistics */ > + =A0 =A0 =A0 struct { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned long nr_scanned_pages; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned long nr_reclaimed_pages; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned long elapsed_ns; > + =A0 =A0 =A0 } scan_stat[NR_SCAN_TYPES]; > + > =A0 =A0 =A0 =A0/* > =A0 =A0 =A0 =A0 * percpu counter. > =A0 =A0 =A0 =A0 */ > @@ -1426,7 +1440,9 @@ unsigned int mem_cgroup_swappiness(struc > > =A0static void __mem_cgroup_update_scan_ratio(struct mem_cgroup *mem, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0unsigned l= ong scanned, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng reclaimed) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng reclaimed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng elapsed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 enum scan_t= ype type) > =A0{ > =A0 =A0 =A0 =A0unsigned long limit; > > @@ -1439,6 +1455,9 @@ static void __mem_cgroup_update_scan_rat > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem->scanned /=3D 2; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem->reclaimed /=3D 2; > =A0 =A0 =A0 =A0} > + =A0 =A0 =A0 mem->scan_stat[type].nr_scanned_pages +=3D scanned; > + =A0 =A0 =A0 mem->scan_stat[type].nr_reclaimed_pages +=3D reclaimed; > + =A0 =A0 =A0 mem->scan_stat[type].elapsed_ns +=3D elapsed; > =A0 =A0 =A0 =A0spin_unlock(&mem->scan_stat_lock); > =A0} > > @@ -1448,6 +1467,8 @@ static void __mem_cgroup_update_scan_rat > =A0* @root : root memcg of hierarchy walk. > =A0* @scanned : scanned pages > =A0* @reclaimed: reclaimed pages. > + * @elapsed: used time for memory reclaim > + * @type : scan type as LIMIT_SCAN, SOFT_SCAN, MARGIN_SCAN. > =A0* > =A0* record scan/reclaim ratio to the memcg both to a child and it's root > =A0* mem cgroup, which is a reclaim target. This value is used for > @@ -1457,11 +1478,14 @@ static void __mem_cgroup_update_scan_rat > =A0static void mem_cgroup_update_scan_ratio(struct mem_cgroup *mem, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct= mem_cgroup *root, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0unsigned l= ong scanned, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng reclaimed) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng reclaimed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned lo= ng elapsed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int type) > =A0{ > - =A0 =A0 =A0 __mem_cgroup_update_scan_ratio(mem, scanned, reclaimed); > + =A0 =A0 =A0 __mem_cgroup_update_scan_ratio(mem, scanned, reclaimed, ela= psed, type); > =A0 =A0 =A0 =A0if (mem !=3D root) > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 __mem_cgroup_update_scan_ratio(root, scanne= d, reclaimed); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 __mem_cgroup_update_scan_ratio(root, scanne= d, reclaimed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 elapsed, type); > > =A0} > > @@ -1906,6 +1930,7 @@ static int mem_cgroup_hierarchical_recla > =A0 =A0 =A0 =A0bool is_kswapd =3D false; > =A0 =A0 =A0 =A0unsigned long excess; > =A0 =A0 =A0 =A0unsigned long nr_scanned; > + =A0 =A0 =A0 unsigned long start, end, elapsed; > > =A0 =A0 =A0 =A0excess =3D res_counter_soft_limit_excess(&root_mem->res) >= > PAGE_SHIFT; > > @@ -1947,18 +1972,24 @@ static int mem_cgroup_hierarchical_recla > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* we use swappiness of local cgroup */ > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (check_soft) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 start =3D sched_clock(); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ret =3D mem_cgroup_shrink_= node_zone(victim, gfp_mask, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0noswap, zo= ne, &nr_scanned); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 end =3D sched_clock(); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 elapsed =3D end - start; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*total_scanned +=3D nr_sca= nned; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem_cgroup_soft_steal(vict= im, is_kswapd, ret); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem_cgroup_soft_scan(victi= m, is_kswapd, nr_scanned); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem_cgroup_update_scan_rat= io(victim, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 root_mem, nr_scanned, ret); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 root_mem, n= r_scanned, ret, elapsed, SOFT_SCAN); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} else { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 start =3D sched_clock(); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ret =3D try_to_free_mem_cg= roup_pages(victim, gfp_mask, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0noswap, &nr_scanned); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 end =3D sched_clock(); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 elapsed =3D end - start; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mem_cgroup_update_scan_rat= io(victim, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 root_mem, nr_scanned, ret); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 root_mem, n= r_scanned, ret, elapsed, LIMIT_SCAN); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0css_put(&victim->css); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* > @@ -4003,7 +4034,7 @@ static void mem_cgroup_async_shrink_work > =A0 =A0 =A0 =A0struct delayed_work *dw =3D to_delayed_work(work); > =A0 =A0 =A0 =A0struct mem_cgroup *mem, *victim; > =A0 =A0 =A0 =A0long nr_to_reclaim; > - =A0 =A0 =A0 unsigned long nr_scanned, nr_reclaimed; > + =A0 =A0 =A0 unsigned long nr_scanned, nr_reclaimed, start, end; > =A0 =A0 =A0 =A0int delay =3D 0; > > =A0 =A0 =A0 =A0mem =3D container_of(dw, struct mem_cgroup, async_work); > @@ -4022,9 +4053,12 @@ static void mem_cgroup_async_shrink_work > =A0 =A0 =A0 =A0if (!victim) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto finish_scan; > > + =A0 =A0 =A0 start =3D sched_clock(); > =A0 =A0 =A0 =A0nr_reclaimed =3D mem_cgroup_shrink_rate_limited(victim, nr= _to_reclaim, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0&nr_scanned); > - =A0 =A0 =A0 mem_cgroup_update_scan_ratio(victim, mem, nr_scanned, nr_re= claimed); > + =A0 =A0 =A0 end =3D sched_clock(); > + =A0 =A0 =A0 mem_cgroup_update_scan_ratio(victim, mem, nr_scanned, nr_re= claimed, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 end - start, MARGIN_SCAN); > =A0 =A0 =A0 =A0css_put(&victim->css); > > =A0 =A0 =A0 =A0/* If margin is enough big, stop */ > @@ -4680,6 +4714,38 @@ static int mem_control_stat_show(struct > =A0 =A0 =A0 =A0return 0; > =A0} > > +static int mem_cgroup_reclaim_stat_read(struct cgroup *cont, struct cfty= pe *cft, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct c= group_map_cb *cb) > +{ > + =A0 =A0 =A0 struct mem_cgroup *mem =3D mem_cgroup_from_cont(cont); > + =A0 =A0 =A0 u64 val; > + =A0 =A0 =A0 int i; /* for indexing scan_stat[] */ > + > + =A0 =A0 =A0 val =3D mem->reclaimed * 100 / mem->scanned; > + =A0 =A0 =A0 cb->fill(cb, "recent_scan_success_ratio", val); > + =A0 =A0 =A0 i =A0=3D LIMIT_SCAN; > + =A0 =A0 =A0 cb->fill(cb, "limit_scan_pages", mem->scan_stat[i].nr_scann= ed_pages); > + =A0 =A0 =A0 cb->fill(cb, "limit_freed_pages", mem->scan_stat[i].nr_recl= aimed_pages); > + =A0 =A0 =A0 cb->fill(cb, "limit_elapsed_ns", mem->scan_stat[i].elapsed_= ns); > + =A0 =A0 =A0 i =3D SOFT_SCAN; > + =A0 =A0 =A0 cb->fill(cb, "soft_scan_pages", mem->scan_stat[i].nr_scanne= d_pages); > + =A0 =A0 =A0 cb->fill(cb, "soft_freed_pages", mem->scan_stat[i].nr_recla= imed_pages); > + =A0 =A0 =A0 cb->fill(cb, "soft_elapsed_ns", mem->scan_stat[i].elapsed_n= s); > + =A0 =A0 =A0 i =3D MARGIN_SCAN; > + =A0 =A0 =A0 cb->fill(cb, "margin_scan_pages", mem->scan_stat[i].nr_scan= ned_pages); > + =A0 =A0 =A0 cb->fill(cb, "margin_freed_pages", mem->scan_stat[i].nr_rec= laimed_pages); > + =A0 =A0 =A0 cb->fill(cb, "margin_elapsed_ns", mem->scan_stat[i].elapsed= _ns); > + =A0 =A0 =A0 return 0; > +} > + > +static int mem_cgroup_reclaim_stat_reset(struct cgroup *cgrp, unsigned i= nt event) > +{ > + =A0 =A0 =A0 struct mem_cgroup *mem =3D mem_cgroup_from_cont(cgrp); > + =A0 =A0 =A0 memset(mem->scan_stat, 0, sizeof(mem->scan_stat)); > + =A0 =A0 =A0 return 0; > +} > + > + > =A0/* > =A0* User flags for async_control is a subset of mem->async_flags. But > =A0* this needs to be defined independently to hide implemation details. > @@ -5163,6 +5229,11 @@ static struct cftype mem_cgroup_files[] > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0.open =3D mem_control_numa_stat_open, > =A0 =A0 =A0 =A0}, > =A0#endif > + =A0 =A0 =A0 { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 .name =3D "reclaim_stat", > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 .read_map =3D mem_cgroup_reclaim_stat_read, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 .trigger =3D mem_cgroup_reclaim_stat_reset, > + =A0 =A0 =A0 } > =A0}; > > =A0#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > -- 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 internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org