Commit 5393b2b5 authored by Justin Chen's avatar Justin Chen Committed by Jakub Kicinski
Browse files

net: bcmgenet: fix racing timeout handler 



The bcmgenet_timeout handler tries to take down all tx queues when
a single queue times out. This is over zealous and causes many race
conditions with queues that are still chugging along. Instead lets
only restart the timed out queue.

Fixes: 13ea6578 ("net: bcmgenet: improve TX timeout")
Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarNicolai Buchwitz <nb@tipi-net.de>
Tested-by: default avatarNicolai Buchwitz <nb@tipi-net.de>
Link: https://patch.msgid.link/20260406175756.134567-4-justin.chen@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3f316830

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+9 −13
Original line number Diff line number Diff line
@@ -3477,27 +3477,23 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring) 
static void bcmgenet_timeout(struct net_device *dev, unsigned int txqueue)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 int1_enable = 0;

	unsigned int q;

	struct bcmgenet_tx_ring *ring = &priv->tx_rings[txqueue];

	struct netdev_queue *txq = netdev_get_tx_queue(dev, txqueue);



	netif_dbg(priv, tx_err, dev, "bcmgenet_timeout\n");



	for (q = 0; q <= priv->hw_params->tx_queues; q++)

		bcmgenet_dump_tx_queue(&priv->tx_rings[q]);



	bcmgenet_tx_reclaim_all(dev);

	bcmgenet_dump_tx_queue(ring);



	for (q = 0; q <= priv->hw_params->tx_queues; q++)

		int1_enable |= (1 << q);

	bcmgenet_tx_reclaim(dev, ring, true);



	/* Re-enable TX interrupts if disabled */

	bcmgenet_intrl2_1_writel(priv, int1_enable, INTRL2_CPU_MASK_CLEAR);

	/* Re-enable the TX interrupt for this ring */

	bcmgenet_intrl2_1_writel(priv, 1 << txqueue, INTRL2_CPU_MASK_CLEAR);



	netif_trans_update(dev);

	txq_trans_cond_update(txq);



	BCMGENET_STATS64_INC((&priv->tx_rings[txqueue].stats64), errors);

	BCMGENET_STATS64_INC((&ring->stats64), errors);



	netif_tx_wake_all_queues(dev);

	netif_tx_wake_queue(txq);

}



#define MAX_MDF_FILTER	17