Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bmips: fix Tx cleanup when NAPI poll budget is zero

Browse Source 
NAPI poll() function may be passed a budget value of zero, i.e. during
netpoll, which isn't NAPI context.
Therefore, napi_consume_skb() must be given budget value instead of
!force to truly discern netpoll-like scenarios.

https://lore.kernel.org/netdev/20220707141056.2644-1-liew.s.piaw@gmail.com/t/#m470f5c20225e76fb08c44d6cfa2f1b739ffaaea4
Signed-off-by: Sieng-Piaw Liew <liew.s.piaw@gmail.com>
[improve code format]
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Sieng-Piaw Liew 2022-07-08 16:16:08 +08:00 committed by Álvaro Fernández Rojas
parent cbc1fcf0e4
commit a6a54135ef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
View File

@ -442,7 +442,8 @@ static int bcm6368_enetsw_receive_queue(struct net_device *dev, int budget)
/* /*
* try to or force reclaim of transmitted buffers * try to or force reclaim of transmitted buffers
*/ */
static int bcm6368_enetsw_tx_reclaim(struct net_device *dev, int force) static int bcm6368_enetsw_tx_reclaim(struct net_device *dev, int force,
int budget)
{ {
struct bcm6368_enetsw *priv = netdev_priv(dev); struct bcm6368_enetsw *priv = netdev_priv(dev);
unsigned int bytes = 0; unsigned int bytes = 0;
@ -483,7 +484,7 @@ static int bcm6368_enetsw_tx_reclaim(struct net_device *dev, int force)
dev->stats.tx_errors++; dev->stats.tx_errors++;
bytes += skb->len; bytes += skb->len;
napi_consume_skb(skb, !force); napi_consume_skb(skb, budget);
released++; released++;
} }
@ -511,7 +512,7 @@ static int bcm6368_enetsw_poll(struct napi_struct *napi, int budget)
DMAC_IR_REG, priv->tx_chan); DMAC_IR_REG, priv->tx_chan);
/* reclaim sent skb */ /* reclaim sent skb */
bcm6368_enetsw_tx_reclaim(dev, 0); bcm6368_enetsw_tx_reclaim(dev, 0, budget);
spin_lock(&priv->rx_lock); spin_lock(&priv->rx_lock);
rx_work_done = bcm6368_enetsw_receive_queue(dev, budget); rx_work_done = bcm6368_enetsw_receive_queue(dev, budget);
@ -855,7 +856,7 @@ static int bcm6368_enetsw_stop(struct net_device *dev)
bcm6368_enetsw_disable_dma(priv, priv->rx_chan); bcm6368_enetsw_disable_dma(priv, priv->rx_chan);
/* force reclaim of all tx buffers */ /* force reclaim of all tx buffers */
bcm6368_enetsw_tx_reclaim(dev, 1); bcm6368_enetsw_tx_reclaim(dev, 1, 0);
/* free the rx buffer ring */ /* free the rx buffer ring */
for (i = 0; i < priv->rx_ring_size; i++) { for (i = 0; i < priv->rx_ring_size; i++) {