path: root/mm/oom_kill.c
diff options
authoryuzhoujian <>2018-12-28 00:36:10 -0800
committerLinus Torvalds <>2018-12-28 12:11:48 -0800
commitf0c867d9588d9efc10d6a55009c9560336673369 (patch)
tree98a2b274588ae76ea8ef6f4428ee71a2f0fe611f /mm/oom_kill.c
parentef8444ea01d7442652f8e1b8a8b94278cb57eafd (diff)
mm, oom: add oom victim's memcg to the oom context information
The current oom report doesn't display victim's memcg context during the global OOM situation. While this information is not strictly needed, it can be really helpful for containerized environments to locate which container has lost a process. Now that we have a single line for the oom context, we can trivially add both the oom memcg (this can be either global_oom or a specific memcg which hits its hard limits) and task_memcg which is the victim's memcg. Below is the single line output in the oom report after this patch. - global oom context information: oom-kill:constraint=<constraint>,nodemask=<nodemask>,cpuset=<cpuset>,mems_allowed=<mems_allowed>,global_oom,task_memcg=<memcg>,task=<comm>,pid=<pid>,uid=<uid> - memcg oom context information: oom-kill:constraint=<constraint>,nodemask=<nodemask>,cpuset=<cpuset>,mems_allowed=<mems_allowed>,oom_memcg=<memcg>,task_memcg=<memcg>,task=<comm>,pid=<pid>,uid=<uid> [ use pr_cont() in mem_cgroup_print_oom_context()] Link: Link: Signed-off-by: yuzhoujian <> Signed-off-by: Tetsuo Handa <> Acked-by: Michal Hocko <> Cc: David Rientjes <> Cc: "Kirill A . Shutemov" <> Cc: Andrea Arcangeli <> Cc: Tetsuo Handa <> Cc: Roman Gushchin <> Cc: Yang Shi <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/oom_kill.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d90253f1ff93..5442cb12e4ed 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -435,6 +435,7 @@ static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim)
+ mem_cgroup_print_oom_context(oc->memcg, victim);
pr_cont(",task=%s,pid=%d,uid=%d\n", victim->comm, victim->pid,
from_kuid(&init_user_ns, task_uid(victim)));
@@ -449,7 +450,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p)
if (is_memcg_oom(oc))
- mem_cgroup_print_oom_info(oc->memcg, p);
+ mem_cgroup_print_oom_meminfo(oc->memcg);
else {
show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask);
if (is_dump_unreclaim_slabs())