From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752113AbeEKQ3g (ORCPT ); Fri, 11 May 2018 12:29:36 -0400 Received: from smtprelay0180.hostedemail.com ([216.40.44.180]:54468 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750950AbeEKQ3f (ORCPT ); Fri, 11 May 2018 12:29:35 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:69:355:379:541:599:800:960:967:968:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1535:1544:1593:1594:1605:1711:1730:1747:1777:1792:2194:2199:2393:2525:2559:2563:2682:2685:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3622:3865:3866:3867:3868:3870:3871:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:5007:6119:7903:9025:10004:10848:11026:11232:11473:11658:11914:12043:12296:12438:12555:12683:12740:12760:12895:12986:13255:13439:14096:14097:14181:14659:14721:21080:21220:21451:21611:21627:30054:30056:30070:30091,0,RBL:47.151.150.235:@perches.com:.lbl8.mailshell.net-62.14.0.100 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:21,LUA_SUMMARY:none X-HE-Tag: shop83_19252e08b3f1a X-Filterd-Recvd-Size: 5621 Message-ID: <60269865c424b9fa853e22c68c0376a60bfbb171.camel@perches.com> Subject: Re: [resend PATCH] rxrpc: Neaten logging macros and add KERN_DEBUG logging level From: Joe Perches To: David Howells Cc: "David S. Miller" , linux-afs@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 11 May 2018 09:29:31 -0700 In-Reply-To: <35831b4769a0415ae7b975e88badb3033dbfe82d.1522176274.git.joe@perches.com> References: <35831b4769a0415ae7b975e88badb3033dbfe82d.1522176274.git.joe@perches.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.28.1-2 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 Tue, 2018-03-27 at 11:52 -0700, Joe Perches wrote: > When enabled, the current debug logging does not have a KERN_. > Add KERN_DEBUG to the logging macros. > > Miscellanea: > > o Remove #define redundancy and neaten the macros a bit ping? > Signed-off-by: Joe Perches > --- > > Resend of patch: https://lkml.org/lkml/2017/11/30/573 > > No change in patch. > > David Howells is now a listed maintainer for net/rxrpc/ so he should receive > this patch via get_maintainer > > net/rxrpc/ar-internal.h | 75 ++++++++++++++++++------------------------------- > 1 file changed, 28 insertions(+), 47 deletions(-) > > diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h > index 416688381eb7..d4b53b2339b3 100644 > --- a/net/rxrpc/ar-internal.h > +++ b/net/rxrpc/ar-internal.h > @@ -1147,66 +1147,47 @@ static inline bool after_eq(u32 seq1, u32 seq2) > */ > extern unsigned int rxrpc_debug; > > -#define dbgprintk(FMT,...) \ > - printk("[%-6.6s] "FMT"\n", current->comm ,##__VA_ARGS__) > +#if defined(__KDEBUG) || defined(CONFIG_AF_RXRPC_DEBUG) > +#define dbgprintk(fmt, ...) \ > + printk(KERN_DEBUG "[%-6.6s] " fmt "\n", current->comm, ##__VA_ARGS__) > +#else > +#define dbgprintk(fmt, ...) \ > + no_printk(KERN_DEBUG "[%-6.6s] " fmt "\n", current->comm, ##__VA_ARGS__) > +#endif > > -#define kenter(FMT,...) dbgprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__) > -#define kleave(FMT,...) dbgprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__) > -#define kdebug(FMT,...) dbgprintk(" "FMT ,##__VA_ARGS__) > -#define kproto(FMT,...) dbgprintk("### "FMT ,##__VA_ARGS__) > -#define knet(FMT,...) dbgprintk("@@@ "FMT ,##__VA_ARGS__) > +#define kenter(fmt, ...) dbgprintk("==> %s(" fmt ")", __func__, ##__VA_ARGS__) > +#define kleave(fmt, ...) dbgprintk("<== %s()" fmt "", __func__, ##__VA_ARGS__) > +#define kdebug(fmt, ...) dbgprintk(" " fmt, ##__VA_ARGS__) > +#define kproto(fmt, ...) dbgprintk("### " fmt, ##__VA_ARGS__) > +#define knet(fmt, ...) dbgprintk("@@@ " fmt, ##__VA_ARGS__) > > +#if defined(__KDEBUG) || !defined(CONFIG_AF_RXRPC_DEBUG) > +#define _enter(fmt, ...) kenter(fmt, ##__VA_ARGS__) > +#define _leave(fmt, ...) kleave(fmt, ##__VA_ARGS__) > +#define _debug(fmt, ...) kdebug(fmt, ##__VA_ARGS__) > +#define _proto(fmt, ...) kproto(fmt, ##__VA_ARGS__) > +#define _net(fmt, ...) knet(fmt, ##__VA_ARGS__) > > -#if defined(__KDEBUG) > -#define _enter(FMT,...) kenter(FMT,##__VA_ARGS__) > -#define _leave(FMT,...) kleave(FMT,##__VA_ARGS__) > -#define _debug(FMT,...) kdebug(FMT,##__VA_ARGS__) > -#define _proto(FMT,...) kproto(FMT,##__VA_ARGS__) > -#define _net(FMT,...) knet(FMT,##__VA_ARGS__) > +#else > > -#elif defined(CONFIG_AF_RXRPC_DEBUG) > #define RXRPC_DEBUG_KENTER 0x01 > #define RXRPC_DEBUG_KLEAVE 0x02 > #define RXRPC_DEBUG_KDEBUG 0x04 > #define RXRPC_DEBUG_KPROTO 0x08 > #define RXRPC_DEBUG_KNET 0x10 > > -#define _enter(FMT,...) \ > -do { \ > - if (unlikely(rxrpc_debug & RXRPC_DEBUG_KENTER)) \ > - kenter(FMT,##__VA_ARGS__); \ > -} while (0) > - > -#define _leave(FMT,...) \ > -do { \ > - if (unlikely(rxrpc_debug & RXRPC_DEBUG_KLEAVE)) \ > - kleave(FMT,##__VA_ARGS__); \ > -} while (0) > - > -#define _debug(FMT,...) \ > -do { \ > - if (unlikely(rxrpc_debug & RXRPC_DEBUG_KDEBUG)) \ > - kdebug(FMT,##__VA_ARGS__); \ > -} while (0) > - > -#define _proto(FMT,...) \ > -do { \ > - if (unlikely(rxrpc_debug & RXRPC_DEBUG_KPROTO)) \ > - kproto(FMT,##__VA_ARGS__); \ > +#define RXRPC_DEBUG(TYPE, type, fmt, ...) \ > +do { \ > + if (unlikely(rxrpc_debug & RXRPC_DEBUG_##TYPE)) \ > + type(fmt, ##__VA_ARGS__); \ > } while (0) > > -#define _net(FMT,...) \ > -do { \ > - if (unlikely(rxrpc_debug & RXRPC_DEBUG_KNET)) \ > - knet(FMT,##__VA_ARGS__); \ > -} while (0) > +#define _enter(fmt, ...) RXRPC_DEBUG(KENTER, kenter, fmt, ##__VA_ARGS__) > +#define _leave(fmt, ...) RXRPC_DEBUG(KLEAVE, kleave, fmt, ##__VA_ARGS__) > +#define _debug(fmt, ...) RXRPC_DEBUG(KDEBUG, kdebug, fmt, ##__VA_ARGS__) > +#define _proto(fmt, ...) RXRPC_DEBUG(KPROTO, kproto, fmt, ##__VA_ARGS__) > +#define _net(fmt, ...) RXRPC_DEBUG(KNET, knet, fmt, ##__VA_ARGS__) > > -#else > -#define _enter(FMT,...) no_printk("==> %s("FMT")",__func__ ,##__VA_ARGS__) > -#define _leave(FMT,...) no_printk("<== %s()"FMT"",__func__ ,##__VA_ARGS__) > -#define _debug(FMT,...) no_printk(" "FMT ,##__VA_ARGS__) > -#define _proto(FMT,...) no_printk("### "FMT ,##__VA_ARGS__) > -#define _net(FMT,...) no_printk("@@@ "FMT ,##__VA_ARGS__) > #endif > > /*