From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx117.postini.com [74.125.245.117]) by kanga.kvack.org (Postfix) with SMTP id 19BF26B006C for ; Thu, 20 Dec 2012 08:15:35 -0500 (EST) Received: by mail-ea0-f173.google.com with SMTP id i13so1319134eaa.4 for ; Thu, 20 Dec 2012 05:15:33 -0800 (PST) Date: Thu, 20 Dec 2012 14:15:31 +0100 From: Michal Hocko Subject: Re: [PATCH V5] memcg, oom: provide more precise dump info while memcg oom happening Message-ID: <20121220131531.GB31912@dhcp22.suse.cz> References: <1355925061-3858-1-git-send-email-handai.szj@taobao.com> <20121219141218.c1bb423b.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121219141218.c1bb423b.akpm@linux-foundation.org> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Sha Zhengju , cgroups@vger.kernel.org, kamezawa.hiroyu@jp.fujitsu.com, rientjes@google.com, linux-mm@kvack.org, Sha Zhengju On Wed 19-12-12 14:12:18, Andrew Morton wrote: > On Wed, 19 Dec 2012 21:51:01 +0800 > Sha Zhengju wrote: > > > + pr_info("Memory cgroup stats"); > > Well if we're going to do that, we may as well finish the job: > > > From: Andrew Morton > Subject: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo() > > Cc: Sha Zhengju > Cc: Michal Hocko > Cc: KAMEZAWA Hiroyuki > Cc: David Rientjes > Signed-off-by: Andrew Morton Thanks Andrew! Acked-by: Michal Hocko > --- > > mm/memcontrol.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff -puN mm/memcontrol.c~mm-memcontrolc-convert-printkkern_foo-to-pr_foo mm/memcontrol.c > --- a/mm/memcontrol.c~mm-memcontrolc-convert-printkkern_foo-to-pr_foo > +++ a/mm/memcontrol.c > @@ -1574,7 +1574,7 @@ void mem_cgroup_print_oom_info(struct me > } > rcu_read_unlock(); > > - printk(KERN_INFO "Task in %s killed", memcg_name); > + pr_info("Task in %s killed", memcg_name); > > rcu_read_lock(); > ret = cgroup_path(mem_cgrp, memcg_name, PATH_MAX); > @@ -1587,19 +1587,18 @@ void mem_cgroup_print_oom_info(struct me > /* > * Continues from above, so we don't need an KERN_ level > */ > - printk(KERN_CONT " as a result of limit of %s\n", memcg_name); > + pr_cont(" as a result of limit of %s\n", memcg_name); > done: > > - printk(KERN_INFO "memory: usage %llukB, limit %llukB, failcnt %llu\n", > + pr_info("memory: usage %llukB, limit %llukB, failcnt %llu\n", > res_counter_read_u64(&memcg->res, RES_USAGE) >> 10, > res_counter_read_u64(&memcg->res, RES_LIMIT) >> 10, > res_counter_read_u64(&memcg->res, RES_FAILCNT)); > - printk(KERN_INFO "memory+swap: usage %llukB, limit %llukB, " > - "failcnt %llu\n", > + pr_info("memory+swap: usage %llukB, limit %llukB, failcnt %llu\n", > 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)); > - printk(KERN_INFO "kmem: usage %llukB, limit %llukB, failcnt %llu\n", > + pr_info("kmem: usage %llukB, limit %llukB, failcnt %llu\n", > res_counter_read_u64(&memcg->kmem, RES_USAGE) >> 10, > res_counter_read_u64(&memcg->kmem, RES_LIMIT) >> 10, > res_counter_read_u64(&memcg->kmem, RES_FAILCNT)); > @@ -4424,8 +4423,8 @@ void mem_cgroup_print_bad_page(struct pa > > pc = lookup_page_cgroup_used(page); > if (pc) { > - printk(KERN_ALERT "pc:%p pc->flags:%lx pc->mem_cgroup:%p\n", > - pc, pc->flags, pc->mem_cgroup); > + pr_alert("pc:%p pc->flags:%lx pc->mem_cgroup:%p\n", > + pc, pc->flags, pc->mem_cgroup); > } > } > #endif > _ > -- Michal Hocko SUSE Labs -- 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