mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 21:03:32 +00:00
Code Issues Releases Wiki Activity

net: no longer stop all TX queues in dev_watchdog()

Browse source 
There is no reason for stopping all TX queues from dev_watchdog()

Not only this stops feeding the NIC, it also migrates all qdiscs
to be serviced on the cpu calling netif_tx_unlock(), causing
a potential latency artifact.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2021-11-16 19:29:24 -08:00 committed by David S. Miller
parent dab8fe3207
commit bec251bc8b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/sched/sch_generic.c
View file

@ -500,7 +500,7 @@ static void dev_watchdog(struct timer_list *t)
{ {
struct net_device *dev = from_timer(dev, t, watchdog_timer); struct net_device *dev = from_timer(dev, t, watchdog_timer);
netif_tx_lock(dev); spin_lock(&dev->tx_global_lock);
if (!qdisc_tx_is_noop(dev)) { if (!qdisc_tx_is_noop(dev)) {
if (netif_device_present(dev) && if (netif_device_present(dev) &&
netif_running(dev) && netif_running(dev) &&
@ -523,11 +523,13 @@ static void dev_watchdog(struct timer_list *t)
} }
} }
if (some_queue_timedout) { if (unlikely(some_queue_timedout)) {
trace_net_dev_xmit_timeout(dev, i); trace_net_dev_xmit_timeout(dev, i);
WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n",
dev->name, netdev_drivername(dev), i); dev->name, netdev_drivername(dev), i);
netif_freeze_queues(dev);
dev->netdev_ops->ndo_tx_timeout(dev, i); dev->netdev_ops->ndo_tx_timeout(dev, i);
netif_unfreeze_queues(dev);
} }
if (!mod_timer(&dev->watchdog_timer, if (!mod_timer(&dev->watchdog_timer,
round_jiffies(jiffies + round_jiffies(jiffies +
@ -535,7 +537,7 @@ static void dev_watchdog(struct timer_list *t)
dev_hold(dev); dev_hold(dev);
} }
} }
netif_tx_unlock(dev); spin_unlock(&dev->tx_global_lock);
dev_put(dev); dev_put(dev);
} }