net: ravb: Always update error counters

[ Upstream commit 101b76418d7163240bc74a7e06867dca0e51183e ]

The error statistics should be updated each time the poll function is
called, even if the full RX work budget has been consumed. This prevents
the counts from becoming stuck when RX bandwidth usage is high.

This also ensures that error counters are not updated after we've
re-enabled interrupts as that could result in a race condition.

Also drop an unnecessary space.

Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20240402145305.82148-2-paul.barker.ct@bp.renesas.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 03c49bec6ee0b7dc9dce61457fa4968ae4fea3b0..1bdf0abb256cff6f381b9cfe5edf8ab13c552efc 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1303,6 +1303,15 @@ static int ravb_poll(struct napi_struct *napi, int budget)
        netif_wake_subqueue(ndev, q);
        spin_unlock_irqrestore(&priv->lock, flags);
 
+       /* Receive error message handling */
+       priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors;
+       if (info->nc_queues)
+               priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors;
+       if (priv->rx_over_errors != ndev->stats.rx_over_errors)
+               ndev->stats.rx_over_errors = priv->rx_over_errors;
+       if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors)
+               ndev->stats.rx_fifo_errors = priv->rx_fifo_errors;
+
        if (!unmask)
                goto out;
 
@@ -1319,14 +1328,6 @@ static int ravb_poll(struct napi_struct *napi, int budget)
        }
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       /* Receive error message handling */
-       priv->rx_over_errors =  priv->stats[RAVB_BE].rx_over_errors;
-       if (info->nc_queues)
-               priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors;
-       if (priv->rx_over_errors != ndev->stats.rx_over_errors)
-               ndev->stats.rx_over_errors = priv->rx_over_errors;
-       if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors)
-               ndev->stats.rx_fifo_errors = priv->rx_fifo_errors;
 out:
        return budget - quota;
 }