From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752430AbdKIPtM (ORCPT ); Thu, 9 Nov 2017 10:49:12 -0500 Received: from smtprelay0235.hostedemail.com ([216.40.44.235]:51374 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750777AbdKIPtL (ORCPT ); Thu, 9 Nov 2017 10:49:11 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,joe@perches.com,:::::,RULES_HIT:2:41:355:379:541:599:800:960:967:973:988:989:1260:1263:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1535:1593:1594:1605:1606:1730:1747:1777:1792:2110:2198:2199:2393:2525:2553:2560:2563:2682:2685:2691:2693:2731:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3622:3865:3866:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4250:4321:4362:4560:4605:5007:6119:7576:7903:7904:8784:9025:9040:9545:10848:10967:11026:11232:11257:11473:11658:11914:12043:12296:12438:12555:12740:12760:12783:12895:12986:13138:13231:13439:13846:14659:21080:21434:21451:21627:30034:30054:30056:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:1:0,LFtime:9,LUA_SUMMARY:none X-HE-Tag: can70_4fe33dac8bd61 X-Filterd-Recvd-Size: 6169 Message-ID: <1510242547.15768.62.camel@perches.com> Subject: Re: [PATCH] mm/page_alloc: Avoid KERN_CONT uses in warn_alloc From: Joe Perches To: Michal Hocko Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Date: Thu, 09 Nov 2017 07:49:07 -0800 In-Reply-To: <20171109100531.3cn2hcqnuj7mjaju@dhcp22.suse.cz> References: <20171107125055.cl5pyp2zwon44x5l@dhcp22.suse.cz> <1510068865.1000.19.camel@perches.com> <20171107154351.ebtitvjyo5v3bt26@dhcp22.suse.cz> <1510070607.1000.23.camel@perches.com> <20171109100531.3cn2hcqnuj7mjaju@dhcp22.suse.cz> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.26.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2017-11-09 at 11:05 +0100, Michal Hocko wrote: > On Tue 07-11-17 08:03:27, Joe Perches wrote: > > On Tue, 2017-11-07 at 16:43 +0100, Michal Hocko wrote: > > > On Tue 07-11-17 07:34:25, Joe Perches wrote: > > > > [] > > > > I believe, but have not tested, that using a specific width > > > > as an argument to %*pb[l] will constrain the number of > > > > spaces before the '(null)' output in any NULL pointer use. > > > > > > > > So how about a #define like > > > > > > > > /* > > > > * nodemask_pr_args is only used with a "%*pb[l]" format for a nodemask. > > > > * A NULL nodemask uses 6 to emit "(null)" without leading spaces. > > > > */ > > > > #define nodemask_pr_args(maskp) \ > > > > (maskp) ? MAX_NUMNODES : 6, \ > > > > (maskp) ? (maskp)->bits : NULL > > > > > > Why not -1 then? > > > > I believe it's the field width and not the precision that > > needs to be set. > > But the first of the two arguments is the field with specifier, not the > precision. /me confused... > > Anyway, the following works as expected when printing the OOM report: > [ 47.005321] mem_eater invoked oom-killer: gfp_mask=0x14280ca(GFP_HIGHUSER_MOVABLE|__GFP_ZERO), nodemask=(null), order=0, oom_score_adj=0 > [ 47.007183] mem_eater cpuset=/ mems_allowed=0-1 > [ 47.007829] CPU: 3 PID: 3223 Comm: mem_eater Tainted: G W 4.13.0-pr1-dirty #11 > > I hope I haven't overlooked anything Hey Michal. Seems right. The bit I overlooked was that the field width is overridden if the output is longer so 0 works perfectly well. Thanks. If it's useful, Acked-by: Joe Perches cheers, Joe > --- > From 35aa7742d35d29af88c66dd5e6f8f5d62215f5fd Mon Sep 17 00:00:00 2001 > From: Michal Hocko > Date: Thu, 9 Nov 2017 10:58:41 +0100 > Subject: [PATCH] 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 what we need is to teach > nodemask_pr_args to handle NULL nodemask carefully. This allows > simplification of both alloc_warn and dump_header and get rid of pr_cont > altogether. > > This patch has been motivated by patch from Joe Perches > http://lkml.kernel.org/r/b31236dfe3fc924054fd7842bde678e71d193638.1509991345.git.joe@perches.com > > Signed-off-by: Michal Hocko > --- > include/linux/nodemask.h | 2 +- > mm/oom_kill.c | 12 ++++-------- > mm/page_alloc.c | 12 +++--------- > 3 files changed, 8 insertions(+), 18 deletions(-) > > diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h > index cf0b91c3ec12..5d3cc67207ed 100644 > --- a/include/linux/nodemask.h > +++ b/include/linux/nodemask.h > @@ -103,7 +103,7 @@ 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) ? MAX_NUMNODES : 0, (maskp) ? (maskp)->bits : NULL > > /* > * The inline keyword gives the compiler room to decide to inline, or > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 8dd0e088189b..606213a81ceb 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -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)); > - else > - pr_cont("(null)"); > - 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, > + current->signal->oom_score_adj); > if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order) > pr_warn("COMPACTION is disabled!!!\n"); > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index d755434aee94..457e43ed4c10 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -3281,20 +3281,14 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...) > if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs)) > return; > > - pr_warn("%s: ", current->comm); > - > va_start(args, fmt); > vaf.fmt = fmt; > vaf.va = &args; > - pr_cont("%pV", &vaf); > + pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n", > + current->comm, &vaf, gfp_mask, &gfp_mask, > + nodemask_pr_args(nodemask)); > va_end(args); > > - pr_cont(", mode:%#x(%pGg), nodemask=", gfp_mask, &gfp_mask); > - if (nodemask) > - pr_cont("%*pbl\n", nodemask_pr_args(nodemask)); > - else > - pr_cont("(null)\n"); > - > cpuset_print_current_mems_allowed(); > > dump_stack(); > -- > 2.14.2 >