From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by kanga.kvack.org (Postfix) with ESMTP id AA68C6B006E for ; Tue, 13 Jan 2015 03:43:23 -0500 (EST) Received: by mail-wg0-f51.google.com with SMTP id x12so1487040wgg.10 for ; Tue, 13 Jan 2015 00:43:23 -0800 (PST) Received: from mail-we0-x236.google.com (mail-we0-x236.google.com. [2a00:1450:400c:c03::236]) by mx.google.com with ESMTPS id hh5si38094955wjb.161.2015.01.13.00.43.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Jan 2015 00:43:23 -0800 (PST) Received: by mail-we0-f182.google.com with SMTP id w62so1455004wes.13 for ; Tue, 13 Jan 2015 00:43:23 -0800 (PST) Date: Tue, 13 Jan 2015 09:43:20 +0100 From: Michal Hocko Subject: Re: [PATCH] memcg: remove extra newlines from memcg oom kill log Message-ID: <20150113084320.GC25318@dhcp22.suse.cz> References: <1421131539-3211-1-git-send-email-gthelen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1421131539-3211-1-git-send-email-gthelen@google.com> Sender: owner-linux-mm@kvack.org List-ID: To: Greg Thelen Cc: Andrew Morton , Johannes Weiner , Tejun Heo , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org On Mon 12-01-15 22:45:39, Greg Thelen wrote: > Commit e61734c55c24 ("cgroup: remove cgroup->name") added two extra > newlines to memcg oom kill log messages. This makes dmesg hard to read > and parse. The issue affects 3.15+. > Example: > Task in /t <<< extra #1 > killed as a result of limit of /t > <<< extra #2 > memory: usage 102400kB, limit 102400kB, failcnt 274712 > > Remove the extra newlines from memcg oom kill messages, so the messages > look like: > Task in /t killed as a result of limit of /t > memory: usage 102400kB, limit 102400kB, failcnt 240649 > > Fixes: e61734c55c24 ("cgroup: remove cgroup->name") > Signed-off-by: Greg Thelen Acked-by: Michal Hocko > --- > mm/memcontrol.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 851924fa5170..683b4782019b 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1477,9 +1477,9 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) > > pr_info("Task in "); > pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id)); > - pr_info(" killed as a result of limit of "); > + pr_cont(" killed as a result of limit of "); > pr_cont_cgroup_path(memcg->css.cgroup); > - pr_info("\n"); > + pr_cont("\n"); > > rcu_read_unlock(); > > -- > 2.2.0.rc0.207.ga3a616c > -- 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