enic: Report some per queue statistics in ethtool

Make 'ethtool -S <intf>' output show some per rq/wq statistics that
don't exist in the netdev qstats.

Signed-off-by: Nelson Escobar <neescoba@cisco.com>
Signed-off-by: John Daley <johndale@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
Link: https://patch.msgid.link/20240912005039.10797-5-neescoba@cisco.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
index e49543d97a83b9fef32356f920b7cadc2c893fa3..f7986f2b6a1794144909ffad9e3e09c32ea44c93 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c
+++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c
@@ -32,6 +32,41 @@ struct enic_stat {
        .index = offsetof(struct vnic_gen_stats, stat) / sizeof(u64)\
 }
 
+#define ENIC_PER_RQ_STAT(stat) { \
+       .name = "rq[%d]_"#stat, \
+       .index = offsetof(struct enic_rq_stats, stat) / sizeof(u64) \
+}
+
+#define ENIC_PER_WQ_STAT(stat) { \
+       .name = "wq[%d]_"#stat, \
+       .index = offsetof(struct enic_wq_stats, stat) / sizeof(u64) \
+}
+
+static const struct enic_stat enic_per_rq_stats[] = {
+       ENIC_PER_RQ_STAT(l4_rss_hash),
+       ENIC_PER_RQ_STAT(l3_rss_hash),
+       ENIC_PER_RQ_STAT(csum_unnecessary_encap),
+       ENIC_PER_RQ_STAT(vlan_stripped),
+       ENIC_PER_RQ_STAT(napi_complete),
+       ENIC_PER_RQ_STAT(napi_repoll),
+       ENIC_PER_RQ_STAT(no_skb),
+       ENIC_PER_RQ_STAT(desc_skip),
+};
+
+#define NUM_ENIC_PER_RQ_STATS   ARRAY_SIZE(enic_per_rq_stats)
+
+static const struct enic_stat enic_per_wq_stats[] = {
+       ENIC_PER_WQ_STAT(encap_tso),
+       ENIC_PER_WQ_STAT(encap_csum),
+       ENIC_PER_WQ_STAT(add_vlan),
+       ENIC_PER_WQ_STAT(cq_work),
+       ENIC_PER_WQ_STAT(cq_bytes),
+       ENIC_PER_WQ_STAT(null_pkt),
+       ENIC_PER_WQ_STAT(skb_linear_fail),
+       ENIC_PER_WQ_STAT(desc_full_awake),
+};
+
+#define NUM_ENIC_PER_WQ_STATS   ARRAY_SIZE(enic_per_wq_stats)
 static const struct enic_stat enic_tx_stats[] = {
        ENIC_TX_STAT(tx_frames_ok),
        ENIC_TX_STAT(tx_unicast_frames_ok),
@@ -143,7 +178,9 @@ static void enic_get_drvinfo(struct net_device *netdev,
 static void enic_get_strings(struct net_device *netdev, u32 stringset,
        u8 *data)
 {
+       struct enic *enic = netdev_priv(netdev);
        unsigned int i;
+       unsigned int j;
 
        switch (stringset) {
        case ETH_SS_STATS:
@@ -159,6 +196,20 @@ static void enic_get_strings(struct net_device *netdev, u32 stringset,
                        memcpy(data, enic_gen_stats[i].name, ETH_GSTRING_LEN);
                        data += ETH_GSTRING_LEN;
                }
+               for (i = 0; i < enic->rq_count; i++) {
+                       for (j = 0; j < NUM_ENIC_PER_RQ_STATS; j++) {
+                               snprintf(data, ETH_GSTRING_LEN,
+                                        enic_per_rq_stats[j].name, i);
+                               data += ETH_GSTRING_LEN;
+                       }
+               }
+               for (i = 0; i < enic->wq_count; i++) {
+                       for (j = 0; j < NUM_ENIC_PER_WQ_STATS; j++) {
+                               snprintf(data, ETH_GSTRING_LEN,
+                                        enic_per_wq_stats[j].name, i);
+                               data += ETH_GSTRING_LEN;
+                       }
+               }
                break;
        }
 }
@@ -244,10 +295,19 @@ err_out:
 
 static int enic_get_sset_count(struct net_device *netdev, int sset)
 {
+       struct enic *enic = netdev_priv(netdev);
+       unsigned int n_per_rq_stats;
+       unsigned int n_per_wq_stats;
+       unsigned int n_stats;
+
        switch (sset) {
        case ETH_SS_STATS:
-               return NUM_ENIC_TX_STATS + NUM_ENIC_RX_STATS +
-                       NUM_ENIC_GEN_STATS;
+               n_per_rq_stats = NUM_ENIC_PER_RQ_STATS * enic->rq_count;
+               n_per_wq_stats = NUM_ENIC_PER_WQ_STATS * enic->wq_count;
+               n_stats = NUM_ENIC_TX_STATS + NUM_ENIC_RX_STATS +
+                       NUM_ENIC_GEN_STATS +
+                       n_per_rq_stats + n_per_wq_stats;
+               return n_stats;
        default:
                return -EOPNOTSUPP;
        }
@@ -259,6 +319,7 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
        struct enic *enic = netdev_priv(netdev);
        struct vnic_stats *vstats;
        unsigned int i;
+       unsigned int j;
        int err;
 
        err = enic_dev_stats_dump(enic, &vstats);
@@ -275,6 +336,24 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
                *(data++) = ((u64 *)&vstats->rx)[enic_rx_stats[i].index];
        for (i = 0; i < NUM_ENIC_GEN_STATS; i++)
                *(data++) = ((u64 *)&enic->gen_stats)[enic_gen_stats[i].index];
+       for (i = 0; i < enic->rq_count; i++) {
+               struct enic_rq_stats *rqstats = &enic->rq_stats[i];
+               int index;
+
+               for (j = 0; j < NUM_ENIC_PER_RQ_STATS; j++) {
+                       index = enic_per_rq_stats[j].index;
+                       *(data++) = ((u64 *)rqstats)[index];
+               }
+       }
+       for (i = 0; i < enic->wq_count; i++) {
+               struct enic_wq_stats *wqstats = &enic->wq_stats[i];
+               int index;
+
+               for (j = 0; j < NUM_ENIC_PER_WQ_STATS; j++) {
+                       index = enic_per_wq_stats[j].index;
+                       *(data++) = ((u64 *)wqstats)[index];
+               }
+       }
 }
 
 static u32 enic_get_msglevel(struct net_device *netdev)