Commit ad21f668 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'eth-fbnic-fix-drop-stats-support' 

Mohsin Bashir says:

====================
eth: fbnic: Fix drop stats support

Fix hardware drop stats support on the TX path of fbnic by addressing two
issues: ensure that tx_dropped stats are correctly copied to the
rtnl_link_stats64 struct, and protect the copying of drop stats from
fdb->hw_stats to the local variable with the hw_stats_lock to
ensure consistency.
====================

Link: https://patch.msgid.link/20250802024636.679317-1-mohsin.bashr@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e407fcee 53abd9c8

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

+6 −4
Original line number Diff line number Diff line
@@ -422,15 +422,17 @@ static void fbnic_get_stats64(struct net_device *dev, 
	tx_packets = stats->packets;

	tx_dropped = stats->dropped;



	stats64->tx_bytes = tx_bytes;

	stats64->tx_packets = tx_packets;

	stats64->tx_dropped = tx_dropped;



	/* Record drops from Tx HW Datapath */

	spin_lock(&fbd->hw_stats_lock);

	tx_dropped += fbd->hw_stats.tmi.drop.frames.value +

		      fbd->hw_stats.tti.cm_drop.frames.value +

		      fbd->hw_stats.tti.frame_drop.frames.value +

		      fbd->hw_stats.tti.tbi_drop.frames.value;

	spin_unlock(&fbd->hw_stats_lock);



	stats64->tx_bytes = tx_bytes;

	stats64->tx_packets = tx_packets;

	stats64->tx_dropped = tx_dropped;



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

		struct fbnic_ring *txr = fbn->tx[i];