Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757996AbZKEOn7 (ORCPT ); Thu, 5 Nov 2009 09:43:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757699AbZKEOn6 (ORCPT ); Thu, 5 Nov 2009 09:43:58 -0500 Received: from mailgw.miraclelinux.com ([122.216.84.157]:5554 "EHLO mailgw.miraclelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757771AbZKEOn5 (ORCPT ); Thu, 5 Nov 2009 09:43:57 -0500 Message-ID: <4AF2E4B1.7030202@miraclelinux.com> Date: Thu, 05 Nov 2009 23:44:01 +0900 From: Naohiro Ooiwa User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: Ingo Molnar , Joe Perches CC: Andrew Morton , Hiroshi Shimamoto , roland@redhat.com, Peter Zijlstra , Thomas Gleixner , LKML , oleg@redhat.com, Linus Torvalds Subject: Re: [PATCH] kernel.h: Add printk_ratelimited and pr__rl References: <4AEACFBF.4060108@miraclelinux.com> <20091030143333.414ea29c.akpm@linux-foundation.org> <1256939158.1917.43.camel@Joe-Laptop.home> <1256944907.1917.109.camel@Joe-Laptop.home> <20091102155823.GA31535@elte.hu> <4AF2DE2D.5060902@miraclelinux.com> In-Reply-To: <4AF2DE2D.5060902@miraclelinux.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3426 Lines: 93 Naohiro Ooiwa wrote: > Ingo Molnar wrote: >> * Joe Perches wrote: >> >>> 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. >>> >>> Signed-off-by: Joe Perches >>> >>> diff --git a/include/linux/kernel.h b/include/linux/kernel.h >>> index f4e3184..555560c 100644 >>> --- a/include/linux/kernel.h >>> +++ b/include/linux/kernel.h >>> @@ -407,6 +407,50 @@ static inline char *pack_hex_byte(char *buf, u8 byte) >>> #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_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_alert_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_crit_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_err_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_warning_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_notice_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) >>> +#define pr_info_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) >>> +/* no pr_cont_rl, don't do that... */ >>> +/* If you are writing a driver, please use dev_dbg instead */ >>> +#if defined(DEBUG) >>> +#define pr_debug_rl(fmt, ...) \ >>> + printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) >>> +#else >>> +#define pr_debug_rl(fmt, ...) \ >>> + ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \ >>> + ##__VA_ARGS__); 0; }) >>> +#endif >>> + >> Looks like a useful addition. Somewhat bloatier, but then again, more >> correct and the bloat problem can be solved by explicit state >> definitions. >> >> Ingo > > I waiting for this patch to merge. > And then, I think I will remake my patch. > > How do you delete printk_ratelimit() in this patch at a same time ? > > I have a personal question. > Why aren't they codes in the include/linux/ratelimit.h ? > Ah, They are originally in kernel.h . Sorry. > > Thanks. > Naohiro Ooiwa > > -- > 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/ -- 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/