The patch titled
Subject: mm, oom: reorganize the oom report in dump_header
has been removed from the -mm tree. Its filename was
reorganize-the-oom-report-in-dump_header.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: yuzhoujian <yuzhoujian@xxxxxxxxxxxxxxx>
Subject: mm, oom: reorganize the oom report in dump_header
OOM report contains several sections. The first one is the allocation
context that has triggered the OOM. Then we have cpuset context followed
by the stack trace of the OOM path. Followed by the oom eligible tasks
and the information about the chosen oom victim.
One thing that makes parsing more awkward than necessary is that we do not
have a single and easily parsable line about the oom context. This patch
is reorganizing the oom report to
1) who invoked oom and what was the allocation request
[ 131.751307] panic invoked oom-killer: gfp_mask=0x6280ca(GFP_HIGHUSER_MOVABLE|__GFP_ZERO), order=0, oom_score_adj=0
2) OOM stack trace
[ 131.752399] CPU: 16 PID: 8581 Comm: panic Not tainted 4.18.0-rc5+ #48
[ 131.753154] Hardware name: Inspur SA5212M4/YZMB-00370-107, BIOS 4.1.10 11/14/2016
[ 131.753806] Call Trace:
[ 131.754473] dump_stack+0x5a/0x73
[ 131.755129] dump_header+0x53/0x2dc
[ 131.755775] oom_kill_process+0x228/0x420
[ 131.756430] ? oom_badness+0x2a/0x130
[ 131.757063] out_of_memory+0x11a/0x4a0
[ 131.757710] __alloc_pages_slowpath+0x7cc/0xa1e
[ 131.758392] ? apic_timer_interrupt+0xa/0x20
[ 131.759040] __alloc_pages_nodemask+0x277/0x290
[ 131.759710] alloc_pages_vma+0x73/0x180
[ 131.760388] do_anonymous_page+0xed/0x5a0
[ 131.761067] __handle_mm_fault+0xbb3/0xe70
[ 131.761749] handle_mm_fault+0xfa/0x210
[ 131.762457] __do_page_fault+0x233/0x4c0
[ 131.763136] do_page_fault+0x32/0x140
[ 131.763832] ? page_fault+0x8/0x30
[ 131.764523] page_fault+0x1e/0x30
3) oom context (contrains and the chosen victim).
[ 131.771164] oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0-1,task=panic,pid=8608,uid=0
An admin can easily get the full oom context at a single line which makes
parsing much easier.
Link: http://lkml.kernel.org/r/1531825548-27761-1-git-send-email-ufo19890607@xxxxxxxxx
Signed-off-by: yuzhoujian <yuzhoujian@xxxxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Yang Shi <yang.s@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN include/linux/oom.h~reorganize-the-oom-report-in-dump_header include/linux/oom.h
--- a/include/linux/oom.h~reorganize-the-oom-report-in-dump_header
+++ a/include/linux/oom.h
@@ -15,6 +15,13 @@ struct notifier_block;
struct mem_cgroup;
struct task_struct;
+enum oom_constraint {
+ CONSTRAINT_NONE,
+ CONSTRAINT_CPUSET,
+ CONSTRAINT_MEMORY_POLICY,
+ CONSTRAINT_MEMCG,
+};
+
/*
* Details of the page allocation that triggered the oom killer that are used to
* determine what should be killed.
@@ -42,6 +49,9 @@ struct oom_control {
unsigned long totalpages;
struct task_struct *chosen;
unsigned long chosen_points;
+
+ /* Used to print the constraint info. */
+ enum oom_constraint constraint;
};
extern struct mutex oom_lock;
diff -puN kernel/cgroup/cpuset.c~reorganize-the-oom-report-in-dump_header kernel/cgroup/cpuset.c
--- a/kernel/cgroup/cpuset.c~reorganize-the-oom-report-in-dump_header
+++ a/kernel/cgroup/cpuset.c
@@ -2666,9 +2666,9 @@ void cpuset_print_current_mems_allowed(v
rcu_read_lock();
cgrp = task_cs(current)->css.cgroup;
- pr_info("%s cpuset=", current->comm);
+ pr_cont(",cpuset=");
pr_cont_cgroup_name(cgrp);
- pr_cont(" mems_allowed=%*pbl\n",
+ pr_cont(",mems_allowed=%*pbl",
nodemask_pr_args(¤t->mems_allowed));
rcu_read_unlock();
diff -puN mm/oom_kill.c~reorganize-the-oom-report-in-dump_header mm/oom_kill.c
--- a/mm/oom_kill.c~reorganize-the-oom-report-in-dump_header
+++ a/mm/oom_kill.c
@@ -245,11 +245,11 @@ unsigned long oom_badness(struct task_st
return points > 0 ? points : 1;
}
-enum oom_constraint {
- CONSTRAINT_NONE,
- CONSTRAINT_CPUSET,
- CONSTRAINT_MEMORY_POLICY,
- CONSTRAINT_MEMCG,
+static const char * const oom_constraint_text[] = {
+ [CONSTRAINT_NONE] = "CONSTRAINT_NONE",
+ [CONSTRAINT_CPUSET] = "CONSTRAINT_CPUSET",
+ [CONSTRAINT_MEMORY_POLICY] = "CONSTRAINT_MEMORY_POLICY",
+ [CONSTRAINT_MEMCG] = "CONSTRAINT_MEMCG",
};
/*
@@ -429,15 +429,21 @@ static void dump_tasks(struct mem_cgroup
static void dump_header(struct oom_control *oc, struct task_struct *p)
{
- pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=%*pbl, order=%d, oom_score_adj=%hd\n",
- current->comm, oc->gfp_mask, &oc->gfp_mask,
- nodemask_pr_args(oc->nodemask), oc->order,
+ pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), order=%d, oom_score_adj=%hd\n",
+ current->comm, oc->gfp_mask, &oc->gfp_mask, oc->order,
current->signal->oom_score_adj);
if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order)
pr_warn("COMPACTION is disabled!!!\n");
- cpuset_print_current_mems_allowed();
dump_stack();
+
+ /* one line summary of the oom killer context. */
+ pr_info("oom-kill:constraint=%s,nodemask=%*pbl",
+ oom_constraint_text[oc->constraint],
+ nodemask_pr_args(oc->nodemask));
+ cpuset_print_current_mems_allowed();
+ pr_cont(",task=%s,pid=%d,uid=%d\n", p->comm, p->pid,
+ from_kuid(&init_user_ns, task_uid(p)));
if (is_memcg_oom(oc))
mem_cgroup_print_oom_info(oc->memcg, p);
else {
@@ -981,8 +987,7 @@ static void oom_kill_process(struct oom_
/*
* Determines whether the kernel must panic because of the panic_on_oom sysctl.
*/
-static void check_panic_on_oom(struct oom_control *oc,
- enum oom_constraint constraint)
+static void check_panic_on_oom(struct oom_control *oc)
{
if (likely(!sysctl_panic_on_oom))
return;
@@ -992,7 +997,7 @@ static void check_panic_on_oom(struct oo
* does not panic for cpuset, mempolicy, or memcg allocation
* failures.
*/
- if (constraint != CONSTRAINT_NONE)
+ if (oc->constraint != CONSTRAINT_NONE)
return;
}
/* Do not panic for oom kills triggered by sysrq */
@@ -1029,8 +1034,8 @@ EXPORT_SYMBOL_GPL(unregister_oom_notifie
bool out_of_memory(struct oom_control *oc)
{
unsigned long freed = 0;
- enum oom_constraint constraint = CONSTRAINT_NONE;
+ oc->constraint = CONSTRAINT_NONE;
if (oom_killer_disabled)
return false;
@@ -1065,10 +1070,10 @@ bool out_of_memory(struct oom_control *o
* Check if there were limitations on the allocation (only relevant for
* NUMA and memcg) that may require different handling.
*/
- constraint = constrained_alloc(oc);
- if (constraint != CONSTRAINT_MEMORY_POLICY)
+ oc->constraint = constrained_alloc(oc);
+ if (oc->constraint != CONSTRAINT_MEMORY_POLICY)
oc->nodemask = NULL;
- check_panic_on_oom(oc, constraint);
+ check_panic_on_oom(oc);
if (!is_memcg_oom(oc) && sysctl_oom_kill_allocating_task &&
current->mm && !oom_unkillable_task(current, NULL, oc->nodemask) &&
diff -puN mm/page_alloc.c~reorganize-the-oom-report-in-dump_header mm/page_alloc.c
--- a/mm/page_alloc.c~reorganize-the-oom-report-in-dump_header
+++ a/mm/page_alloc.c
@@ -3416,13 +3416,13 @@ void warn_alloc(gfp_t gfp_mask, nodemask
va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args;
- pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n",
+ pr_warn("%s: %pV,mode:%#x(%pGg),nodemask=%*pbl",
current->comm, &vaf, gfp_mask, &gfp_mask,
nodemask_pr_args(nodemask));
va_end(args);
cpuset_print_current_mems_allowed();
-
+ pr_cont("\n");
dump_stack();
warn_alloc_show_mem(gfp_mask, nodemask);
}
_
Patches currently in -mm which might be from yuzhoujian@xxxxxxxxxxxxxxx are
add-oom-victims-memcg-to-the-oom-context-information.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
