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

ionic: ethtool ptp stats 



Add the new hwstamp stats to our ethtool stats output.

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

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

+34 −4
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ static const struct ionic_stat_desc ionic_tx_stats_desc[] = { 
	IONIC_TX_STAT_DESC(frags),

	IONIC_TX_STAT_DESC(tso),

	IONIC_TX_STAT_DESC(tso_bytes),

	IONIC_TX_STAT_DESC(hwstamp_valid),

	IONIC_TX_STAT_DESC(hwstamp_invalid),

	IONIC_TX_STAT_DESC(csum_none),

	IONIC_TX_STAT_DESC(csum),

	IONIC_TX_STAT_DESC(vlan_inserted),
@@ -143,6 +145,8 @@ static const struct ionic_stat_desc ionic_rx_stats_desc[] = { 
	IONIC_RX_STAT_DESC(csum_none),

	IONIC_RX_STAT_DESC(csum_complete),

	IONIC_RX_STAT_DESC(csum_error),

	IONIC_RX_STAT_DESC(hwstamp_valid),

	IONIC_RX_STAT_DESC(hwstamp_invalid),

	IONIC_RX_STAT_DESC(dropped),

	IONIC_RX_STAT_DESC(vlan_stripped),

};
@@ -188,6 +192,8 @@ static void ionic_add_lif_txq_stats(struct ionic_lif *lif, int q_num, 
	stats->tx_tso_bytes += txstats->tso_bytes;

	stats->tx_csum_none += txstats->csum_none;

	stats->tx_csum += txstats->csum;

	stats->tx_hwstamp_valid += txstats->hwstamp_valid;

	stats->tx_hwstamp_invalid += txstats->hwstamp_invalid;

}



static void ionic_add_lif_rxq_stats(struct ionic_lif *lif, int q_num,
@@ -200,6 +206,8 @@ static void ionic_add_lif_rxq_stats(struct ionic_lif *lif, int q_num, 
	stats->rx_csum_none += rxstats->csum_none;

	stats->rx_csum_complete += rxstats->csum_complete;

	stats->rx_csum_error += rxstats->csum_error;

	stats->rx_hwstamp_valid += rxstats->hwstamp_valid;

	stats->rx_hwstamp_invalid += rxstats->hwstamp_invalid;

}



static void ionic_get_lif_stats(struct ionic_lif *lif,
@@ -215,6 +223,12 @@ static void ionic_get_lif_stats(struct ionic_lif *lif, 
		ionic_add_lif_rxq_stats(lif, q_num, stats);

	}



	if (lif->hwstamp_txq)

		ionic_add_lif_txq_stats(lif, lif->hwstamp_txq->q.index, stats);



	if (lif->hwstamp_rxq)

		ionic_add_lif_rxq_stats(lif, lif->hwstamp_rxq->q.index, stats);



	ionic_get_stats64(lif->netdev, &ns);

	stats->hw_tx_dropped = ns.tx_dropped;

	stats->hw_rx_dropped = ns.rx_dropped;
@@ -227,14 +241,18 @@ static u64 ionic_sw_stats_get_count(struct ionic_lif *lif) 
{

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



	/* lif stats */

	if (lif->hwstamp_txq)

		tx_queues += 1;



	if (lif->hwstamp_rxq)

		rx_queues += 1;



	total += IONIC_NUM_LIF_STATS;

	total += IONIC_NUM_PORT_STATS;



	total += tx_queues * IONIC_NUM_TX_STATS;

	total += rx_queues * IONIC_NUM_RX_STATS;



	/* port stats */

	total += IONIC_NUM_PORT_STATS;



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

	    test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) {

		/* tx debug stats */
@@ -318,8 +336,14 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) 
	for (q_num = 0; q_num < MAX_Q(lif); q_num++)

		ionic_sw_stats_get_tx_strings(lif, buf, q_num);



	if (lif->hwstamp_txq)

		ionic_sw_stats_get_tx_strings(lif, buf, lif->hwstamp_txq->q.index);



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

		ionic_sw_stats_get_rx_strings(lif, buf, q_num);



	if (lif->hwstamp_rxq)

		ionic_sw_stats_get_rx_strings(lif, buf, lif->hwstamp_rxq->q.index);

}



static void ionic_sw_stats_get_txq_values(struct ionic_lif *lif, u64 **buf,
@@ -434,8 +458,14 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) 
	for (q_num = 0; q_num < MAX_Q(lif); q_num++)

		ionic_sw_stats_get_txq_values(lif, buf, q_num);



	if (lif->hwstamp_txq)

		ionic_sw_stats_get_txq_values(lif, buf, lif->hwstamp_txq->q.index);



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

		ionic_sw_stats_get_rxq_values(lif, buf, q_num);



	if (lif->hwstamp_rxq)

		ionic_sw_stats_get_rxq_values(lif, buf, lif->hwstamp_rxq->q.index);

}



const struct ionic_stats_group_intf ionic_stats_groups[] = {