Commit acebe5b6 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ionic: Update driver to use ethtool_sprintf 



Update the ionic driver to make use of ethtool_sprintf. In addition add
separate functions for Tx/Rx stats strings in order to reduce the total
amount of indenting needed in the driver code.

Acked-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b82e8118

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

+60 −85
Original line number Diff line number Diff line
@@ -246,98 +246,73 @@ static u64 ionic_sw_stats_get_count(struct ionic_lif *lif) 
	return total;

}



static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf)

static void ionic_sw_stats_get_tx_strings(struct ionic_lif *lif, u8 **buf,

					  int q_num)

{

	int i, q_num;



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

		snprintf(*buf, ETH_GSTRING_LEN, ionic_lif_stats_desc[i].name);

		*buf += ETH_GSTRING_LEN;

	}

	int i;



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

		snprintf(*buf, ETH_GSTRING_LEN,

			 ionic_port_stats_desc[i].name);

		*buf += ETH_GSTRING_LEN;

	}

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

		ethtool_sprintf(buf, "tx_%d_%s", q_num,

				ionic_tx_stats_desc[i].name);



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

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

			snprintf(*buf, ETH_GSTRING_LEN, "tx_%d_%s",

				 q_num, ionic_tx_stats_desc[i].name);

			*buf += ETH_GSTRING_LEN;

		}

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

	    !test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		return;



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

		    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "txq_%d_%s",

					 q_num,

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

		ethtool_sprintf(buf, "txq_%d_%s", q_num,

				ionic_txq_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "txq_%d_cq_%s",

					 q_num,

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

		ethtool_sprintf(buf, "txq_%d_cq_%s", q_num,

				ionic_dbg_cq_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "txq_%d_intr_%s",

					 q_num,

	for (i = 0; i < IONIC_NUM_DBG_INTR_STATS; i++)

		ethtool_sprintf(buf, "txq_%d_intr_%s", q_num,

				ionic_dbg_intr_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "txq_%d_sg_cntr_%d",

					 q_num, i);

				*buf += ETH_GSTRING_LEN;

			}

		}

	}

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

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

			snprintf(*buf, ETH_GSTRING_LEN,

				 "rx_%d_%s",

				 q_num, ionic_rx_stats_desc[i].name);

			*buf += ETH_GSTRING_LEN;

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

		ethtool_sprintf(buf, "txq_%d_sg_cntr_%d", q_num, i);

}



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

		    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "rxq_%d_cq_%s",

					 q_num,

static void ionic_sw_stats_get_rx_strings(struct ionic_lif *lif, u8 **buf,

					  int q_num)

{

	int i;



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

		ethtool_sprintf(buf, "rx_%d_%s", q_num,

				ionic_rx_stats_desc[i].name);



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

	    !test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		return;



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

		ethtool_sprintf(buf, "rxq_%d_cq_%s", q_num,

				ionic_dbg_cq_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "rxq_%d_intr_%s",

					 q_num,

	for (i = 0; i < IONIC_NUM_DBG_INTR_STATS; i++)

		ethtool_sprintf(buf, "rxq_%d_intr_%s", q_num,

				ionic_dbg_intr_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "rxq_%d_napi_%s",

					 q_num,

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

		ethtool_sprintf(buf, "rxq_%d_napi_%s", q_num,

				ionic_dbg_napi_stats_desc[i].name);

				*buf += ETH_GSTRING_LEN;

			}

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

				snprintf(*buf, ETH_GSTRING_LEN,

					 "rxq_%d_napi_work_done_%d",

					 q_num, i);

				*buf += ETH_GSTRING_LEN;

			}

		}

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

		ethtool_sprintf(buf, "rxq_%d_napi_work_done_%d", q_num, i);

}



static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf)

{

	int i, q_num;



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

		ethtool_sprintf(buf, ionic_lif_stats_desc[i].name);



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

		ethtool_sprintf(buf, ionic_port_stats_desc[i].name);



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

		ionic_sw_stats_get_tx_strings(lif, buf, q_num);



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

		ionic_sw_stats_get_rx_strings(lif, buf, q_num);

}



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