On Thu, 2019-08-01 at 22:10 +0800, Hangbin Liu wrote:
> On Thu, Aug 01, 2019 at 03:28:43AM -0700, Joe Perches wrote:
> > Perhaps add the netdev_<level>_ratelimited variants and use that instead
> >
> > Somthing like:
>
> Yes, that looks better. Do you mind if I take your code and add your
> Signed-off-by info?
Well, if you test and verify all the paths,
(I did not and just wrote that without testing),
you could add something like "Suggested-by:".
cheers, Joe
> Thanks
> Hangbin
> > ---
> > 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)
> >
> >
> >
