igc: Introduce TX/RX stats helpers

In preparation for AF_XDP zero-copy support, encapsulate the code that
updates the driver RX stats in its own local helper so it can be reused
in the zero-copy path. Likewise, encapsulate TX stats code as well.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 90d8e4355f43a2cc05e661f62858a509ff88719b..5a262bab9116162306d52e01ea182232571ea63b 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2111,6 +2111,20 @@ static void igc_finalize_xdp(struct igc_adapter *adapter, int status)
                xdp_do_flush();
 }
 
+static void igc_update_rx_stats(struct igc_q_vector *q_vector,
+                               unsigned int packets, unsigned int bytes)
+{
+       struct igc_ring *ring = q_vector->rx.ring;
+
+       u64_stats_update_begin(&ring->rx_syncp);
+       ring->rx_stats.packets += packets;
+       ring->rx_stats.bytes += bytes;
+       u64_stats_update_end(&ring->rx_syncp);
+
+       q_vector->rx.total_packets += packets;
+       q_vector->rx.total_bytes += bytes;
+}
+
 static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
 {
        unsigned int total_bytes = 0, total_packets = 0;
@@ -2231,12 +2245,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
        /* place incomplete frames back on ring for completion */
        rx_ring->skb = skb;
 
-       u64_stats_update_begin(&rx_ring->rx_syncp);
-       rx_ring->rx_stats.packets += total_packets;
-       rx_ring->rx_stats.bytes += total_bytes;
-       u64_stats_update_end(&rx_ring->rx_syncp);
-       q_vector->rx.total_packets += total_packets;
-       q_vector->rx.total_bytes += total_bytes;
+       igc_update_rx_stats(q_vector, total_packets, total_bytes);
 
        if (cleaned_count)
                igc_alloc_rx_buffers(rx_ring, cleaned_count);
@@ -2244,6 +2253,20 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget)
        return total_packets;
 }
 
+static void igc_update_tx_stats(struct igc_q_vector *q_vector,
+                               unsigned int packets, unsigned int bytes)
+{
+       struct igc_ring *ring = q_vector->tx.ring;
+
+       u64_stats_update_begin(&ring->tx_syncp);
+       ring->tx_stats.bytes += bytes;
+       ring->tx_stats.packets += packets;
+       u64_stats_update_end(&ring->tx_syncp);
+
+       q_vector->tx.total_bytes += bytes;
+       q_vector->tx.total_packets += packets;
+}
+
 /**
  * igc_clean_tx_irq - Reclaim resources after transmit completes
  * @q_vector: pointer to q_vector containing needed info
@@ -2346,12 +2369,8 @@ static bool igc_clean_tx_irq(struct igc_q_vector *q_vector, int napi_budget)
 
        i += tx_ring->count;
        tx_ring->next_to_clean = i;
-       u64_stats_update_begin(&tx_ring->tx_syncp);
-       tx_ring->tx_stats.bytes += total_bytes;
-       tx_ring->tx_stats.packets += total_packets;
-       u64_stats_update_end(&tx_ring->tx_syncp);
-       q_vector->tx.total_bytes += total_bytes;
-       q_vector->tx.total_packets += total_packets;
+
+       igc_update_tx_stats(q_vector, total_packets, total_bytes);
 
        if (test_bit(IGC_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags)) {
                struct igc_hw *hw = &adapter->hw;