net :mana :Add remaining GDMA stats for MANA to ethtool

Extend performance counter stats in 'ethtool -S <interface>'
for MANA VF to include all GDMA stat counter.

Tested-on: Ubuntu22
Testcases:
1. LISA testcase:
PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-Synthetic
2. LISA testcase:
PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-SRIOV

Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
Link: https://lore.kernel.org/r/1700830950-803-1-git-send-email-shradhagupta@linux.microsoft.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index fc3d2903a80f53792c568940c32fa58540a6ae9c..6b857188b9dac7ac8c42fd2acd617532543ab22d 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -2385,13 +2385,33 @@ void mana_query_gf_stats(struct mana_port_context *apc)
 
        mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_GF_STAT,
                             sizeof(req), sizeof(resp));
-       req.req_stats = STATISTICS_FLAGS_HC_TX_BYTES |
+       req.req_stats = STATISTICS_FLAGS_RX_DISCARDS_NO_WQE |
+                       STATISTICS_FLAGS_RX_ERRORS_VPORT_DISABLED |
+                       STATISTICS_FLAGS_HC_RX_BYTES |
+                       STATISTICS_FLAGS_HC_RX_UCAST_PACKETS |
+                       STATISTICS_FLAGS_HC_RX_UCAST_BYTES |
+                       STATISTICS_FLAGS_HC_RX_MCAST_PACKETS |
+                       STATISTICS_FLAGS_HC_RX_MCAST_BYTES |
+                       STATISTICS_FLAGS_HC_RX_BCAST_PACKETS |
+                       STATISTICS_FLAGS_HC_RX_BCAST_BYTES |
+                       STATISTICS_FLAGS_TX_ERRORS_GF_DISABLED |
+                       STATISTICS_FLAGS_TX_ERRORS_VPORT_DISABLED |
+                       STATISTICS_FLAGS_TX_ERRORS_INVAL_VPORT_OFFSET_PACKETS |
+                       STATISTICS_FLAGS_TX_ERRORS_VLAN_ENFORCEMENT |
+                       STATISTICS_FLAGS_TX_ERRORS_ETH_TYPE_ENFORCEMENT |
+                       STATISTICS_FLAGS_TX_ERRORS_SA_ENFORCEMENT |
+                       STATISTICS_FLAGS_TX_ERRORS_SQPDID_ENFORCEMENT |
+                       STATISTICS_FLAGS_TX_ERRORS_CQPDID_ENFORCEMENT |
+                       STATISTICS_FLAGS_TX_ERRORS_MTU_VIOLATION |
+                       STATISTICS_FLAGS_TX_ERRORS_INVALID_OOB |
+                       STATISTICS_FLAGS_HC_TX_BYTES |
                        STATISTICS_FLAGS_HC_TX_UCAST_PACKETS |
                        STATISTICS_FLAGS_HC_TX_UCAST_BYTES |
                        STATISTICS_FLAGS_HC_TX_MCAST_PACKETS |
                        STATISTICS_FLAGS_HC_TX_MCAST_BYTES |
                        STATISTICS_FLAGS_HC_TX_BCAST_PACKETS |
-                       STATISTICS_FLAGS_HC_TX_BCAST_BYTES;
+                       STATISTICS_FLAGS_HC_TX_BCAST_BYTES |
+                       STATISTICS_FLAGS_TX_ERRORS_GDMA_ERROR;
 
        err = mana_send_request(apc->ac, &req, sizeof(req), &resp,
                                sizeof(resp));
@@ -2407,6 +2427,30 @@ void mana_query_gf_stats(struct mana_port_context *apc)
                return;
        }
 
+       apc->eth_stats.hc_rx_discards_no_wqe = resp.rx_discards_nowqe;
+       apc->eth_stats.hc_rx_err_vport_disabled = resp.rx_err_vport_disabled;
+       apc->eth_stats.hc_rx_bytes = resp.hc_rx_bytes;
+       apc->eth_stats.hc_rx_ucast_pkts = resp.hc_rx_ucast_pkts;
+       apc->eth_stats.hc_rx_ucast_bytes = resp.hc_rx_ucast_bytes;
+       apc->eth_stats.hc_rx_bcast_pkts = resp.hc_rx_bcast_pkts;
+       apc->eth_stats.hc_rx_bcast_bytes = resp.hc_rx_bcast_bytes;
+       apc->eth_stats.hc_rx_mcast_pkts = resp.hc_rx_mcast_pkts;
+       apc->eth_stats.hc_rx_mcast_bytes = resp.hc_rx_mcast_bytes;
+       apc->eth_stats.hc_tx_err_gf_disabled = resp.tx_err_gf_disabled;
+       apc->eth_stats.hc_tx_err_vport_disabled = resp.tx_err_vport_disabled;
+       apc->eth_stats.hc_tx_err_inval_vportoffset_pkt =
+                                            resp.tx_err_inval_vport_offset_pkt;
+       apc->eth_stats.hc_tx_err_vlan_enforcement =
+                                            resp.tx_err_vlan_enforcement;
+       apc->eth_stats.hc_tx_err_eth_type_enforcement =
+                                            resp.tx_err_ethtype_enforcement;
+       apc->eth_stats.hc_tx_err_sa_enforcement = resp.tx_err_SA_enforcement;
+       apc->eth_stats.hc_tx_err_sqpdid_enforecement =
+                                            resp.tx_err_SQPDID_enforcement;
+       apc->eth_stats.hc_tx_err_cqpdid_enforcement =
+                                            resp.tx_err_CQPDID_enforcement;
+       apc->eth_stats.hc_tx_err_mtu_violation = resp.tx_err_mtu_violation;
+       apc->eth_stats.hc_tx_err_inval_oob = resp.tx_err_inval_oob;
        apc->eth_stats.hc_tx_bytes = resp.hc_tx_bytes;
        apc->eth_stats.hc_tx_ucast_pkts = resp.hc_tx_ucast_pkts;
        apc->eth_stats.hc_tx_ucast_bytes = resp.hc_tx_ucast_bytes;
@@ -2414,6 +2458,7 @@ void mana_query_gf_stats(struct mana_port_context *apc)
        apc->eth_stats.hc_tx_bcast_bytes = resp.hc_tx_bcast_bytes;
        apc->eth_stats.hc_tx_mcast_pkts = resp.hc_tx_mcast_pkts;
        apc->eth_stats.hc_tx_mcast_bytes = resp.hc_tx_mcast_bytes;
+       apc->eth_stats.hc_tx_err_gdma = resp.tx_err_gdma;
 }
 
 static int mana_init_port(struct net_device *ndev)

diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index 607150165ab4b2ad924e7af63f495c8f4057b60f..7077d647d99a6a063bbbf03aac234deaff4d45d7 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -13,6 +13,46 @@ static const struct {
 } mana_eth_stats[] = {
        {"stop_queue", offsetof(struct mana_ethtool_stats, stop_queue)},
        {"wake_queue", offsetof(struct mana_ethtool_stats, wake_queue)},
+       {"hc_rx_discards_no_wqe", offsetof(struct mana_ethtool_stats,
+                                          hc_rx_discards_no_wqe)},
+       {"hc_rx_err_vport_disabled", offsetof(struct mana_ethtool_stats,
+                                             hc_rx_err_vport_disabled)},
+       {"hc_rx_bytes", offsetof(struct mana_ethtool_stats, hc_rx_bytes)},
+       {"hc_rx_ucast_pkts", offsetof(struct mana_ethtool_stats,
+                                     hc_rx_ucast_pkts)},
+       {"hc_rx_ucast_bytes", offsetof(struct mana_ethtool_stats,
+                                      hc_rx_ucast_bytes)},
+       {"hc_rx_bcast_pkts", offsetof(struct mana_ethtool_stats,
+                                     hc_rx_bcast_pkts)},
+       {"hc_rx_bcast_bytes", offsetof(struct mana_ethtool_stats,
+                                      hc_rx_bcast_bytes)},
+       {"hc_rx_mcast_pkts", offsetof(struct mana_ethtool_stats,
+                       hc_rx_mcast_pkts)},
+       {"hc_rx_mcast_bytes", offsetof(struct mana_ethtool_stats,
+                                      hc_rx_mcast_bytes)},
+       {"hc_tx_err_gf_disabled", offsetof(struct mana_ethtool_stats,
+                                          hc_tx_err_gf_disabled)},
+       {"hc_tx_err_vport_disabled", offsetof(struct mana_ethtool_stats,
+                                             hc_tx_err_vport_disabled)},
+       {"hc_tx_err_inval_vportoffset_pkt",
+        offsetof(struct mana_ethtool_stats,
+                 hc_tx_err_inval_vportoffset_pkt)},
+       {"hc_tx_err_vlan_enforcement", offsetof(struct mana_ethtool_stats,
+                                               hc_tx_err_vlan_enforcement)},
+       {"hc_tx_err_eth_type_enforcement",
+        offsetof(struct mana_ethtool_stats, hc_tx_err_eth_type_enforcement)},
+       {"hc_tx_err_sa_enforcement", offsetof(struct mana_ethtool_stats,
+                                             hc_tx_err_sa_enforcement)},
+       {"hc_tx_err_sqpdid_enforecement",
+        offsetof(struct mana_ethtool_stats, hc_tx_err_sqpdid_enforecement)},
+       {"hc_tx_err_cqpdid_enforcement",
+        offsetof(struct mana_ethtool_stats, hc_tx_err_cqpdid_enforcement)},
+       {"hc_tx_err_mtu_violation", offsetof(struct mana_ethtool_stats,
+                                            hc_tx_err_mtu_violation)},
+       {"hc_tx_err_inval_oob", offsetof(struct mana_ethtool_stats,
+                                        hc_tx_err_inval_oob)},
+       {"hc_tx_err_gdma", offsetof(struct mana_ethtool_stats,
+                                   hc_tx_err_gdma)},
        {"hc_tx_bytes", offsetof(struct mana_ethtool_stats, hc_tx_bytes)},
        {"hc_tx_ucast_pkts", offsetof(struct mana_ethtool_stats,
                                        hc_tx_ucast_pkts)},

diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 6e3e9c1363dba916b5e22033cad9793cbfc6b394..5567f5bc8eb665b9210c3c49982c5996bb667d94 100644 (file)
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -353,6 +353,25 @@ struct mana_tx_qp {
 struct mana_ethtool_stats {
        u64 stop_queue;
        u64 wake_queue;
+       u64 hc_rx_discards_no_wqe;
+       u64 hc_rx_err_vport_disabled;
+       u64 hc_rx_bytes;
+       u64 hc_rx_ucast_pkts;
+       u64 hc_rx_ucast_bytes;
+       u64 hc_rx_bcast_pkts;
+       u64 hc_rx_bcast_bytes;
+       u64 hc_rx_mcast_pkts;
+       u64 hc_rx_mcast_bytes;
+       u64 hc_tx_err_gf_disabled;
+       u64 hc_tx_err_vport_disabled;
+       u64 hc_tx_err_inval_vportoffset_pkt;
+       u64 hc_tx_err_vlan_enforcement;
+       u64 hc_tx_err_eth_type_enforcement;
+       u64 hc_tx_err_sa_enforcement;
+       u64 hc_tx_err_sqpdid_enforecement;
+       u64 hc_tx_err_cqpdid_enforcement;
+       u64 hc_tx_err_mtu_violation;
+       u64 hc_tx_err_inval_oob;
        u64 hc_tx_bytes;
        u64 hc_tx_ucast_pkts;
        u64 hc_tx_ucast_bytes;
@@ -360,6 +379,7 @@ struct mana_ethtool_stats {
        u64 hc_tx_bcast_bytes;
        u64 hc_tx_mcast_pkts;
        u64 hc_tx_mcast_bytes;
+       u64 hc_tx_err_gdma;
        u64 tx_cqe_err;
        u64 tx_cqe_unknown_type;
        u64 rx_coalesced_err;
@@ -602,8 +622,8 @@ struct mana_query_gf_stat_resp {
        struct gdma_resp_hdr hdr;
        u64 reported_stats;
        /* rx errors/discards */
-       u64 discard_rx_nowqe;
-       u64 err_rx_vport_disabled;
+       u64 rx_discards_nowqe;
+       u64 rx_err_vport_disabled;
        /* rx bytes/packets */
        u64 hc_rx_bytes;
        u64 hc_rx_ucast_pkts;
@@ -613,16 +633,16 @@ struct mana_query_gf_stat_resp {
        u64 hc_rx_mcast_pkts;
        u64 hc_rx_mcast_bytes;
        /* tx errors */
-       u64 err_tx_gf_disabled;
-       u64 err_tx_vport_disabled;
-       u64 err_tx_inval_vport_offset_pkt;
-       u64 err_tx_vlan_enforcement;
-       u64 err_tx_ethtype_enforcement;
-       u64 err_tx_SA_enforecement;
-       u64 err_tx_SQPDID_enforcement;
-       u64 err_tx_CQPDID_enforcement;
-       u64 err_tx_mtu_violation;
-       u64 err_tx_inval_oob;
+       u64 tx_err_gf_disabled;
+       u64 tx_err_vport_disabled;
+       u64 tx_err_inval_vport_offset_pkt;
+       u64 tx_err_vlan_enforcement;
+       u64 tx_err_ethtype_enforcement;
+       u64 tx_err_SA_enforcement;
+       u64 tx_err_SQPDID_enforcement;
+       u64 tx_err_CQPDID_enforcement;
+       u64 tx_err_mtu_violation;
+       u64 tx_err_inval_oob;
        /* tx bytes/packets */
        u64 hc_tx_bytes;
        u64 hc_tx_ucast_pkts;
@@ -632,7 +652,7 @@ struct mana_query_gf_stat_resp {
        u64 hc_tx_mcast_pkts;
        u64 hc_tx_mcast_bytes;
        /* tx error */
-       u64 err_tx_gdma;
+       u64 tx_err_gdma;
 }; /* HW DATA */
 
 /* Configure vPort Rx Steering */