[PATCH net-next v2 1/3] bnxt: reorder logic in bnxt_get_stats64()
From: Jakub Kicinski <kuba@kernel.org>
Date: 2021-08-26 01:47:37
Subsystem:
broadcom bnxt_en 50 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Michael Chan, Pavan Chebbi, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Saved ring stats and port stats are completely disjoint. We can reorder getting the old stats and collecting new stats from rings with reading port stats. We can also use bnxt_add_prev_stats() instead of doing a struct assignment. With that we can use the same code for closed and open device, next commits will add more stats at the end of bnxt_get_stats64(). Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index ee66d410c82c..d39449e7b236 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c@@ -10673,14 +10673,8 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) * we check the BNXT_STATE_OPEN flag. */ smp_mb__after_atomic(); - if (!test_bit(BNXT_STATE_OPEN, &bp->state)) { - clear_bit(BNXT_STATE_READ_STATS, &bp->state); - *stats = bp->net_stats_prev; - return; - } - - bnxt_get_ring_stats(bp, stats); - bnxt_add_prev_stats(bp, stats); + if (!test_bit(BNXT_STATE_OPEN, &bp->state)) + goto skip_current; if (bp->flags & BNXT_FLAG_PORT_STATS) { u64 *rx = bp->port_stats.sw_stats;
@@ -10704,6 +10698,11 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) BNXT_GET_TX_PORT_STATS64(tx, tx_fifo_underruns); stats->tx_errors = BNXT_GET_TX_PORT_STATS64(tx, tx_err); } + + bnxt_get_ring_stats(bp, stats); +skip_current: + bnxt_add_prev_stats(bp, stats); + clear_bit(BNXT_STATE_READ_STATS, &bp->state); }
--
2.31.1