Commit 299c517a authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds

mm, oom: header nodemask is NULL when cpusets are disabled

Commit 82e7d3ab ("oom: print nodemask in the oom report") implicitly
sets the allocation nodemask to cpuset_current_mems_allowed when there
is no effective mempolicy.  cpuset_current_mems_allowed is only
effective when cpusets are enabled, which is also printed by
dump_header(), so setting the nodemask to cpuset_current_mems_allowed is
redundant and prevents debugging issues where ac->nodemask is not set
properly in the page allocator.

This provides better debugging output since
cpuset_print_current_mems_allowed() is already provided.

[rientjes@google.com: newline per Hillf]
  Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1701200158300.88321@chino.kir.corp.google.com
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1701191454470.2381@chino.kir.corp.google.comSigned-off-by: default avatarDavid Rientjes <rientjes@google.com>
Suggested-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarHillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e86c59b1
...@@ -403,12 +403,14 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask) ...@@ -403,12 +403,14 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask)
static void dump_header(struct oom_control *oc, struct task_struct *p) static void dump_header(struct oom_control *oc, struct task_struct *p)
{ {
nodemask_t *nm = (oc->nodemask) ? oc->nodemask : &cpuset_current_mems_allowed; pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=",
current->comm, oc->gfp_mask, &oc->gfp_mask);
pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=%*pbl, order=%d, oom_score_adj=%hd\n", if (oc->nodemask)
current->comm, oc->gfp_mask, &oc->gfp_mask, pr_cont("%*pbl", nodemask_pr_args(oc->nodemask));
nodemask_pr_args(nm), oc->order, else
current->signal->oom_score_adj); pr_cont("(null)");
pr_cont(", order=%d, oom_score_adj=%hd\n",
oc->order, current->signal->oom_score_adj);
if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order) if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order)
pr_warn("COMPACTION is disabled!!!\n"); pr_warn("COMPACTION is disabled!!!\n");
...@@ -417,7 +419,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) ...@@ -417,7 +419,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p)
if (oc->memcg) if (oc->memcg)
mem_cgroup_print_oom_info(oc->memcg, p); mem_cgroup_print_oom_info(oc->memcg, p);
else else
show_mem(SHOW_MEM_FILTER_NODES, nm); show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask);
if (sysctl_oom_dump_tasks) if (sysctl_oom_dump_tasks)
dump_tasks(oc->memcg, oc->nodemask); dump_tasks(oc->memcg, oc->nodemask);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment