Commit 858b78b2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

eth: fbnic: fix saving stats from XDP_TX rings on close 



When rings are freed - stats get added to the device level stat
structs. Save the stats from the XDP_TX ring just as Tx stats.
Previously they would be saved to Rx and Tx stats. So we'd not
see XDP_TX packets as Rx during runtime but after an down/up cycle
the packets would appear in stats.

Correct the helper used by ethtool code which does a runtime
config switch.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Fixes: 5213ff08 ("eth: fbnic: Collect packet statistics for XDP")
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20251007232653.2099376-4-kuba@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 613e9e8d

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static void fbnic_aggregate_vector_counters(struct fbnic_net *fbn, 


	for (i = 0; i < nv->txt_count; i++) {

		fbnic_aggregate_ring_tx_counters(fbn, &nv->qt[i].sub0);

		fbnic_aggregate_ring_tx_counters(fbn, &nv->qt[i].sub1);

		fbnic_aggregate_ring_xdp_counters(fbn, &nv->qt[i].sub1);

		fbnic_aggregate_ring_tx_counters(fbn, &nv->qt[i].cmpl);

	}

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

+3 −5
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ void fbnic_aggregate_ring_tx_counters(struct fbnic_net *fbn, 
	BUILD_BUG_ON(sizeof(fbn->tx_stats.twq) / 8 != 6);

}



static void fbnic_aggregate_ring_xdp_counters(struct fbnic_net *fbn,

void fbnic_aggregate_ring_xdp_counters(struct fbnic_net *fbn,

				       struct fbnic_ring *xdpr)

{

	struct fbnic_queue_stats *stats = &xdpr->stats;
@@ -1442,9 +1442,7 @@ static void fbnic_aggregate_ring_xdp_counters(struct fbnic_net *fbn, 
		return;



	/* Capture stats from queues before dissasociating them */

	fbn->rx_stats.bytes += stats->bytes;

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

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

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

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

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

}

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

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ void fbnic_aggregate_ring_rx_counters(struct fbnic_net *fbn, 
				      struct fbnic_ring *rxr);

void fbnic_aggregate_ring_tx_counters(struct fbnic_net *fbn,

				      struct fbnic_ring *txr);

void fbnic_aggregate_ring_xdp_counters(struct fbnic_net *fbn,

				       struct fbnic_ring *xdpr);



int fbnic_alloc_napi_vectors(struct fbnic_net *fbn);

void fbnic_free_napi_vectors(struct fbnic_net *fbn);