Subject: Re: [net-next] net: Provide details on watchdog timeout.

From: Ben Greear <[email-masked]>
Date: Mon, 09 Aug 2010 12:59:48 -0700

On 08/09/2010 12:59 PM, Ben Greear wrote:
> This keeps the WARN_ON but will also log normal kernel messages
> after the WARN_ON logic has happened once.

This is compile-tested only, by the way.

Thanks,
Ben

>
> Signed-off-by: Ben Greear<[email-masked]>
> ---
> :100644 100644 2aeb3a4... 66e6154... M	net/sched/sch_generic.c
>   net/sched/sch_generic.c |   23 ++++++++++++++++++++---
>   1 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
> index 2aeb3a4..66e6154 100644
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@ -253,9 +253,26 @@ static void dev_watchdog(unsigned long arg)
>   			}
>
>   			if (some_queue_timedout) {
> -				char drivername[64];
> -				WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n",
> -				       dev->name, netdev_drivername(dev, drivername, 64), i);
> +				static bool do_once = true;
> +				if (do_once || net_ratelimit()) {
> +					char drivername[64];
> +					if (unlikely(do_once)) {
> +						WARN(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): "
> +						     "transmit queue %u timed out"
> +						     " trans-start: %lu  jiffies: %lu\n",
> +						     dev->name,
> +						     netdev_drivername(dev, drivername, 64),
> +						     i, trans_start, jiffies);
> +						do_once = false;
> +					}
> +					else
> +						printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): "
> +						       "transmit queue %u timed out"
> +						       " trans-start: %lu  jiffies: %lu\n",
> +						       dev->name,
> +						       netdev_drivername(dev, drivername, 64),
> +						       i, trans_start, jiffies);
> +				}
>   				dev->netdev_ops->ndo_tx_timeout(dev);
>   			}
>   			if (!mod_timer(&dev->watchdog_timer,

-- 
Ben Greear <[email-masked]>
Candela Technologies Inc  http://www.candelatech.com