Commit 7de65149 authored Aug 26, 2020 by Michael Chan Committed by David S. Miller Aug 26, 2020

bnxt_en: Fix ethtool -S statitics with XDP or TCs enabled.

We are returning the wrong count for ETH_SS_STATS in get_sset_count()
when XDP or TCs are enabled. In a recent commit, we got rid of
irrelevant counters when the ring is RX only or TX only, but we
did not make the proper adjustments for the count. As a result,
when we have XDP or TCs enabled, we are returning an excess count
because some of the rings are TX only. This causes ethtool -S to
display extra counters with no counter names.

Fix bnxt_get_num_ring_stats() by not assuming that all rings will
always have RX and TX counters in combined mode.

Fixes: 125592fb ("bnxt_en: show only relevant ethtool stats for a TX or RX ring")
Reviewed-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent dbbfa96a

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -472,18 +472,11 @@ static int bnxt_get_num_tpa_ring_stats(struct bnxt *bp)
		static int bnxt_get_num_ring_stats(struct bnxt *bp)
		{
		int rx, tx, cmn;
		bool sh = false;

		if (bp->flags & BNXT_FLAG_SHARED_RINGS)
		sh = true;

		rx = NUM_RING_RX_HW_STATS + NUM_RING_RX_SW_STATS +
		bnxt_get_num_tpa_ring_stats(bp);
		tx = NUM_RING_TX_HW_STATS;
		cmn = NUM_RING_CMN_SW_STATS;
		if (sh)
		return (rx + tx + cmn) * bp->cp_nr_rings;
		else
		return rx * bp->rx_nr_rings + tx * bp->tx_nr_rings +
		cmn * bp->cp_nr_rings;
		}

Admin message