From: Jason Baron <jbaron@redhat.com>
To: gregkh@suse.de
Cc: joe@perches.com, jim.cromie@gmail.com, bvanassche@acm.org,
linux-kernel@vger.kernel.org, davem@davemloft.net,
aloisio.almeida@openbossa.org, netdev@vger.kernel.org
Subject: [PATCH 08/10] dynamic_debug: make netif_dbg() call __netdev_printk()
Date: Wed, 6 Jul 2011 13:25:07 -0400 [thread overview]
Message-ID: <889f3300a96f381aee1239ea775014fff26d93c9.1309967232.git.root@dhcp-100-18-164.bos.redhat.com> (raw)
In-Reply-To: <cover.1309967232.git.root@dhcp-100-18-164.bos.redhat.com>
From: Jason Baron <jbaron@redhat.com>
Previously, netif_dbg() was using dynamic_dev_dbg() to perform
the underlying printk. Fix it to use __netdev_printk(), instead.
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
include/linux/dynamic_debug.h | 12 ++++++++++++
include/linux/netdevice.h | 6 ++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index feaac1e..7048e64 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -84,6 +84,18 @@ extern int __dynamic_netdev_dbg(struct _ddebug *descriptor,
__dynamic_netdev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\
} while (0)
+#define dynamic_netif_dbg(dev, cond, fmt, ...) do { \
+ static struct _ddebug descriptor \
+ __used \
+ __attribute__((section("__verbose"), aligned(8))) = \
+ { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__, \
+ _DPRINTK_FLAGS_DEFAULT }; \
+ if (unlikely(descriptor.enabled)) { \
+ if (cond) \
+ __dynamic_netdev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\
+ } \
+ } while (0)
+
#else
static inline int ddebug_remove_module(const char *mod)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9b132ef..99c358f 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2731,10 +2731,8 @@ do { \
#elif defined(CONFIG_DYNAMIC_DEBUG)
#define netif_dbg(priv, type, netdev, format, args...) \
do { \
- if (netif_msg_##type(priv)) \
- dynamic_dev_dbg((netdev)->dev.parent, \
- "%s: " format, \
- netdev_name(netdev), ##args); \
+ dynamic_netif_dbg(netdev, (netif_msg_##type(priv)), \
+ format, ##args); \
} while (0)
#else
#define netif_dbg(priv, type, dev, format, args...) \
--
1.7.5.4
next prev parent reply other threads:[~2011-07-06 17:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 17:24 [PATCH 00/10] dynamic_debug: various fixes Jason Baron
2011-07-06 17:24 ` [PATCH 01/10] dynamic_debug: Add __dynamic_dev_dbg Jason Baron
2011-07-06 21:46 ` Joe Perches
2011-07-06 17:24 ` [PATCH 02/10] dynamic_debug: Consolidate prefix output to single routine Jason Baron
2011-07-07 18:14 ` Bart Van Assche
2011-07-07 19:44 ` Jim Cromie
2011-07-06 17:24 ` [PATCH 03/10] dynamic_debug: Remove uses of KERN_CONT in dynamic_emit_prefix Jason Baron
2011-07-06 17:24 ` [PATCH 04/10] dynamic_debug: Convert printks to pr_<level> Jason Baron
2011-07-06 17:24 ` [PATCH 05/10] dynamic_debug: remove unused control variables Jason Baron
2011-07-06 17:24 ` [PATCH 06/10] dynamic_debug: add myslef as maintainer Jason Baron
2011-07-06 17:29 ` Bart Van Assche
2011-07-06 17:37 ` Jason Baron
2011-07-06 17:25 ` [PATCH 07/10] dynamic_debug: make netdev_dbg() call __netdev_printk() Jason Baron
2011-07-06 21:50 ` Joe Perches
2011-07-06 17:25 ` Jason Baron [this message]
2011-07-06 21:59 ` [PATCH 08/10] dynamic_debug: make netif_dbg() " Joe Perches
2011-07-07 14:13 ` Jason Baron
2011-07-07 16:29 ` Joe Perches
2011-07-07 18:09 ` Jason Baron
2011-07-07 21:55 ` Joe Perches
2011-07-06 17:25 ` [PATCH 09/10] dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions Jason Baron
2011-07-06 17:25 ` [PATCH 10/10] dynamic_debug: remove num_enabled accounting Jason Baron
2011-07-06 17:57 ` [PATCH 00/10] dynamic_debug: various fixes Jim Cromie
2011-07-06 18:18 ` Jason Baron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=889f3300a96f381aee1239ea775014fff26d93c9.1309967232.git.root@dhcp-100-18-164.bos.redhat.com \
--to=jbaron@redhat.com \
--cc=aloisio.almeida@openbossa.org \
--cc=bvanassche@acm.org \
--cc=davem@davemloft.net \
--cc=gregkh@suse.de \
--cc=jim.cromie@gmail.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).