sfc: Expose TX push and TSO counters through ethtool statistics

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 52fa661aede..158d5b5630b 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -28,7 +28,8 @@ struct efx_ethtool_stat {
         enum {
                 EFX_ETHTOOL_STAT_SOURCE_mac_stats,
                 EFX_ETHTOOL_STAT_SOURCE_nic,
-                EFX_ETHTOOL_STAT_SOURCE_channel
+                EFX_ETHTOOL_STAT_SOURCE_channel,
+                EFX_ETHTOOL_STAT_SOURCE_tx_queue
         } source;
         unsigned offset;
         u64(*get_stat) (void *field); /* Reader function */
@@ -86,6 +87,10 @@ static u64 efx_get_atomic_stat(void *field)
         EFX_ETHTOOL_STAT(field, channel, n_##field,             \
                          unsigned int, efx_get_uint_stat)
 
+#define EFX_ETHTOOL_UINT_TXQ_STAT(field)                        \
+        EFX_ETHTOOL_STAT(tx_##field, tx_queue, field,           \
+                         unsigned int, efx_get_uint_stat)
+
 static struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_U64_MAC_STAT(tx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(tx_good_bytes),
@@ -116,6 +121,10 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_non_tcpudp),
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_mac_src_error),
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_ip_src_error),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_bursts),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_long_headers),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_packets),
+        EFX_ETHTOOL_UINT_TXQ_STAT(pushes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_good_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_bad_bytes),
@@ -470,6 +479,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
         struct efx_ethtool_stat *stat;
         struct efx_channel *channel;
+        struct efx_tx_queue *tx_queue;
         struct rtnl_link_stats64 temp;
         int i;
 
@@ -495,6 +505,15 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
                                 data[i] += stat->get_stat((void *)channel +
                                                           stat->offset);
                         break;
+                case EFX_ETHTOOL_STAT_SOURCE_tx_queue:
+                        data[i] = 0;
+                        efx_for_each_channel(channel, efx) {
+                                efx_for_each_channel_tx_queue(tx_queue, channel)
+                                        data[i] +=
+                                                stat->get_stat((void *)tx_queue
+                                                               + stat->offset);
+                        }
+                        break;
                 }
         }
 }