This is a note to let you know that I've just added the patch titled
sfc: Disable soft interrupt handling during efx_device_detach_sync()
to the 3.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sfc-disable-soft-interrupt-handling-during-efx_device_detach_sync.patch
and it can be found in the queue-3.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From df50fed6fcae20d5523e9482d90af7094f6297d0 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Tue, 5 Mar 2013 01:03:47 +0000
Subject: sfc: Disable soft interrupt handling during efx_device_detach_sync()
From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
[ 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@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/sfc/efx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -171,9 +171,9 @@ static inline void efx_device_detach_syn
* 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_device_detach(dev);
- netif_tx_unlock(dev);
+ netif_tx_unlock_bh(dev);
}
#endif /* EFX_EFX_H */
Patches currently in stable-queue which might be from bhutchings@xxxxxxxxxxxxxx are
queue-3.8/sfc-properly-sync-rx-dma-buffer-when-it-is-not-the-last-in-the-page.patch
queue-3.8/sfc-only-use-tx-push-if-a-single-descriptor-is-to-be-written.patch
queue-3.8/sfc-fix-efx_rx_buf_offset-in-the-presence-of-swiotlb.patch
queue-3.8/drivers-net-ethernet-sfc-ptp.c-adjust-duplicate-test.patch
queue-3.8/sfc-disable-soft-interrupt-handling-during-efx_device_detach_sync.patch
queue-3.8/sfc-detach-net-device-when-stopping-queues-for-reconfiguration.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html