On Wed 19-12-18 16:23:39, Tetsuo Handa wrote:
> Andrew, will you fold below diff into "mm, oom: add oom victim's memcg to the oom context information" ?
>
> >From add1e8daddbfc5186417dbc58e9e11e7614868f8 Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
> Date: Wed, 19 Dec 2018 16:09:31 +0900
> Subject: [PATCH] mm, oom: Use pr_cont() in mem_cgroup_print_oom_context().
>
> One line summary of the OOM killer context is not one line due to
> not using KERN_CONT.
>
> [ 23.346650] oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0
> [ 23.346691] ,global_oom,task_memcg=/,task=firewalld,pid=5096,uid=0
>
> Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Sorry, I have missed that during review. Thanks for catching this up!
> ---
> mm/memcontrol.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index b860dd4f7..4afd597 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -1306,10 +1306,10 @@ void mem_cgroup_print_oom_context(struct mem_cgroup *memcg, struct task_struct *
> rcu_read_lock();
>
> if (memcg) {
> - pr_info(",oom_memcg=");
> + pr_cont(",oom_memcg=");
> pr_cont_cgroup_path(memcg->css.cgroup);
> } else
> - pr_info(",global_oom");
> + pr_cont(",global_oom");
> if (p) {
> pr_cont(",task_memcg=");
> pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id));
> --
> 1.8.3.1
--
Michal Hocko
SUSE Labs
