bnx2x: Disable local BHes to prevent a dead-lock situation
According to Eric's suggestion: Disable local BHes to prevent a dead-lock situation between sch_direct_xmit() (Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall context), as both are taking a netif_tx_lock(). Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
37a118452c
Коммит
e1210d127d
|
@ -1499,8 +1499,15 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
|
||||||
* updates that have been performed while interrupts were
|
* updates that have been performed while interrupts were
|
||||||
* disabled.
|
* disabled.
|
||||||
*/
|
*/
|
||||||
if (bp->common.int_block == INT_BLOCK_IGU)
|
if (bp->common.int_block == INT_BLOCK_IGU) {
|
||||||
|
/* Disable local BHes to prevent a dead-lock situation between
|
||||||
|
* sch_direct_xmit() and bnx2x_run_loopback() (calling
|
||||||
|
* bnx2x_tx_int()), as both are taking netif_tx_lock().
|
||||||
|
*/
|
||||||
|
local_bh_disable();
|
||||||
bnx2x_tx_int(fp_tx);
|
bnx2x_tx_int(fp_tx);
|
||||||
|
local_bh_enable();
|
||||||
|
}
|
||||||
|
|
||||||
rx_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
|
rx_idx = le16_to_cpu(*fp_rx->rx_cons_sb);
|
||||||
if (rx_idx != rx_start_idx + num_pkts)
|
if (rx_idx != rx_start_idx + num_pkts)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче