Re: [PATCH] memcg: remove extra newlines from memcg oom kill log

From: Michal Hocko
Date: Tue Jan 13 2015 - 03:43:28 EST


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 <gthelen@xxxxxxxxxx>

Acked-by: Michal Hocko <mhocko@xxxxxxx>

> ---
> 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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/