Re: [PATCH net] ibmveth: use net_err_ratelimited when set_multicast_list
From: Joe Perches <joe@perches.com>
Date: 2019-08-01 10:28:48
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
On Thu, 2019-08-01 at 17:03 +0800, Hangbin Liu wrote:
quoted hunk ↗ jump to hunk
When setting lots of multicast list on ibmveth, e.g. add 3000 membership on a multicast group, the following error message flushes our log file 8507 [ 901.478251] ibmveth 30000003 env3: h_multicast_ctrl rc=4 when adding an entry to the filter table ... 1718386 [ 5636.808658] ibmveth 30000003 env3: h_multicast_ctrl rc=4 when adding an entry to the filter table We got 1.5 million lines of messages in 1.3h. Let's replace netdev_err() by net_err_ratelimited() to avoid this issue. I don't use netdev_err_once() in case h_multicast_ctrl() return different lpar_rc types. Signed-off-by: Hangbin Liu <redacted> --- drivers/net/ethernet/ibm/ibmveth.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index d654c234aaf7..3b9406a4ca92 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c@@ -1446,9 +1446,11 @@ static void ibmveth_set_multicast_list(struct net_device *netdev) IbmVethMcastAddFilter, mcast_addr); if (lpar_rc != H_SUCCESS) { - netdev_err(netdev, "h_multicast_ctrl rc=%ld " - "when adding an entry to the filter " - "table\n", lpar_rc); + net_err_ratelimited("%s %s%s: h_multicast_ctrl rc=%ld when adding an entry to the filter table\n", + ibmveth_driver_name, + netdev_name(netdev), + netdev_reg_state(netdev), + lpar_rc);
Perhaps add the netdev_<level>_ratelimited variants and use that instead Somthing like: --- include/linux/netdevice.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 88292953aa6f..37116019e14f 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h@@ -4737,6 +4737,60 @@ do { \ #define netdev_info_once(dev, fmt, ...) \ netdev_level_once(KERN_INFO, dev, fmt, ##__VA_ARGS__) +#define netdev_level_ratelimited(netdev_level, dev, fmt, ...) \ +do { \ + static DEFINE_RATELIMIT_STATE(_rs, \ + DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + if (__ratelimit(&_rs)) \ + netdev_level(dev, fmt, ##__VA_ARGS__); \ +} while (0) + +#define netdev_emerg_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_emerg, dev, fmt, ##__VA_ARGS__) +#define netdev_alert_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_alert, dev, fmt, ##__VA_ARGS__) +#define netdev_crit_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_crit, dev, fmt, ##__VA_ARGS__) +#define netdev_err_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_err, dev, fmt, ##__VA_ARGS__) +#define netdev_warn_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_warn, dev, fmt, ##__VA_ARGS__) +#define netdev_notice_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_notice, dev, fmt, ##__VA_ARGS__) +#define netdev_info_ratelimited(dev, fmt, ...) \ + netdev_level_ratelimited(netdev_info, dev, fmt, ##__VA_ARGS__) + +#if defined(CONFIG_DYNAMIC_DEBUG) +/* descriptor check is first to prevent flooding with "callbacks suppressed" */ +#define netdev_dbg_ratelimited(dev, fmt, ...) \ +do { \ + static DEFINE_RATELIMIT_STATE(_rs, \ + DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ + if (DYNAMIC_DEBUG_BRANCH(descriptor) && \ + __ratelimit(&_rs)) \ + __dynamic_netdev_dbg(&descriptor, dev, fmt, \ + ##__VA_ARGS__); \ +} while (0) +#elif defined(DEBUG) +#define netdev_dbg_ratelimited(dev, fmt, ...) \ +do { \ + static DEFINE_RATELIMIT_STATE(_rs, \ + DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + if (__ratelimit(&_rs)) \ + netdev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \ +} while (0) +#else +#define netdev_dbg_ratelimited(dev, fmt, ...) \ +do { \ + if (0) \ + netdev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \ +} while (0) +#endif + #define MODULE_ALIAS_NETDEV(device) \ MODULE_ALIAS("netdev-" device)