net: ravb: Always update error counters
authorPaul Barker <paul.barker.ct@bp.renesas.com>
Tue, 2 Apr 2024 14:53:05 +0000 (15:53 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 4 Apr 2024 10:46:13 +0000 (12:46 +0200)
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>
drivers/net/ethernet/renesas/ravb_main.c

index 48803050abdbf32fb432d9df65e6c7eef7a7098d..ba01c8cc3c906d5ea9a02029dc76fabc243b277c 100644 (file)
@@ -1339,6 +1339,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;
 
@@ -1355,14 +1364,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;
 }