i40e: Split bytes and packets from Rx/Tx stats

This makes it so that the Tx and Rx byte and packet counts are
separated from the rest of the statistics.  This allows for better
isolation of these stats when we move them into the 64 bit statistics.

Simplify things by re-ordering how the stats display in ethtool.
Instead of displaying all of the Tx queues as a block, followed by all
the Rx queues, the new order is Tx[0], Rx[0], Tx[1], Rx[1], ..., Tx[n],
Rx[n].  This reduces the loops and cleans up the display for testing
purposes since it is very easy to verify if flow director is doing the
right thing as the Tx and Rx queue pair are shown in pairs.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 657babe82c9c..d1b5bae15ea8 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -376,8 +376,12 @@ void i40e_vsi_reset_stats(struct i40e_vsi *vsi)
         memset(&vsi->eth_stats_offsets, 0, sizeof(vsi->eth_stats_offsets));
         if (vsi->rx_rings)
                 for (i = 0; i < vsi->num_queue_pairs; i++) {
+                        memset(&vsi->rx_rings[i].stats, 0 ,
+                               sizeof(vsi->rx_rings[i].stats));
                         memset(&vsi->rx_rings[i].rx_stats, 0 ,
                                sizeof(vsi->rx_rings[i].rx_stats));
+                        memset(&vsi->tx_rings[i].stats, 0 ,
+                               sizeof(vsi->tx_rings[i].stats));
                         memset(&vsi->tx_rings[i].tx_stats, 0,
                                sizeof(vsi->tx_rings[i].tx_stats));
                 }
@@ -708,14 +712,14 @@ void i40e_update_stats(struct i40e_vsi *vsi)
                 struct i40e_ring *p;
 
                 p = &vsi->rx_rings[q];
-                rx_b += p->rx_stats.bytes;
-                rx_p += p->rx_stats.packets;
+                rx_b += p->stats.bytes;
+                rx_p += p->stats.packets;
                 rx_buf += p->rx_stats.alloc_rx_buff_failed;
                 rx_page += p->rx_stats.alloc_rx_page_failed;
 
                 p = &vsi->tx_rings[q];
-                tx_b += p->tx_stats.bytes;
-                tx_p += p->tx_stats.packets;
+                tx_b += p->stats.bytes;
+                tx_p += p->stats.packets;
                 tx_restart += p->tx_stats.restart_queue;
                 tx_busy += p->tx_stats.tx_busy;
         }