bnxt_en: Display the ring error counters under ethtool -S

The existing driver displays the sum of 4 ring counters under ethtool -S.
These counters are in the array bnxt_sw_func_stats.  These counters are
summed at the time of ethtool -S and will be lost when the device is reset.

Replace these counters with the new total ring error counters added in the
last patch.  These new counters are saved before reset.  ethtool -S will
now display the sum of the saved counters plus the current counters.

Link: https://lore.kernel.org/netdev/CACKFLimD-bKmJ1tGZOLYRjWzEwxkri-Mw7iFme1x2Dr0twdCeg@mail.gmail.com/
Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20230817231911.165035-6-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 8fd5071..a9f1eed 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -339,13 +339,15 @@ enum {
        RX_NETPOLL_DISCARDS,
 };
 
-static struct {
-       u64                     counter;
-       char                    string[ETH_GSTRING_LEN];
-} bnxt_sw_func_stats[] = {
-       {0, "rx_total_discard_pkts"},
-       {0, "tx_total_discard_pkts"},
-       {0, "rx_total_netpoll_discards"},
+static const char *const bnxt_ring_err_stats_arr[] = {
+       "rx_total_l4_csum_errors",
+       "rx_total_resets",
+       "rx_total_buf_errors",
+       "rx_total_oom_discards",
+       "rx_total_netpoll_discards",
+       "rx_total_ring_discards",
+       "tx_total_ring_discards",
+       "total_missed_irqs",
 };
 
 #define NUM_RING_RX_SW_STATS           ARRAY_SIZE(bnxt_rx_sw_stats_str)
@@ -495,7 +497,7 @@ static const struct {
        BNXT_TX_STATS_PRI_ENTRIES(tx_packets),
 };
 
-#define BNXT_NUM_SW_FUNC_STATS ARRAY_SIZE(bnxt_sw_func_stats)
+#define BNXT_NUM_RING_ERR_STATS        ARRAY_SIZE(bnxt_ring_err_stats_arr)
 #define BNXT_NUM_PORT_STATS ARRAY_SIZE(bnxt_port_stats_arr)
 #define BNXT_NUM_STATS_PRI                     \
        (ARRAY_SIZE(bnxt_rx_bytes_pri_arr) +    \
@@ -532,7 +534,7 @@ static int bnxt_get_num_stats(struct bnxt *bp)
 {
        int num_stats = bnxt_get_num_ring_stats(bp);
 
-       num_stats += BNXT_NUM_SW_FUNC_STATS;
+       num_stats += BNXT_NUM_RING_ERR_STATS;
 
        if (bp->flags & BNXT_FLAG_PORT_STATS)
                num_stats += BNXT_NUM_PORT_STATS;
@@ -583,18 +585,17 @@ static bool is_tx_ring(struct bnxt *bp, int ring_num)
 static void bnxt_get_ethtool_stats(struct net_device *dev,
                                   struct ethtool_stats *stats, u64 *buf)
 {
-       u32 i, j = 0;
+       struct bnxt_total_ring_err_stats ring_err_stats = {0};
        struct bnxt *bp = netdev_priv(dev);
+       u64 *curr, *prev;
        u32 tpa_stats;
+       u32 i, j = 0;
 
        if (!bp->bnapi) {
-               j += bnxt_get_num_ring_stats(bp) + BNXT_NUM_SW_FUNC_STATS;
+               j += bnxt_get_num_ring_stats(bp);
                goto skip_ring_stats;
        }
 
-       for (i = 0; i < BNXT_NUM_SW_FUNC_STATS; i++)
-               bnxt_sw_func_stats[i].counter = 0;
-
        tpa_stats = bnxt_get_num_tpa_ring_stats(bp);
        for (i = 0; i < bp->cp_nr_rings; i++) {
                struct bnxt_napi *bnapi = bp->bnapi[i];
@@ -631,19 +632,16 @@ skip_tpa_ring_stats:
                sw = (u64 *)&cpr->sw_stats.cmn;
                for (k = 0; k < NUM_RING_CMN_SW_STATS; j++, k++)
                        buf[j] = sw[k];
-
-               bnxt_sw_func_stats[RX_TOTAL_DISCARDS].counter +=
-                       BNXT_GET_RING_STATS64(sw_stats, rx_discard_pkts);
-               bnxt_sw_func_stats[TX_TOTAL_DISCARDS].counter +=
-                       BNXT_GET_RING_STATS64(sw_stats, tx_discard_pkts);
-               bnxt_sw_func_stats[RX_NETPOLL_DISCARDS].counter +=
-                       cpr->sw_stats.rx.rx_netpoll_discards;
        }
 
-       for (i = 0; i < BNXT_NUM_SW_FUNC_STATS; i++, j++)
-               buf[j] = bnxt_sw_func_stats[i].counter;
+       bnxt_get_ring_err_stats(bp, &ring_err_stats);
 
 skip_ring_stats:
+       curr = &ring_err_stats.rx_total_l4_csum_errors;
+       prev = &bp->ring_err_stats_prev.rx_total_l4_csum_errors;
+       for (i = 0; i < BNXT_NUM_RING_ERR_STATS; i++, j++, curr++, prev++)
+               buf[j] = *curr + *prev;
+
        if (bp->flags & BNXT_FLAG_PORT_STATS) {
                u64 *port_stats = bp->port_stats.sw_stats;
 
@@ -745,8 +743,8 @@ skip_tpa_stats:
                                buf += ETH_GSTRING_LEN;
                        }
                }
-               for (i = 0; i < BNXT_NUM_SW_FUNC_STATS; i++) {
-                       strcpy(buf, bnxt_sw_func_stats[i].string);
+               for (i = 0; i < BNXT_NUM_RING_ERR_STATS; i++) {
+                       strscpy(buf, bnxt_ring_err_stats_arr[i], ETH_GSTRING_LEN);
                        buf += ETH_GSTRING_LEN;
                }