From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 24 Jan 2012 16:46:13 +0200 From: Phil Carmody To: ext Greg KH Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Paolo Bonzini , Petr Matousek , linux-scsi@vger.kernel.org, Jens Axboe , James Bottomley Subject: Re: [23/27] kernel.h: add printk_ratelimited and pr__rl Message-ID: <20120124144613.GD3180@pcarmody2.research.nokia.com> References: <20120123234224.GA19510@kroah.com> <20120123234203.649739932@clark.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120123234203.649739932@clark.kroah.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: On 23/01/12 15:41 -0800, ext Greg KH wrote: > 2.6.32-longterm review patch. If anyone has any objections, please let me know. This looks like an added feature with no users in .32 - does it really belong in a stable tree? (But to be explicit, I have no issue with its contents at all.) Phil > ------------------ > > > From: Joe Perches > > commit 8a64f336bc1d4aa203b138d29d5a9c414a9fbb47 upstream. > > Add a printk_ratelimited statement expression macro that uses a per-call > ratelimit_state so that multiple subsystems output messages are not > suppressed by a global __ratelimit state. > > [akpm@linux-foundation.org: coding-style fixes] > [akpm@linux-foundation.org: s/_rl/_ratelimited/g] > Signed-off-by: Joe Perches > Cc: Naohiro Ooiwa > Cc: Ingo Molnar > Cc: Hiroshi Shimamoto > Cc: Peter Zijlstra > Signed-off-by: Andrew Morton > Signed-off-by: Linus Torvalds > Signed-off-by: Greg Kroah-Hartman > > --- > include/linux/kernel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > --- a/include/linux/kernel.h > +++ b/include/linux/kernel.h > @@ -407,6 +407,50 @@ static inline char *pack_hex_byte(char * > #endif > > /* > + * ratelimited messages with local ratelimit_state, > + * no local ratelimit_state used in the !PRINTK case > + */ > +#ifdef CONFIG_PRINTK > +#define printk_ratelimited(fmt, ...) ({ \ > + static struct ratelimit_state _rs = { \ > + .interval = DEFAULT_RATELIMIT_INTERVAL, \ > + .burst = DEFAULT_RATELIMIT_BURST, \ > + }; \ > + \ > + if (!__ratelimit(&_rs)) \ > + printk(fmt, ##__VA_ARGS__); \ > +}) > +#else > +/* No effect, but we still get type checking even in the !PRINTK case: */ > +#define printk_ratelimited printk > +#endif > + > +#define pr_emerg_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_alert_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_crit_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_err_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_warning_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_notice_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) > +#define pr_info_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > +/* no pr_cont_ratelimited, don't do that... */ > +/* If you are writing a driver, please use dev_dbg instead */ > +#if defined(DEBUG) > +#define pr_debug_ratelimited(fmt, ...) \ > + printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) > +#else > +#define pr_debug_ratelimited(fmt, ...) \ > + ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \ > + ##__VA_ARGS__); 0; }) > +#endif > + > +/* > * General tracing related utility functions - trace_printk(), > * tracing_on/tracing_off and tracing_start()/tracing_stop > * > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >