Home Home > GIT Browse
diff options
authorBen Hutchings <bhutchings@solarflare.com>2013-03-05 01:03:47 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 12:12:01 -0700
commit70a3336df60074b29ac3b546d8fccfbcf7831e95 (patch)
parentbea3099eb4f3f73cc2c311d39ef374eb6aa06f88 (diff)
sfc: Disable soft interrupt handling during efx_device_detach_sync()
[ Upstream commit 35205b211c8d17a8a0b5e8926cb7c73e9a7ef1ad ] efx_device_detach_sync() locks all TX queues before marking the device detached and thus disabling further TX scheduling. But it can still be interrupted by TX completions which then result in TX scheduling in soft interrupt context. This will deadlock when it tries to acquire a TX queue lock that efx_device_detach_sync() already acquired. To avoid deadlock, we must use netif_tx_{,un}lock_bh(). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 320cf7bfc7f9..7db0e5bfc9e4 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -170,9 +170,9 @@ static inline void efx_device_detach_sync(struct efx_nic *efx)
* TX scheduler is stopped when we're done and before
* netif_device_present() becomes false.
- netif_tx_lock(dev);
+ netif_tx_lock_bh(dev);
- netif_tx_unlock(dev);
+ netif_tx_unlock_bh(dev);
#endif /* EFX_EFX_H */