net: do not acquire dev->tx_global_lock in netdev_watchdog_up()
Subsystems (3)
PATCH 1/1 net: do not acquire dev->tx_global_lock in netdev_watchdog_up()
Marek Szyprowski reported a deadlock during system resume when virtio_net driver is used.
The deadlock occurs because netif_device_attach() is called while holding dev->tx_global_lock (via netif_tx_lock_bh() in virtnet_restore_up()). netif_device_attach() calls __netdev_watchdog_up(), which now also tries to acquire dev->tx_global_lock to synchronize with dev_watchdog().
This recursive lock acquisition results in a deadlock.
Fix this by removing the tx_global_lock acquisition from netdev_watchdog_up().
The critical state (watchdog_timer and watchdog_ref_held) is already protected by dev->watchdog_lock, which was introduced in the blamed commit.
--- net/sched/sch_generic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
net/sched/sch_generic.c +2 -5
@@ -594,9 +594,8 @@ void netdev_watchdog_up(struct net_device *dev)return ;if (dev->watchdog_timeo <=0 ) dev->watchdog_timeo =5 *HZ ; -spin_lock_bh (&dev->tx_global_lock); -spin_lock (&dev->watchdog_lock); +spin_lock_bh (&dev->watchdog_lock);if (!mod_timer (&dev->watchdog_timer,round_jiffies (jiffies + dev->watchdog_timeo))) {if (!dev->watchdog_ref_held) {
@@ -605,9 +604,7 @@ void netdev_watchdog_up(struct net_device *dev) dev->watchdog_ref_held = true; } } -spin_unlock (&dev->watchdog_lock); - -spin_unlock_bh (&dev->tx_global_lock); +spin_unlock_bh (&dev->watchdog_lock); }EXPORT_SYMBOL_GPL (netdev_watchdog_up);
Signature · 1 line
2.55.0.rc0.786.g65d90a0328-goog
Quoted 12 lines · Eric Dumazet
Marek Szyprowski reported a deadlock during system resume when
virtio_netdriver is used.The deadlock occurs because
netif_device_attach()is called while holdingdev->tx_global_lock(vianetif_tx_lock_bh()invirtnet_restore_up()).netif_device_attach()calls__netdev_watchdog_up(), which now also tries to acquiredev->tx_global_lockto synchronize withdev_watchdog().This recursive lock acquisition results in a deadlock.
Fix this by removing the
tx_global_lockacquisition fromnetdev_watchdog_up().
Quoted 8 lines
The critical state (
watchdog_timerandwatchdog_ref_held) is already protected bydev->watchdog_lock, which was introduced in the blamed commit.Fixes 8eed5519e496 ("net: watchdog: fix refcount tracking races")Reported-by Marek Szyprowski <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Tested-by Marek Szyprowski <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 22 Jun 2026 11:01:08 +0000 you wrote:
Marek Szyprowski reported a deadlock during system resume when
virtio_netdriver is used.The deadlock occurs because
netif_device_attach()is called while holdingdev->tx_global_lock(vianetif_tx_lock_bh()invirtnet_restore_up()).netif_device_attach()calls__netdev_watchdog_up(), which now also tries to acquiredev->tx_global_lockto synchronize withdev_watchdog().[...]
Here is the summary with links:
- [net] net: do not acquire dev->tx_global_lock in netdev_watchdog_up()
https://git.kernel.org/netdev/net/c/d09a78a2a469
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html