A lot of netdevices implement their own variant of printk and use
use variations of dev_printk, printk or others that use msg_enable,
which has been an eyesore with countless variations across drivers.
This patch implements a standard ndev_printk and derivatives
such as ndev_err, ndev_info, ndev_warn that allows drivers to
transparently use both the msg_enable and a generic netdevice
message layout. It moves the msg_enable over to the net_device
struct and allows drivers to obsolete ethtool handling code of
the msg_enable value.
The current code has each driver contain a copy of msg_enable and
handle the setting/changing through ethtool that way. Since the
netdev name is stored in the net_device struct, those two are
not coherently available in a uniform way across all drivers (a
single macro or function would not work since all drivers name
their net_device members differently). This makes netdevice
driver writes reinvent the wheel over and over again.
It thus makes sense to move msg_enable to the net_device. This
gives us the opportunity to (1) initialize it by default with a
globally sane value, (2) remove msg_enable handling code w/r
ethtool for drivers that know and use the msg_enable member
of the net_device struct. (3) Ethtool code can just modify the
net_device msg_enable for drivers that do not have custom
msg_enable get/set handlers so converted drivers lose some
code for that as well. (4) non-modified drivers remain
functional without additional changes needed.
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---
include/linux/netdevice.h | 54 +++++++++++++++++++++++++++++++++++++++++++++
net/core/dev.c | 5 ++++
net/core/ethtool.c | 14 ++++++------
3 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3a70f55..a5a5fc8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -540,6 +540,8 @@ struct net_device
struct device dev;
/* space for optional statistics and wireless sysfs groups */
struct attribute_group *sysfs_groups[3];
+
+ unsigned int msg_enable;
};
#define to_net_dev(d) container_of(d, struct net_device, dev)
@@ -838,6 +840,58 @@ enum {
NETIF_MSG_WOL = 0x4000,
};
+#define ndev_err(netdev, level, format, arg...) \
+ do { \
+ struct net_device *__nd = (netdev); \
+ if ((__nd)->msg_enable & NETIF_MSG_##level) \
+ printk(KERN_ERR "%s: %s: " format, (__nd)->name, \
+ (__nd)->dev.parent->bus_id, ## arg); \
+ } while (0)
+
+#define ndev_warn(netdev, level, format, arg...) \
+ do { \
+ struct net_device *__nd = (netdev); \
+ if ((__nd)->msg_enable & NETIF_MSG_##level) \
+ printk(KERN_WARNING "%s: %s: " format, (__nd)->name, \
+ (__nd)->dev.parent->bus_id, ## arg); \
+ } while (0)
+
+#define ndev_info(netdev, level, format, arg...) \
+ do { \
+ struct net_device *__nd = (netdev); \
+ if ((__nd)->msg_enable & NETIF_MSG_##level) \
+ printk(KERN_INFO "%s: %s: " format, (__nd)->name, \
+ (__nd)->dev.parent->bus_id, ## arg); \
+ } while (0)
+
+#define ndev_notice(netdev, level, format, arg...) \
+ do { \
+ struct net_device *__nd = (netdev); \
+ if ((__nd)->msg_enable & NETIF_MSG_##level) \
+ printk(KERN_NOTICE "%s: %s: " format, (__nd)->name, \
+ (__nd)->dev.parent->bus_id, ## arg); \
+ } while (0)
+
+#ifdef DEBUG
+#define ndev_dbg(netdev, level, format, arg...) \
+ do { \
+ struct net_device *__nd = (netdev); \
+ if ((__nd)->msg_enable & NETIF_MSG_##level) \
+ printk(KERN_DEBUG "%s: %s: " format, (__nd)->name, \
+ (__nd)->dev.parent->bus_id, ## arg); \
+ } while (0)
+
+#else
+/* Force type-checking on ndev_dbg() when DEBUG is not set */
+static inline int __attribute__ ((format (printf, 3, 4)))
+__ndev_dbg(struct net_device * netdev, u32 level, const char *format, ...)
+{
+ return 0;
+}
+#define ndev_dbg(netdev, level, fmt, args...) \
+ __ndev_dbg(netdev, NETIF_MSG_##level, fmt, ##args)
+#endif
+
#define netif_msg_drv(p) ((p)->msg_enable & NETIF_MSG_DRV)
#define netif_msg_probe(p) ((p)->msg_enable & NETIF_MSG_PROBE)
#define netif_msg_link(p) ((p)->msg_enable & NETIF_MSG_LINK)
diff --git a/net/core/dev.c b/net/core/dev.c
index 2609062..316f250 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3378,6 +3378,11 @@ struct net_device *alloc_netdev(int sizeof_priv, const
char *name,
dev->priv = netdev_priv(dev);
dev->get_stats = internal_stats;
+ dev->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK;
+#ifdef DEBUG
+ /* put these to good use: */
+ dev->msg_enable |= NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR;
+#endif
setup(dev);
strcpy(dev->name, name);
return dev;
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 8d5e5a0..ff8d52f 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -234,9 +234,9 @@ static int ethtool_get_msglevel(struct net_device *dev,
char __user *useraddr)
struct ethtool_value edata = { ETHTOOL_GMSGLVL };
if (!dev->ethtool_ops->get_msglevel)
- return -EOPNOTSUPP;
-
- edata.data = dev->ethtool_ops->get_msglevel(dev);
+ edata.data = dev->msg_enable;
+ else
+ edata.data = dev->ethtool_ops->get_msglevel(dev);
if (copy_to_user(useraddr, &edata, sizeof(edata)))
return -EFAULT;
@@ -247,13 +247,13 @@ static int ethtool_set_msglevel(struct net_device *dev,
char __user *useraddr)
{
struct ethtool_value edata;
- if (!dev->ethtool_ops->set_msglevel)
- return -EOPNOTSUPP;
-
if (copy_from_user(&edata, useraddr, sizeof(edata)))
return -EFAULT;
- dev->ethtool_ops->set_msglevel(dev, edata.data);
+ if (!dev->ethtool_ops->set_msglevel)
+ dev->msg_enable = edata.data;
+ else
+ dev->ethtool_ops->set_msglevel(dev, edata.data);
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
