Commit 93d2f2f3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

eth: fbnic: wrap tx queue stats in a struct 



The queue stats struct is used for Rx and Tx queues. Wrap
the Tx stats in a struct and a union, so that we can reuse
the same space for Rx stats on Rx queues.

This also makes it easy to add an assert to the stat handling
code to catch new stats not being aggregated on shutdown.

Acked-by: default avatarJoe Damato <jdamato@fastly.com>
Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Link: https://patch.msgid.link/20250211181356.580800-3-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 34eea78a

drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -1224,14 +1224,14 @@ static void fbnic_get_ts_stats(struct net_device *netdev, 
	unsigned int start;

	int i;



	ts_stats->pkts = fbn->tx_stats.ts_packets;

	ts_stats->lost = fbn->tx_stats.ts_lost;

	ts_stats->pkts = fbn->tx_stats.twq.ts_packets;

	ts_stats->lost = fbn->tx_stats.twq.ts_lost;

	for (i = 0; i < fbn->num_tx_queues; i++) {

		ring = fbn->tx[i];

		do {

			start = u64_stats_fetch_begin(&ring->stats.syncp);

			ts_packets = ring->stats.ts_packets;

			ts_lost = ring->stats.ts_lost;

			ts_packets = ring->stats.twq.ts_packets;

			ts_lost = ring->stats.twq.ts_lost;

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

		ts_stats->pkts += ts_packets;

		ts_stats->lost += ts_lost;

drivers/net/ethernet/meta/fbnic/fbnic_txrx.c

+6 −4
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static void fbnic_clean_twq0(struct fbnic_napi_vector *nv, int napi_budget, 
	if (unlikely(discard)) {

		u64_stats_update_begin(&ring->stats.syncp);

		ring->stats.dropped += total_packets;

		ring->stats.ts_lost += ts_lost;

		ring->stats.twq.ts_lost += ts_lost;

		u64_stats_update_end(&ring->stats.syncp);



		netdev_tx_completed_queue(txq, total_packets, total_bytes);
@@ -507,7 +507,7 @@ static void fbnic_clean_tsq(struct fbnic_napi_vector *nv, 


	skb_tstamp_tx(skb, &hwtstamp);

	u64_stats_update_begin(&ring->stats.syncp);

	ring->stats.ts_packets++;

	ring->stats.twq.ts_packets++;

	u64_stats_update_end(&ring->stats.syncp);

}
@@ -1065,8 +1065,10 @@ void fbnic_aggregate_ring_tx_counters(struct fbnic_net *fbn, 
	fbn->tx_stats.bytes += stats->bytes;

	fbn->tx_stats.packets += stats->packets;

	fbn->tx_stats.dropped += stats->dropped;

	fbn->tx_stats.ts_lost += stats->ts_lost;

	fbn->tx_stats.ts_packets += stats->ts_packets;

	fbn->tx_stats.twq.ts_lost += stats->twq.ts_lost;

	fbn->tx_stats.twq.ts_packets += stats->twq.ts_packets;

	/* Remember to add new stats here */

	BUILD_BUG_ON(sizeof(fbn->tx_stats.twq) / 8 != 2);

}



static void fbnic_remove_tx_ring(struct fbnic_net *fbn,

drivers/net/ethernet/meta/fbnic/fbnic_txrx.h

+6 −2
Original line number Diff line number Diff line
@@ -56,9 +56,13 @@ struct fbnic_pkt_buff { 
struct fbnic_queue_stats {

	u64 packets;

	u64 bytes;

	u64 dropped;

	union {

		struct {

			u64 ts_packets;

			u64 ts_lost;

		} twq;

	};

	u64 dropped;

	struct u64_stats_sync syncp;

};