From patchwork Mon Aug 20 11:14:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi DOYU X-Patchwork-Id: 1348061 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 693FA3FC33 for ; Mon, 20 Aug 2012 11:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753519Ab2HTLPG (ORCPT ); Mon, 20 Aug 2012 07:15:06 -0400 Received: from hqemgate04.nvidia.com ([216.228.121.35]:19346 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752668Ab2HTLPF convert rfc822-to-8bit (ORCPT ); Mon, 20 Aug 2012 07:15:05 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Mon, 20 Aug 2012 04:14:25 -0700 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Mon, 20 Aug 2012 04:15:04 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 20 Aug 2012 04:15:04 -0700 Received: from deemhub02.nvidia.com (10.21.69.138) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server (TLS) id 8.3.264.0; Mon, 20 Aug 2012 04:15:04 -0700 Received: from DEMAIL01.nvidia.com ([10.21.69.140]) by deemhub02.nvidia.com ([10.21.69.138]) with mapi; Mon, 20 Aug 2012 13:15:01 +0200 From: Hiroshi Doyu To: "crope@iki.fi" CC: "linux-kernel@vger.kernel.org" , "gregkh@linuxfoundation.org" , "htl10@users.sourceforge.net" , "linux-media@vger.kernel.org" , "joe@perches.com" , "linux-tegra@vger.kernel.org" Date: Mon, 20 Aug 2012 13:14:54 +0200 Subject: Re: [PATCH 1/1] driver-core: Shut up dev_dbg_reatelimited() without DEBUG Thread-Topic: [PATCH 1/1] driver-core: Shut up dev_dbg_reatelimited() without DEBUG Thread-Index: Ac1+xQn9vFafOMtlQ2u6QhVAhzf0jA== Message-ID: <20120820.141454.449841061737873578.hdoyu@nvidia.com> References: <20120817.090416.563933713934615530.hdoyu@nvidia.com><502EDDCC.200@iki.fi> In-Reply-To: <502EDDCC.200@iki.fi> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-nvconfidentiality: public acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Antti, Antti Palosaari wrote @ Sat, 18 Aug 2012 02:11:56 +0200: > On 08/17/2012 09:04 AM, Hiroshi Doyu wrote: > > dev_dbg_reatelimited() without DEBUG printed "217078 callbacks > > suppressed". This shouldn't print anything without DEBUG. > > > > Signed-off-by: Hiroshi Doyu > > Reported-by: Antti Palosaari > > --- > > include/linux/device.h | 6 +++++- > > 1 files changed, 5 insertions(+), 1 deletions(-) > > > > diff --git a/include/linux/device.h b/include/linux/device.h > > index eb945e1..d4dc26e 100644 > > --- a/include/linux/device.h > > +++ b/include/linux/device.h > > @@ -962,9 +962,13 @@ do { \ > > dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__) > > #define dev_info_ratelimited(dev, fmt, ...) \ > > dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__) > > +#if defined(DEBUG) > > #define dev_dbg_ratelimited(dev, fmt, ...) \ > > dev_level_ratelimited(dev_dbg, dev, fmt, ##__VA_ARGS__) > > - > > +#else > > +#define dev_dbg_ratelimited(dev, fmt, ...) \ > > + no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) > > +#endif > > /* > > * Stupid hackaround for existing uses of non-printk uses dev_info > > * > > > > NACK. I don't think that's correct behavior. After that patch it kills > all output of dev_dbg_ratelimited(). If I use dynamic debugs and order > debugs, I expect to see debugs as earlier. You are right. I attached the update patch, just moving *_ratelimited functions after dev_dbg() definitions. With DEBUG defined/undefined in your "test.ko", it works fine. With CONFIG_DYNAMIC_DEBUG, it works with "+p", but with "-p", still "..callbacks suppressed" is printed. $ insmod test.ko $ echo -n 'module test +p' > /sys/kernel/debug/dynamic_debug/control" $ rmmod test $ dmesg | tail -15 <7>[ 69.047192] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 69.047233] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 69.047275] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <4>[ 75.057045] print_dev_dbg_ratelimited: 90 callbacks suppressed <7>[ 75.063595] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.063796] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.063970] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064137] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064307] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064472] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064640] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064806] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.064972] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <7>[ 75.065137] (NULL device *): print_dev_dbg_ratelimited: dev_dbg_ratelimited() <6>[ 75.065510] test module unloaded! $ insmod test.ko $ echo -n 'module test -p' > /sys/kernel/debug/dynamic_debug/control" $ rmmod test $ dmesg ... <6>[ 82.715925] test module loaded! <6>[ 82.795642] dynamic_debug:ddebug_exec_queries: processed 1 queries, with 1 matches, 0 errs <4>[ 88.892096] print_dev_dbg_ratelimited: 90 callbacks suppressed <6>[ 88.898397] test module unloaded! Any suggestion to control "... callbacks suppressed" with CONFIG_DYNAMIC_DEBUG would be appreciated. From 5b33751f89c2e91ee734325e6d73ed7e1c6d4b02 Mon Sep 17 00:00:00 2001 From: Hiroshi Doyu Date: Mon, 20 Aug 2012 13:49:19 +0300 Subject: [PATCH 1/1] driver-core: Shut up dev_dbg_reatelimited() without DEBUG dev_dbg_reatelimited() without DEBUG printed "217078 callbacks suppressed". This shouldn't print anything without DEBUG. With CONFIG_DYNAMIC_DEBUG, the print should be configured as expected. Signed-off-by: Hiroshi Doyu Reported-by: Antti Palosaari --- include/linux/device.h | 53 ++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 9648331..763bca4 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -932,6 +932,32 @@ int _dev_info(const struct device *dev, const char *fmt, ...) #endif +/* + * Stupid hackaround for existing uses of non-printk uses dev_info + * + * Note that the definition of dev_info below is actually _dev_info + * and a macro is used to avoid redefining dev_info + */ + +#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) + +#if defined(CONFIG_DYNAMIC_DEBUG) +#define dev_dbg(dev, format, ...) \ +do { \ + dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \ +} while (0) +#elif defined(DEBUG) +#define dev_dbg(dev, format, arg...) \ + dev_printk(KERN_DEBUG, dev, format, ##arg) +#else +#define dev_dbg(dev, format, arg...) \ +({ \ + if (0) \ + dev_printk(KERN_DEBUG, dev, format, ##arg); \ + 0; \ +}) +#endif + #define dev_level_ratelimited(dev_level, dev, fmt, ...) \ do { \ static DEFINE_RATELIMIT_STATE(_rs, \ @@ -955,33 +981,12 @@ do { \ dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__) #define dev_info_ratelimited(dev, fmt, ...) \ dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__) +#if defined(CONFIG_DYNAMIC_DEBUG) || defined(DEBUG) #define dev_dbg_ratelimited(dev, fmt, ...) \ dev_level_ratelimited(dev_dbg, dev, fmt, ##__VA_ARGS__) - -/* - * Stupid hackaround for existing uses of non-printk uses dev_info - * - * Note that the definition of dev_info below is actually _dev_info - * and a macro is used to avoid redefining dev_info - */ - -#define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) - -#if defined(CONFIG_DYNAMIC_DEBUG) -#define dev_dbg(dev, format, ...) \ -do { \ - dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \ -} while (0) -#elif defined(DEBUG) -#define dev_dbg(dev, format, arg...) \ - dev_printk(KERN_DEBUG, dev, format, ##arg) #else -#define dev_dbg(dev, format, arg...) \ -({ \ - if (0) \ - dev_printk(KERN_DEBUG, dev, format, ##arg); \ - 0; \ -}) +#define dev_dbg_ratelimited(dev, fmt, ...) \ + no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) #endif #ifdef VERBOSE_DEBUG