| From 0346dadbf041a2606bcb5bd27828b0d105897f4a Mon Sep 17 00:00:00 2001 |
| From: Greg Thelen <gthelen@google.com> |
| Date: Mon, 26 Jan 2015 12:58:38 -0800 |
| Subject: memcg: remove extra newlines from memcg oom kill log |
| |
| From: Greg Thelen <gthelen@google.com> |
| |
| commit 0346dadbf041a2606bcb5bd27828b0d105897f4a upstream. |
| |
| 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@google.com> |
| Acked-by: Michal Hocko <mhocko@suse.cz> |
| Acked-by: Johannes Weiner <hannes@cmpxchg.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| mm/memcontrol.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/mm/memcontrol.c |
| +++ b/mm/memcontrol.c |
| @@ -1638,9 +1638,9 @@ void mem_cgroup_print_oom_info(struct me |
| |
| 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(); |
| |
