Commit 0205f755 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds

mm: simplify nodemask printing

alloc_warn() and dump_header() have to explicitly handle NULL nodemask
which forces both paths to use pr_cont.  We can do better.  printk
already handles NULL pointers properly so all we need is to teach
nodemask_pr_args to handle NULL nodemask carefully.  This allows
simplification of both alloc_warn() and dump_header() and gets rid of
pr_cont altogether.

This patch has been motivated by patch from Joe Perches

[ fix tile warning, per Arnd]
Link: default avatarMichal Hocko <>
Acked-by: default avatarJoe Perches <>
Cc: Arnd Bergmann <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c50842c8
......@@ -104,7 +104,9 @@ extern nodemask_t _unused_nodemask_arg_;
* Can be used to provide arguments for '%*pb[l]' when printing a nodemask.
#define nodemask_pr_args(maskp) MAX_NUMNODES, (maskp)->bits
#define nodemask_pr_args(maskp) \
((maskp) != NULL) ? MAX_NUMNODES : 0, \
((maskp) != NULL) ? (maskp)->bits : NULL
* The inline keyword gives the compiler room to decide to inline, or
......@@ -426,14 +426,10 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask)
static void dump_header(struct oom_control *oc, struct task_struct *p)
pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=",
current->comm, oc->gfp_mask, &oc->gfp_mask);
if (oc->nodemask)
pr_cont("%*pbl", nodemask_pr_args(oc->nodemask));
pr_cont(", order=%d, oom_score_adj=%hd\n",
oc->order, current->signal->oom_score_adj);
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("COMPACTION is disabled!!!\n");
......@@ -3279,20 +3279,14 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))
pr_warn("%s: ", current->comm);
va_start(args, fmt);
vaf.fmt = fmt; = &args;
pr_cont("%pV", &vaf);
pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n",
current->comm, &vaf, gfp_mask, &gfp_mask,
pr_cont(", mode:%#x(%pGg), nodemask=", gfp_mask, &gfp_mask);
if (nodemask)
pr_cont("%*pbl\n", nodemask_pr_args(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