Commit fb5b8f3c authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: pass pointer to ice_fetch_u64_stats_per_ring 



The ice_fetch_u64_stats_per_ring function takes a pointer to the syncp from
the ring stats to synchronize reading of the packet stats. It also takes a
*copy* of the ice_q_stats fields instead of a pointer to the stats. This
completely defeats the point of using the u64_stats API. We pass the stats
by value, so they are static at the point of reading within the
u64_stats_fetch_retry loop.

Simplify the function to take a pointer to the ice_ring_stats instead of
two separate parameters. Additionally, since we never call this outside of
ice_main.c, make it a static function.

Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent bf2e36c9

drivers/net/ethernet/intel/ice/ice.h

+0 −3
Original line number Diff line number Diff line
@@ -957,9 +957,6 @@ u16 ice_get_avail_rxq_count(struct ice_pf *pf); 
int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked);

void ice_update_vsi_stats(struct ice_vsi *vsi);

void ice_update_pf_stats(struct ice_pf *pf);

void

ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp,

			     struct ice_q_stats stats, u64 *pkts, u64 *bytes);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);

int ice_down_up(struct ice_vsi *vsi);

drivers/net/ethernet/intel/ice/ice_main.c

+9 −15
Original line number Diff line number Diff line
@@ -6824,25 +6824,23 @@ int ice_up(struct ice_vsi *vsi) 


/**

 * ice_fetch_u64_stats_per_ring - get packets and bytes stats per ring

 * @syncp: pointer to u64_stats_sync

 * @stats: stats that pkts and bytes count will be taken from

 * @stats: pointer to ring stats structure

 * @pkts: packets stats counter

 * @bytes: bytes stats counter

 *

 * This function fetches stats from the ring considering the atomic operations

 * that needs to be performed to read u64 values in 32 bit machine.

 */

void

ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp,

			     struct ice_q_stats stats, u64 *pkts, u64 *bytes)

static void ice_fetch_u64_stats_per_ring(struct ice_ring_stats *stats,

					 u64 *pkts, u64 *bytes)

{

	unsigned int start;



	do {

		start = u64_stats_fetch_begin(syncp);

		*pkts = stats.pkts;

		*bytes = stats.bytes;

	} while (u64_stats_fetch_retry(syncp, start));

		start = u64_stats_fetch_begin(&stats->syncp);

		*pkts = stats->stats.pkts;

		*bytes = stats->stats.bytes;

	} while (u64_stats_fetch_retry(&stats->syncp, start));

}



/**
@@ -6866,9 +6864,7 @@ ice_update_vsi_tx_ring_stats(struct ice_vsi *vsi, 
		ring = READ_ONCE(rings[i]);

		if (!ring || !ring->ring_stats)

			continue;

		ice_fetch_u64_stats_per_ring(&ring->ring_stats->syncp,

					     ring->ring_stats->stats, &pkts,

					     &bytes);

		ice_fetch_u64_stats_per_ring(ring->ring_stats, &pkts, &bytes);

		vsi_stats->tx_packets += pkts;

		vsi_stats->tx_bytes += bytes;

		vsi->tx_restart += ring->ring_stats->tx_stats.restart_q;
@@ -6912,9 +6908,7 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi) 
		struct ice_ring_stats *ring_stats;



		ring_stats = ring->ring_stats;

		ice_fetch_u64_stats_per_ring(&ring_stats->syncp,

					     ring_stats->stats, &pkts,

					     &bytes);

		ice_fetch_u64_stats_per_ring(ring_stats, &pkts, &bytes);

		vsi_stats->rx_packets += pkts;

		vsi_stats->rx_bytes += bytes;

		vsi->rx_buf_failed += ring_stats->rx_stats.alloc_buf_failed;