OSDN Git Service

net: watchdog: hold device global xmit lock during tx disable
authorEdwin Peer <edwin.peer@broadcom.com>
Sat, 6 Feb 2021 01:37:32 +0000 (17:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 00:18:58 +0000 (16:18 -0800)
commit3aa6bce9af0e25b735c9c1263739a5639a336ae8
tree044f908132ba3671debf843068c8f9c23728d464
parentce7536bc7398e2ae552d2fabb7e0e371a9f1fe46
net: watchdog: hold device global xmit lock during tx disable

Prevent netif_tx_disable() running concurrently with dev_watchdog() by
taking the device global xmit lock. Otherwise, the recommended:

netif_carrier_off(dev);
netif_tx_disable(dev);

driver shutdown sequence can happen after the watchdog has already
checked carrier, resulting in possible false alarms. This is because
netif_tx_lock() only sets the frozen bit without maintaining the locks
on the individual queues.

Fixes: c3f26a269c24 ("netdev: Fix lockdep warnings in multiqueue configurations.")
Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h