net: airoha: fix MIB stats collection to be lossless

REG_FE_GDM_MIB_CLEAR after every read creates a race window where
packets arriving between read and clear are lost from statistics.

Switch to a delta-based approach instead:

- 64-bit H+L registers (ok pkts/bytes, E64..L1023): read absolute
  hardware total directly into a local variable; clamp with max(new, old)
  to prevent torn-read regression when the counter carries between the
  two reads.

- 32-bit registers (drops, bc, mc, errors, runt, long): accumulate
  (u32)(curr - prev) into a 64-bit software counter; unsigned
  subtraction handles wrap-around transparently.

- tx/rx_len[0] ([0,64] bucket): combines RUNT_CNT (32-bit, delta via
  tx_runt/rx_runt) and E64_CNT (64-bit, absolute) into a single local
  accumulator; max(new, old) applied here too to guard against a torn
  read of E64 when the RUNT accumulator is unchanged between polls.

MIB counters are zeroed by the SCU FE reset (EN7581_FE_RST) asserted
in airoha_hw_init() at module load, so no explicit MIB clear is needed
in airoha_fe_init().

Merge airoha_dev_get_hw_stats() into airoha_update_hw_stats() and
move stats_lock inside. Plain spin_lock() is correct: the function
is only called from ndo_get_stats64() in process context. Each dev
refreshes only its own MIB counters; sibling devs on a shared GDM3/4
port are polled when their own netdev is queried.

Fixes: 8f4695fb67b2 ("net: airoha: better handle MIBs for GDM ports with multiple devs attached")
Signed-off-by: Aniket Negi <aniket.negi03@gmail.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20260707152639.105628-1-aniket.negi03@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
index 59001fd4b6f7405e4fb6ccbf291e7f47c90c9e76..90aa8b0210bd6fd45620b52fe9ce95afa2c32b6a 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_eth.c
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
@@ -1686,11 +1686,14 @@ static void airoha_qdma_stop_napi(struct airoha_qdma *qdma)
        }
 }
 
-static void airoha_dev_get_hw_stats(struct airoha_gdm_dev *dev)
+static void airoha_update_hw_stats(struct airoha_gdm_dev *dev)
 {
        struct airoha_gdm_port *port = dev->port;
        struct airoha_eth *eth = dev->eth;
        u32 val, i = 0;
+       u64 data;
+
+       spin_lock(&port->stats_lock);
 
        /* Read relevant MIB for GDM with multiple port attached */
        if (port->id == AIROHA_GDM3_IDX || port->id == AIROHA_GDM4_IDX)
@@ -1701,152 +1704,188 @@ static void airoha_dev_get_hw_stats(struct airoha_gdm_dev *dev)
 
        u64_stats_update_begin(&dev->stats.syncp);
 
-       /* TX */
+       /* TX - 64-bit H+L registers: hw accumulates the total, read directly.
+        * Use local variable to prevent readers from seeing intermediate values.
+        * Clamp to prevent regression from torn reads between H and L.
+        */
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_H(port->id));
-       dev->stats.tx_ok_pkts += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port->id));
-       dev->stats.tx_ok_pkts += val;
+       data += val;
+       dev->stats.tx_ok_pkts = max(data, dev->stats.tx_ok_pkts);
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port->id));
-       dev->stats.tx_ok_bytes += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port->id));
-       dev->stats.tx_ok_bytes += val;
+       data += val;
+       dev->stats.tx_ok_bytes = max(data, dev->stats.tx_ok_bytes);
 
+       /* TX - 32-bit registers: accumulate delta to handle wrap-around. */
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_DROP_CNT(port->id));
-       dev->stats.tx_drops += val;
+       dev->stats.tx_drops += (u32)(val - dev->stats.mib_prev.tx_drops);
+       dev->stats.mib_prev.tx_drops = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_BC_CNT(port->id));
-       dev->stats.tx_broadcast += val;
+       dev->stats.tx_broadcast += (u32)(val - dev->stats.mib_prev.tx_broadcast);
+       dev->stats.mib_prev.tx_broadcast = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_MC_CNT(port->id));
-       dev->stats.tx_multicast += val;
+       dev->stats.tx_multicast += (u32)(val - dev->stats.mib_prev.tx_multicast);
+       dev->stats.mib_prev.tx_multicast = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_RUNT_CNT(port->id));
-       dev->stats.tx_len[i] += val;
+       dev->stats.mib_prev.tx_runt64 +=
+               (u32)(val - dev->stats.mib_prev.tx_runt);
+       dev->stats.mib_prev.tx_runt = val;
 
+       /* tx_len[0]: RUNT (32-bit, delta) + E64 (64-bit, absolute). */
+       data = dev->stats.mib_prev.tx_runt64;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data += (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port->id));
-       dev->stats.tx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port->id));
-       dev->stats.tx_len[i++] += val;
+       data += val;
+       dev->stats.tx_len[i] = max(data, dev->stats.tx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_LONG_CNT(port->id));
-       dev->stats.tx_len[i++] += val;
+       dev->stats.tx_len[i++] += (u32)(val - dev->stats.mib_prev.tx_long);
+       dev->stats.mib_prev.tx_long = val;
 
        /* RX */
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_H(port->id));
-       dev->stats.rx_ok_pkts += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port->id));
-       dev->stats.rx_ok_pkts += val;
+       data += val;
+       dev->stats.rx_ok_pkts = max(data, dev->stats.rx_ok_pkts);
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port->id));
-       dev->stats.rx_ok_bytes += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port->id));
-       dev->stats.rx_ok_bytes += val;
+       data += val;
+       dev->stats.rx_ok_bytes = max(data, dev->stats.rx_ok_bytes);
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_DROP_CNT(port->id));
-       dev->stats.rx_drops += val;
+       dev->stats.rx_drops += (u32)(val - dev->stats.mib_prev.rx_drops);
+       dev->stats.mib_prev.rx_drops = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_BC_CNT(port->id));
-       dev->stats.rx_broadcast += val;
+       dev->stats.rx_broadcast += (u32)(val - dev->stats.mib_prev.rx_broadcast);
+       dev->stats.mib_prev.rx_broadcast = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_MC_CNT(port->id));
-       dev->stats.rx_multicast += val;
+       dev->stats.rx_multicast += (u32)(val - dev->stats.mib_prev.rx_multicast);
+       dev->stats.mib_prev.rx_multicast = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ERROR_DROP_CNT(port->id));
-       dev->stats.rx_errors += val;
+       dev->stats.rx_errors += (u32)(val - dev->stats.mib_prev.rx_errors);
+       dev->stats.mib_prev.rx_errors = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port->id));
-       dev->stats.rx_crc_error += val;
+       dev->stats.rx_crc_error += (u32)(val - dev->stats.mib_prev.rx_crc_error);
+       dev->stats.mib_prev.rx_crc_error = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port->id));
-       dev->stats.rx_over_errors += val;
+       dev->stats.rx_over_errors += (u32)(val - dev->stats.mib_prev.rx_over_errors);
+       dev->stats.mib_prev.rx_over_errors = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_FRAG_CNT(port->id));
-       dev->stats.rx_fragment += val;
+       dev->stats.rx_fragment += (u32)(val - dev->stats.mib_prev.rx_fragment);
+       dev->stats.mib_prev.rx_fragment = val;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_JABBER_CNT(port->id));
-       dev->stats.rx_jabber += val;
+       dev->stats.rx_jabber += (u32)(val - dev->stats.mib_prev.rx_jabber);
+       dev->stats.mib_prev.rx_jabber = val;
 
        i = 0;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_RUNT_CNT(port->id));
-       dev->stats.rx_len[i] += val;
+       dev->stats.mib_prev.rx_runt64 +=
+               (u32)(val - dev->stats.mib_prev.rx_runt);
+       dev->stats.mib_prev.rx_runt = val;
 
+       /* rx_len[0]: RUNT (32-bit, delta) + E64 (64-bit, absolute). */
+       data = dev->stats.mib_prev.rx_runt64;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data += (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port->id));
-       dev->stats.rx_len[i] += ((u64)val << 32);
+       data = (u64)val << 32;
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port->id));
-       dev->stats.rx_len[i++] += val;
+       data += val;
+       dev->stats.rx_len[i] = max(data, dev->stats.rx_len[i]);
+       i++;
 
        val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_LONG_CNT(port->id));
-       dev->stats.rx_len[i++] += val;
+       dev->stats.rx_len[i] += (u32)(val - dev->stats.mib_prev.rx_long);
+       dev->stats.mib_prev.rx_long = val;
 
        u64_stats_update_end(&dev->stats.syncp);
-}
-
-static void airoha_update_hw_stats(struct airoha_gdm_dev *dev)
-{
-       struct airoha_gdm_port *port = dev->port;
-       int i;
-
-       spin_lock(&port->stats_lock);
-
-       for (i = 0; i < ARRAY_SIZE(port->devs); i++) {
-               if (port->devs[i])
-                       airoha_dev_get_hw_stats(port->devs[i]);
-       }
-
-       /* Reset MIB counters */
-       airoha_fe_set(dev->eth, REG_FE_GDM_MIB_CLEAR(port->id),
-                     FE_GDM_MIB_RX_CLEAR_MASK | FE_GDM_MIB_TX_CLEAR_MASK);
 
        spin_unlock(&port->stats_lock);
 }

diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h
index f6d01a8e8da139ea522b9083458a4fc45024a252..fe934f9ffe8a11a0e8fd4b2ef41b658daae7f3f5 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_eth.h
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
@@ -245,6 +245,33 @@ struct airoha_hw_stats {
        u64 rx_fragment;
        u64 rx_jabber;
        u64 rx_len[7];
+
+       struct {
+               /* Previous HW register values for 32-bit counter delta
+                * tracking. Storing the last seen value and accumulating
+                * (u32)(curr - prev) into the 64-bit software counter
+                * handles wrap-around transparently via unsigned arithmetic.
+                * tx_runt64/rx_runt64 hold the running sum of runt deltas.
+                * These fields are never reported to userspace.
+                */
+               u32 tx_drops;
+               u32 tx_broadcast;
+               u32 tx_multicast;
+               u32 tx_runt;
+               u32 tx_long;
+               u64 tx_runt64;
+               u32 rx_drops;
+               u32 rx_broadcast;
+               u32 rx_multicast;
+               u32 rx_errors;
+               u32 rx_crc_error;
+               u32 rx_over_errors;
+               u32 rx_fragment;
+               u32 rx_jabber;
+               u32 rx_runt;
+               u32 rx_long;
+               u64 rx_runt64;
+       } mib_prev;
 };
 
 enum {