From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx168.postini.com [74.125.245.168]) by kanga.kvack.org (Postfix) with SMTP id 4F1BE6B0071 for ; Wed, 4 Jul 2012 04:25:50 -0400 (EDT) Received: by pbbrp2 with SMTP id rp2so12960482pbb.14 for ; Wed, 04 Jul 2012 01:25:49 -0700 (PDT) Message-ID: <4FF3FE08.3090302@gmail.com> Date: Wed, 04 Jul 2012 16:25:44 +0800 From: Sha Zhengju MIME-Version: 1.0 Subject: Re: [PATCH 7/7] memcg: print more detailed info while memcg oom happening References: <1340880885-5427-1-git-send-email-handai.szj@taobao.com> <1340881609-5935-1-git-send-email-handai.szj@taobao.com> In-Reply-To: <1340881609-5935-1-git-send-email-handai.szj@taobao.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: kamezawa.hiroyu@jp.fujitsu.com, gthelen@google.com, yinghan@google.com, akpm@linux-foundation.org, mhocko@suse.cz, linux-kernel@vger.kernel.org, Sha Zhengju Hi, Kame How about this biti 1/4 ? :-) On 06/28/2012 07:06 PM, Sha Zhengju wrote: > From: Sha Zhengju > > While memcg oom happening, the dump info is limited, so add this > to provide memcg page stat. > > Signed-off-by: Sha Zhengju > --- > mm/memcontrol.c | 42 ++++++++++++++++++++++++++++++++++-------- > 1 files changed, 34 insertions(+), 8 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 8493119..3ed41e9 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -101,6 +101,14 @@ static const char * const mem_cgroup_events_names[] = { > "pgmajfault", > }; > > +static const char * const mem_cgroup_lru_names[] = { > + "inactive_anon", > + "active_anon", > + "inactive_file", > + "active_file", > + "unevictable", > +}; > + > /* > * Per memcg event counter is incremented at every pagein/pageout. With THP, > * it will be incremated by the number of pages. This counter is used for > @@ -1358,6 +1366,30 @@ static void move_unlock_mem_cgroup(struct mem_cgroup *memcg, > spin_unlock_irqrestore(&memcg->move_lock, *flags); > } > > +#define K(x) ((x)<< (PAGE_SHIFT-10)) > +static void mem_cgroup_print_oom_stat(struct mem_cgroup *memcg) > +{ > + int i; > + > + printk(KERN_INFO "Memory cgroup stat:\n"); > + for (i = 0; i< MEM_CGROUP_STAT_NSTATS; i++) { > + if (i == MEM_CGROUP_STAT_SWAP&& !do_swap_account) > + continue; > + printk(KERN_CONT "%s:%ldKB ", mem_cgroup_stat_names[i], > + K(mem_cgroup_read_stat(memcg, i))); > + } > + > + for (i = 0; i< MEM_CGROUP_EVENTS_NSTATS; i++) > + printk(KERN_CONT "%s:%lu ", mem_cgroup_events_names[i], > + mem_cgroup_read_events(memcg, i)); > + > + for (i = 0; i< NR_LRU_LISTS; i++) > + printk(KERN_CONT "%s:%luKB ", mem_cgroup_lru_names[i], > + K(mem_cgroup_nr_lru_pages(memcg, BIT(i)))); > + printk(KERN_CONT "\n"); > + > +} > + > /** > * mem_cgroup_print_oom_info: Called from OOM with tasklist_lock held in read mode. > * @memcg: The memory cgroup that went over limit > @@ -1422,6 +1454,8 @@ done: > res_counter_read_u64(&memcg->memsw, RES_USAGE)>> 10, > res_counter_read_u64(&memcg->memsw, RES_LIMIT)>> 10, > res_counter_read_u64(&memcg->memsw, RES_FAILCNT)); > + > + mem_cgroup_print_oom_stat(memcg); > } > > /* > @@ -4043,14 +4077,6 @@ static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft, > } > #endif /* CONFIG_NUMA */ > > -static const char * const mem_cgroup_lru_names[] = { > - "inactive_anon", > - "active_anon", > - "inactive_file", > - "active_file", > - "unevictable", > -}; > - > static inline void mem_cgroup_lru_names_not_uptodate(void) > { > BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); -- 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/ . Don't email: email@kvack.org