linux-kernel - Re: [PATCH 3/5] usb: Convert dbg to pr_eliminated and pr

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 18 Jun 2012 09:07:10 -0700
From:	Joe Perches <joe@...ches.com>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Paul Mundt <lethal@...ux-sh.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 3/5] usb: Convert dbg to pr_eliminated and pr_debug

On Mon, 2012-06-18 at 08:23 -0700, Greg Kroah-Hartman wrote:
> On Sun, Jun 17, 2012 at 07:25:10PM -0700, Joe Perches wrote:
> > Change the dbg macro to use pr_eliminated when not
> > DEBUG and pr_debug with DEBUG so dynamic_debug can
> > be used.
> > 
> > Signed-off-by: Joe Perches <joe@...ches.com>
> > ---
> >  include/linux/usb.h |   12 +++++-------
> >  1 files changed, 5 insertions(+), 7 deletions(-)
> > 
> > diff --git a/include/linux/usb.h b/include/linux/usb.h
> > index f717fbd..56b88b8 100644
> > --- a/include/linux/usb.h
> > +++ b/include/linux/usb.h
> > @@ -1714,14 +1714,12 @@ extern void usb_register_notify(struct notifier_block *nb);
> >  extern void usb_unregister_notify(struct notifier_block *nb);
> >  
> >  #ifdef DEBUG
> > -#define dbg(format, arg...)						\
> > -	printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg)
> > +#define dbg(format, ...)						\
> > +	pr_debug("%s: " format "\n", __FILE__, ##__VA_ARGS__)
> 
> No, I really want to delete this macro entirely, and am slowly working
> toward that, moving drivers to use the correct dev_dbg() macro instead.

It'd be hard to replace it with only dev_dbg
as no struct device is always available.

And anyway, why go slowly?  Why not just do it?

There's 41 files / 1442 instances

$ git grep --name-only -E "^\s*#\s*include\s*[\<\"]linux/usb\.h[\>\"]" | \
	xargs grep -El "\bdbg\s*\("|wc -l
41
$ git grep --name-only -E "^\s*#\s*include\s*[\<\"]linux/usb\.h[\>\"]" | \
	xargs grep -E "\bdbg\s*\(" | wc -l
1442

There are also 5 redefinitions of dbg in there.

> > -#define dbg(format, arg...)						\
> > -do {									\
> > -	if (0)								\
> > -		printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
> > -} while (0)
> > +#define dbg(format, ...)						\
> > +	printk_eliminated(KERN_DEBUG "%s: " format "\n",		\
> > +			  __FILE__, ##__VA_ARGS)
> 
> As Paul pointed out, this breaks the build,

Yeah, Typos happen.

Paul's imagery was certainly colorful though a bit
umm, dispassionate. ;)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/