Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1210d12 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37a11845

drivers/net/bnx2x/bnx2x_ethtool.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -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)