mirror of
https://github.com/torvalds/linux
synced 2024-09-21 03:28:37 +00:00
net: add include/net/net_debug.h
Remove from include/linux/netdevice.h helpers
that send debug/info/warnings to syslog.
We plan adding more helpers in following patches.
v2: added two includes, and 'struct net_device' forward declaration
to avoid compile errors (kernel bots)
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
David S. Miller
parent
dc3a2001f6
commit
5b87be9e49
|
|
@ -50,6 +50,7 @@
|
||||||
#include <linux/hashtable.h>
|
#include <linux/hashtable.h>
|
||||||
#include <linux/rbtree.h>
|
#include <linux/rbtree.h>
|
||||||
#include <net/net_trackers.h>
|
#include <net/net_trackers.h>
|
||||||
|
#include <net/net_debug.h>
|
||||||
|
|
||||||
struct netpoll_info;
|
struct netpoll_info;
|
||||||
struct device;
|
struct device;
|
||||||
|
|
@ -5071,81 +5072,9 @@ static inline const char *netdev_reg_state(const struct net_device *dev)
|
||||||
return " (unknown)";
|
return " (unknown)";
|
||||||
}
|
}
|
||||||
|
|
||||||
__printf(3, 4) __cold
|
|
||||||
void netdev_printk(const char *level, const struct net_device *dev,
|
|
||||||
const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_emerg(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_alert(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_crit(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_err(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_warn(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_notice(const struct net_device *dev, const char *format, ...);
|
|
||||||
__printf(2, 3) __cold
|
|
||||||
void netdev_info(const struct net_device *dev, const char *format, ...);
|
|
||||||
|
|
||||||
#define netdev_level_once(level, dev, fmt, ...) \
|
|
||||||
do { \
|
|
||||||
static bool __section(".data.once") __print_once; \
|
|
||||||
\
|
|
||||||
if (!__print_once) { \
|
|
||||||
__print_once = true; \
|
|
||||||
netdev_printk(level, dev, fmt, ##__VA_ARGS__); \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define netdev_emerg_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_EMERG, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_alert_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_ALERT, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_crit_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_CRIT, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_err_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_ERR, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_warn_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_WARNING, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_notice_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_NOTICE, dev, fmt, ##__VA_ARGS__)
|
|
||||||
#define netdev_info_once(dev, fmt, ...) \
|
|
||||||
netdev_level_once(KERN_INFO, dev, fmt, ##__VA_ARGS__)
|
|
||||||
|
|
||||||
#define MODULE_ALIAS_NETDEV(device) \
|
#define MODULE_ALIAS_NETDEV(device) \
|
||||||
MODULE_ALIAS("netdev-" device)
|
MODULE_ALIAS("netdev-" device)
|
||||||
|
|
||||||
#if defined(CONFIG_DYNAMIC_DEBUG) || \
|
|
||||||
(defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))
|
|
||||||
#define netdev_dbg(__dev, format, args...) \
|
|
||||||
do { \
|
|
||||||
dynamic_netdev_dbg(__dev, format, ##args); \
|
|
||||||
} while (0)
|
|
||||||
#elif defined(DEBUG)
|
|
||||||
#define netdev_dbg(__dev, format, args...) \
|
|
||||||
netdev_printk(KERN_DEBUG, __dev, format, ##args)
|
|
||||||
#else
|
|
||||||
#define netdev_dbg(__dev, format, args...) \
|
|
||||||
({ \
|
|
||||||
if (0) \
|
|
||||||
netdev_printk(KERN_DEBUG, __dev, format, ##args); \
|
|
||||||
})
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(VERBOSE_DEBUG)
|
|
||||||
#define netdev_vdbg netdev_dbg
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define netdev_vdbg(dev, format, args...) \
|
|
||||||
({ \
|
|
||||||
if (0) \
|
|
||||||
netdev_printk(KERN_DEBUG, dev, format, ##args); \
|
|
||||||
0; \
|
|
||||||
})
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* netdev_WARN() acts like dev_printk(), but with the key difference
|
* netdev_WARN() acts like dev_printk(), but with the key difference
|
||||||
* of using a WARN/WARN_ON to get the message out, including the
|
* of using a WARN/WARN_ON to get the message out, including the
|
||||||
|
|
@ -5159,74 +5088,6 @@ do { \
|
||||||
WARN_ONCE(1, "netdevice: %s%s: " format, netdev_name(dev), \
|
WARN_ONCE(1, "netdevice: %s%s: " format, netdev_name(dev), \
|
||||||
netdev_reg_state(dev), ##args)
|
netdev_reg_state(dev), ##args)
|
||||||
|
|
||||||
/* netif printk helpers, similar to netdev_printk */
|
|
||||||
|
|
||||||
#define netif_printk(priv, type, level, dev, fmt, args...) \
|
|
||||||
do { \
|
|
||||||
if (netif_msg_##type(priv)) \
|
|
||||||
netdev_printk(level, (dev), fmt, ##args); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define netif_level(level, priv, type, dev, fmt, args...) \
|
|
||||||
do { \
|
|
||||||
if (netif_msg_##type(priv)) \
|
|
||||||
netdev_##level(dev, fmt, ##args); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define netif_emerg(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(emerg, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_alert(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(alert, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_crit(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(crit, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_err(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(err, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_warn(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(warn, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_notice(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(notice, priv, type, dev, fmt, ##args)
|
|
||||||
#define netif_info(priv, type, dev, fmt, args...) \
|
|
||||||
netif_level(info, priv, type, dev, fmt, ##args)
|
|
||||||
|
|
||||||
#if defined(CONFIG_DYNAMIC_DEBUG) || \
|
|
||||||
(defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))
|
|
||||||
#define netif_dbg(priv, type, netdev, format, args...) \
|
|
||||||
do { \
|
|
||||||
if (netif_msg_##type(priv)) \
|
|
||||||
dynamic_netdev_dbg(netdev, format, ##args); \
|
|
||||||
} while (0)
|
|
||||||
#elif defined(DEBUG)
|
|
||||||
#define netif_dbg(priv, type, dev, format, args...) \
|
|
||||||
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
|
|
||||||
#else
|
|
||||||
#define netif_dbg(priv, type, dev, format, args...) \
|
|
||||||
({ \
|
|
||||||
if (0) \
|
|
||||||
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
|
||||||
0; \
|
|
||||||
})
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* if @cond then downgrade to debug, else print at @level */
|
|
||||||
#define netif_cond_dbg(priv, type, netdev, cond, level, fmt, args...) \
|
|
||||||
do { \
|
|
||||||
if (cond) \
|
|
||||||
netif_dbg(priv, type, netdev, fmt, ##args); \
|
|
||||||
else \
|
|
||||||
netif_ ## level(priv, type, netdev, fmt, ##args); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#if defined(VERBOSE_DEBUG)
|
|
||||||
#define netif_vdbg netif_dbg
|
|
||||||
#else
|
|
||||||
#define netif_vdbg(priv, type, dev, format, args...) \
|
|
||||||
({ \
|
|
||||||
if (0) \
|
|
||||||
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
|
||||||
0; \
|
|
||||||
})
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The list of packet types we will receive (as opposed to discard)
|
* The list of packet types we will receive (as opposed to discard)
|
||||||
* and the routines to invoke.
|
* and the routines to invoke.
|
||||||
|
|
|
||||||
151
include/net/net_debug.h
Normal file
151
include/net/net_debug.h
Normal file
|
|
@ -0,0 +1,151 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
#ifndef _LINUX_NET_DEBUG_H
|
||||||
|
#define _LINUX_NET_DEBUG_H
|
||||||
|
|
||||||
|
#include <linux/bug.h>
|
||||||
|
#include <linux/kern_levels.h>
|
||||||
|
|
||||||
|
struct net_device;
|
||||||
|
|
||||||
|
__printf(3, 4) __cold
|
||||||
|
void netdev_printk(const char *level, const struct net_device *dev,
|
||||||
|
const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_emerg(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_alert(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_crit(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_err(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_warn(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_notice(const struct net_device *dev, const char *format, ...);
|
||||||
|
__printf(2, 3) __cold
|
||||||
|
void netdev_info(const struct net_device *dev, const char *format, ...);
|
||||||
|
|
||||||
|
#define netdev_level_once(level, dev, fmt, ...) \
|
||||||
|
do { \
|
||||||
|
static bool __section(".data.once") __print_once; \
|
||||||
|
\
|
||||||
|
if (!__print_once) { \
|
||||||
|
__print_once = true; \
|
||||||
|
netdev_printk(level, dev, fmt, ##__VA_ARGS__); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define netdev_emerg_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_EMERG, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_alert_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_ALERT, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_crit_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_CRIT, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_err_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_ERR, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_warn_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_WARNING, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_notice_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_NOTICE, dev, fmt, ##__VA_ARGS__)
|
||||||
|
#define netdev_info_once(dev, fmt, ...) \
|
||||||
|
netdev_level_once(KERN_INFO, dev, fmt, ##__VA_ARGS__)
|
||||||
|
|
||||||
|
#if defined(CONFIG_DYNAMIC_DEBUG) || \
|
||||||
|
(defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))
|
||||||
|
#define netdev_dbg(__dev, format, args...) \
|
||||||
|
do { \
|
||||||
|
dynamic_netdev_dbg(__dev, format, ##args); \
|
||||||
|
} while (0)
|
||||||
|
#elif defined(DEBUG)
|
||||||
|
#define netdev_dbg(__dev, format, args...) \
|
||||||
|
netdev_printk(KERN_DEBUG, __dev, format, ##args)
|
||||||
|
#else
|
||||||
|
#define netdev_dbg(__dev, format, args...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
netdev_printk(KERN_DEBUG, __dev, format, ##args); \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(VERBOSE_DEBUG)
|
||||||
|
#define netdev_vdbg netdev_dbg
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define netdev_vdbg(dev, format, args...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
netdev_printk(KERN_DEBUG, dev, format, ##args); \
|
||||||
|
0; \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* netif printk helpers, similar to netdev_printk */
|
||||||
|
|
||||||
|
#define netif_printk(priv, type, level, dev, fmt, args...) \
|
||||||
|
do { \
|
||||||
|
if (netif_msg_##type(priv)) \
|
||||||
|
netdev_printk(level, (dev), fmt, ##args); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define netif_level(level, priv, type, dev, fmt, args...) \
|
||||||
|
do { \
|
||||||
|
if (netif_msg_##type(priv)) \
|
||||||
|
netdev_##level(dev, fmt, ##args); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define netif_emerg(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(emerg, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_alert(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(alert, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_crit(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(crit, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_err(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(err, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_warn(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(warn, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_notice(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(notice, priv, type, dev, fmt, ##args)
|
||||||
|
#define netif_info(priv, type, dev, fmt, args...) \
|
||||||
|
netif_level(info, priv, type, dev, fmt, ##args)
|
||||||
|
|
||||||
|
#if defined(CONFIG_DYNAMIC_DEBUG) || \
|
||||||
|
(defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))
|
||||||
|
#define netif_dbg(priv, type, netdev, format, args...) \
|
||||||
|
do { \
|
||||||
|
if (netif_msg_##type(priv)) \
|
||||||
|
dynamic_netdev_dbg(netdev, format, ##args); \
|
||||||
|
} while (0)
|
||||||
|
#elif defined(DEBUG)
|
||||||
|
#define netif_dbg(priv, type, dev, format, args...) \
|
||||||
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
|
||||||
|
#else
|
||||||
|
#define netif_dbg(priv, type, dev, format, args...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
||||||
|
0; \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* if @cond then downgrade to debug, else print at @level */
|
||||||
|
#define netif_cond_dbg(priv, type, netdev, cond, level, fmt, args...) \
|
||||||
|
do { \
|
||||||
|
if (cond) \
|
||||||
|
netif_dbg(priv, type, netdev, fmt, ##args); \
|
||||||
|
else \
|
||||||
|
netif_ ## level(priv, type, netdev, fmt, ##args); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#if defined(VERBOSE_DEBUG)
|
||||||
|
#define netif_vdbg netif_dbg
|
||||||
|
#else
|
||||||
|
#define netif_vdbg(priv, type, dev, format, args...) \
|
||||||
|
({ \
|
||||||
|
if (0) \
|
||||||
|
netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
|
||||||
|
0; \
|
||||||
|
})
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* _LINUX_NET_DEBUG_H */
|
||||||
Loading…
Reference in a new issue