bcm63xx: fix Tx cleanup when NAPI poll budget is zero

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.

Fixes: c63c615e22eb ("bcm63xx_enet: switch to napi_build_skb() to reuse skbuff_heads")
Signed-off-by: Sieng-Piaw Liew <liew.s.piaw@gmail.com>
Link: https://lore.kernel.org/r/20220708080303.298-1-liew.s.piaw@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index fcaa6a2..1c6aea1 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -423,7 +423,7 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
 /*
  * try to or force reclaim of transmitted buffers
  */
-static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
+static int bcm_enet_tx_reclaim(struct net_device *dev, int force, int budget)
 {
        struct bcm_enet_priv *priv;
        unsigned int bytes;
@@ -468,7 +468,7 @@ static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
                        dev->stats.tx_errors++;
 
                bytes += skb->len;
-               napi_consume_skb(skb, !force);
+               napi_consume_skb(skb, budget);
                released++;
        }
 
@@ -499,7 +499,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
                         ENETDMAC_IR, priv->tx_chan);
 
        /* reclaim sent skb */
-       bcm_enet_tx_reclaim(dev, 0);
+       bcm_enet_tx_reclaim(dev, 0, budget);
 
        spin_lock(&priv->rx_lock);
        rx_work_done = bcm_enet_receive_queue(dev, budget);
@@ -1211,7 +1211,7 @@ static int bcm_enet_stop(struct net_device *dev)
        bcm_enet_disable_mac(priv);
 
        /* force reclaim of all tx buffers */
-       bcm_enet_tx_reclaim(dev, 1);
+       bcm_enet_tx_reclaim(dev, 1, 0);
 
        /* free the rx buffer ring */
        bcm_enet_free_rx_buf_ring(kdev, priv);
@@ -2362,7 +2362,7 @@ static int bcm_enetsw_stop(struct net_device *dev)
        bcm_enet_disable_dma(priv, priv->rx_chan);
 
        /* force reclaim of all tx buffers */
-       bcm_enet_tx_reclaim(dev, 1);
+       bcm_enet_tx_reclaim(dev, 1, 0);
 
        /* free the rx buffer ring */
        bcm_enet_free_rx_buf_ring(kdev, priv);