Skip to content

net: bcmgenet: fix leaking and racing timeout handler #7300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nbuchwitz wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
+11 −13
Draft

net: bcmgenet: fix leaking and racing timeout handler #7300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions drivers/net/ethernet/broadcom/genet/bcmgenet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,6 +1987,7 @@ static unsigned int bcmgenet_tx_reclaim(struct net_device *dev,
drop = (ring->prod_index - ring->c_index) & DMA_C_INDEX_MASK;
released += drop;
ring->prod_index = ring->c_index & DMA_C_INDEX_MASK;
ring->free_bds += drop;
while (drop--) {
cb_ptr = bcmgenet_put_txcb(priv, ring);
skb = cb_ptr->skb;
Expand All @@ -1998,6 +1999,7 @@ static unsigned int bcmgenet_tx_reclaim(struct net_device *dev,
}
if (skb)
dev_consume_skb_any(skb);
netdev_tx_reset_queue(netdev_get_tx_queue(dev, ring->index));
bcmgenet_tdma_ring_writel(priv, ring->index,
ring->prod_index, TDMA_PROD_INDEX);
wr_ptr = ring->write_ptr * WORDS_PER_BD(priv);
Expand Down Expand Up @@ -3495,27 +3497,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
Expand Down
Loading