Commit aa620993 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: pull per-q stats work out of queue loops 



Abstract out the per-queue data collection work into separate
functions from the per-queue loops in the stats reporting,
similar to what Alex did for the data label strings in
commit acebe5b6 ("ionic: Update driver to use ethtool_sprintf")

Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2b9a8d7

drivers/net/ethernet/pensando/ionic/ionic_stats.c

+125 −94
Original line number Diff line number Diff line
@@ -177,26 +177,24 @@ static const struct ionic_stat_desc ionic_dbg_napi_stats_desc[] = { 


#define MAX_Q(lif)   ((lif)->netdev->real_num_tx_queues)



static void ionic_get_lif_stats(struct ionic_lif *lif,

static void ionic_add_lif_txq_stats(struct ionic_lif *lif, int q_num,

				    struct ionic_lif_sw_stats *stats)

{

	struct ionic_tx_stats *txstats;

	struct ionic_rx_stats *rxstats;

	struct rtnl_link_stats64 ns;

	int q_num;



	memset(stats, 0, sizeof(*stats));

	struct ionic_tx_stats *txstats = &lif->txqstats[q_num];



	for (q_num = 0; q_num < MAX_Q(lif); q_num++) {

		txstats = &lif->txqstats[q_num];

	stats->tx_packets += txstats->pkts;

	stats->tx_bytes += txstats->bytes;

	stats->tx_tso += txstats->tso;

	stats->tx_tso_bytes += txstats->tso_bytes;

	stats->tx_csum_none += txstats->csum_none;

	stats->tx_csum += txstats->csum;

}



static void ionic_add_lif_rxq_stats(struct ionic_lif *lif, int q_num,

				    struct ionic_lif_sw_stats *stats)

{

	struct ionic_rx_stats *rxstats = &lif->rxqstats[q_num];



		rxstats = &lif->rxqstats[q_num];

	stats->rx_packets += rxstats->pkts;

	stats->rx_bytes += rxstats->bytes;

	stats->rx_csum_none += rxstats->csum_none;
@@ -204,6 +202,19 @@ static void ionic_get_lif_stats(struct ionic_lif *lif, 
	stats->rx_csum_error += rxstats->csum_error;

}



static void ionic_get_lif_stats(struct ionic_lif *lif,

				struct ionic_lif_sw_stats *stats)

{

	struct rtnl_link_stats64 ns;

	int q_num;



	memset(stats, 0, sizeof(*stats));



	for (q_num = 0; q_num < MAX_Q(lif); q_num++) {

		ionic_add_lif_txq_stats(lif, q_num, stats);

		ionic_add_lif_rxq_stats(lif, q_num, stats);

	}



	ionic_get_stats64(lif->netdev, &ns);

	stats->hw_tx_dropped = ns.tx_dropped;

	stats->hw_rx_dropped = ns.rx_dropped;
@@ -214,16 +225,12 @@ static void ionic_get_lif_stats(struct ionic_lif *lif, 


static u64 ionic_sw_stats_get_count(struct ionic_lif *lif)

{

	u64 total = 0;

	u64 total = 0, tx_queues = MAX_Q(lif), rx_queues = MAX_Q(lif);



	/* lif stats */

	total += IONIC_NUM_LIF_STATS;



	/* tx stats */

	total += MAX_Q(lif) * IONIC_NUM_TX_STATS;



	/* rx stats */

	total += MAX_Q(lif) * IONIC_NUM_RX_STATS;

	total += tx_queues * IONIC_NUM_TX_STATS;

	total += rx_queues * IONIC_NUM_RX_STATS;



	/* port stats */

	total += IONIC_NUM_PORT_STATS;
@@ -231,13 +238,13 @@ static u64 ionic_sw_stats_get_count(struct ionic_lif *lif) 
	if (test_bit(IONIC_LIF_F_UP, lif->state) &&

	    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

		/* tx debug stats */

		total += MAX_Q(lif) * (IONIC_NUM_DBG_CQ_STATS +

		total += tx_queues * (IONIC_NUM_DBG_CQ_STATS +

				      IONIC_NUM_TX_Q_STATS +

				      IONIC_NUM_DBG_INTR_STATS +

				      IONIC_MAX_NUM_SG_CNTR);



		/* rx debug stats */

		total += MAX_Q(lif) * (IONIC_NUM_DBG_CQ_STATS +

		total += rx_queues * (IONIC_NUM_DBG_CQ_STATS +

				      IONIC_NUM_DBG_INTR_STATS +

				      IONIC_NUM_DBG_NAPI_STATS +

				      IONIC_MAX_NUM_NAPI_CNTR);
@@ -315,40 +322,24 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) 
		ionic_sw_stats_get_rx_strings(lif, buf, q_num);

}



static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf)

static void ionic_sw_stats_get_txq_values(struct ionic_lif *lif, u64 **buf,

					  int q_num)

{

	struct ionic_port_stats *port_stats;

	struct ionic_lif_sw_stats lif_stats;

	struct ionic_qcq *txqcq, *rxqcq;

	struct ionic_tx_stats *txstats;

	struct ionic_rx_stats *rxstats;

	int i, q_num;



	ionic_get_lif_stats(lif, &lif_stats);



	for (i = 0; i < IONIC_NUM_LIF_STATS; i++) {

		**buf = IONIC_READ_STAT64(&lif_stats, &ionic_lif_stats_desc[i]);

		(*buf)++;

	}



	port_stats = &lif->ionic->idev.port_info->stats;

	for (i = 0; i < IONIC_NUM_PORT_STATS; i++) {

		**buf = IONIC_READ_STAT_LE64(port_stats,

					     &ionic_port_stats_desc[i]);

		(*buf)++;

	}

	struct ionic_qcq *txqcq;

	int i;



	for (q_num = 0; q_num < MAX_Q(lif); q_num++) {

	txstats = &lif->txqstats[q_num];



	for (i = 0; i < IONIC_NUM_TX_STATS; i++) {

			**buf = IONIC_READ_STAT64(txstats,

						  &ionic_tx_stats_desc[i]);

		**buf = IONIC_READ_STAT64(txstats, &ionic_tx_stats_desc[i]);

		(*buf)++;

	}



		if (test_bit(IONIC_LIF_F_UP, lif->state) &&

		    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

	if (!test_bit(IONIC_LIF_F_UP, lif->state) ||

	    !test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		return;



	txqcq = lif->txqcqs[q_num];

	for (i = 0; i < IONIC_NUM_TX_Q_STATS; i++) {

		**buf = IONIC_READ_STAT64(&txqcq->q,
@@ -365,24 +356,39 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) 
					  &ionic_dbg_intr_stats_desc[i]);

		(*buf)++;

	}

	for (i = 0; i < IONIC_NUM_DBG_NAPI_STATS; i++) {

		**buf = IONIC_READ_STAT64(&txqcq->napi_stats,

					  &ionic_dbg_napi_stats_desc[i]);

		(*buf)++;

	}

	for (i = 0; i < IONIC_MAX_NUM_NAPI_CNTR; i++) {

		**buf = txqcq->napi_stats.work_done_cntr[i];

		(*buf)++;

	}

	for (i = 0; i < IONIC_MAX_NUM_SG_CNTR; i++) {

		**buf = txstats->sg_cntr[i];

		(*buf)++;

	}

}

	}



	for (q_num = 0; q_num < MAX_Q(lif); q_num++) {

static void ionic_sw_stats_get_rxq_values(struct ionic_lif *lif, u64 **buf,

					  int q_num)

{

	struct ionic_rx_stats *rxstats;

	struct ionic_qcq *rxqcq;

	int i;



	rxstats = &lif->rxqstats[q_num];



	for (i = 0; i < IONIC_NUM_RX_STATS; i++) {

			**buf = IONIC_READ_STAT64(rxstats,

						  &ionic_rx_stats_desc[i]);

		**buf = IONIC_READ_STAT64(rxstats, &ionic_rx_stats_desc[i]);

		(*buf)++;

	}



		if (test_bit(IONIC_LIF_F_UP, lif->state) &&

		    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

	if (!test_bit(IONIC_LIF_F_UP, lif->state) ||

	    !test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		return;



	rxqcq = lif->rxqcqs[q_num];

	for (i = 0; i < IONIC_NUM_DBG_CQ_STATS; i++) {

		**buf = IONIC_READ_STAT64(&rxqcq->cq,
@@ -404,7 +410,32 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) 
		(*buf)++;

	}

}



static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf)

{

	struct ionic_port_stats *port_stats;

	struct ionic_lif_sw_stats lif_stats;

	int i, q_num;



	ionic_get_lif_stats(lif, &lif_stats);



	for (i = 0; i < IONIC_NUM_LIF_STATS; i++) {

		**buf = IONIC_READ_STAT64(&lif_stats, &ionic_lif_stats_desc[i]);

		(*buf)++;

	}



	port_stats = &lif->ionic->idev.port_info->stats;

	for (i = 0; i < IONIC_NUM_PORT_STATS; i++) {

		**buf = IONIC_READ_STAT_LE64(port_stats,

					     &ionic_port_stats_desc[i]);

		(*buf)++;

	}



	for (q_num = 0; q_num < MAX_Q(lif); q_num++)

		ionic_sw_stats_get_txq_values(lif, buf, q_num);



	for (q_num = 0; q_num < MAX_Q(lif); q_num++)

		ionic_sw_stats_get_rxq_values(lif, buf, q_num);

}



const struct ionic_stats_group_intf ionic_stats_groups[] = {