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

ionic: remove debug stats 



These debug stats are not really useful, their collection is
likely detrimental to performance, and they suck up a lot
of memory which never gets used if no one ever enables the
priv-flag to print them, so just remove these bits.

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

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

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ void ionic_debugfs_add_qcq(struct ionic_lif *lif, struct ionic_qcq *qcq) 
	debugfs_create_u32("qid", 0400, q_dentry, &q->hw_index);

	debugfs_create_u32("qtype", 0400, q_dentry, &q->hw_type);

	debugfs_create_u64("drop", 0400, q_dentry, &q->drop);

	debugfs_create_u64("stop", 0400, q_dentry, &q->stop);

	debugfs_create_u64("wake", 0400, q_dentry, &q->wake);



	debugfs_create_file("tail", 0400, q_dentry, q, &q_tail_fops);

	debugfs_create_file("head", 0400, q_dentry, q, &q_head_fops);

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

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ unsigned int ionic_cq_service(struct ionic_cq *cq, unsigned int work_to_do, 
			cq->done_color = !cq->done_color;

		cq->tail_idx = (cq->tail_idx + 1) & (cq->num_descs - 1);

		cq_info = &cq->info[cq->tail_idx];

		DEBUG_STATS_CQE_CNT(cq);



		if (++work_done >= work_to_do)

			break;

drivers/net/ethernet/pensando/ionic/ionic_dev.h

+0 −4
Original line number Diff line number Diff line
@@ -220,9 +220,6 @@ struct ionic_queue { 
	unsigned int num_descs;

	unsigned int max_sg_elems;

	u64 features;

	u64 dbell_count;

	u64 stop;

	u64 wake;

	u64 drop;

	struct ionic_dev *idev;

	unsigned int type;
@@ -269,7 +266,6 @@ struct ionic_cq { 
	bool done_color;

	unsigned int num_descs;

	unsigned int desc_size;

	u64 compl_count;

	void *base;

	dma_addr_t base_pa;

} ____cacheline_aligned_in_smp;

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

+0 −38
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#include "ionic_ethtool.h"

#include "ionic_stats.h"



static const char ionic_priv_flags_strings[][ETH_GSTRING_LEN] = {

#define IONIC_PRIV_F_SW_DBG_STATS	BIT(0)

	"sw-dbg-stats",

};



#define IONIC_PRIV_FLAGS_COUNT ARRAY_SIZE(ionic_priv_flags_strings)



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

{

	u32 i;
@@ -59,9 +52,6 @@ static int ionic_get_sset_count(struct net_device *netdev, int sset) 
	case ETH_SS_STATS:

		count = ionic_get_stats_count(lif);

		break;

	case ETH_SS_PRIV_FLAGS:

		count = IONIC_PRIV_FLAGS_COUNT;

		break;

	}

	return count;

}
@@ -75,10 +65,6 @@ static void ionic_get_strings(struct net_device *netdev, 
	case ETH_SS_STATS:

		ionic_get_stats_strings(lif, buf);

		break;

	case ETH_SS_PRIV_FLAGS:

		memcpy(buf, ionic_priv_flags_strings,

		       IONIC_PRIV_FLAGS_COUNT * ETH_GSTRING_LEN);

		break;

	}

}
@@ -691,28 +677,6 @@ static int ionic_set_channels(struct net_device *netdev, 
	return err;

}



static u32 ionic_get_priv_flags(struct net_device *netdev)

{

	struct ionic_lif *lif = netdev_priv(netdev);

	u32 priv_flags = 0;



	if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state))

		priv_flags |= IONIC_PRIV_F_SW_DBG_STATS;



	return priv_flags;

}



static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags)

{

	struct ionic_lif *lif = netdev_priv(netdev);



	clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);

	if (priv_flags & IONIC_PRIV_F_SW_DBG_STATS)

		set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state);



	return 0;

}



static int ionic_get_rxnfc(struct net_device *netdev,

			   struct ethtool_rxnfc *info, u32 *rules)

{
@@ -1013,8 +977,6 @@ static const struct ethtool_ops ionic_ethtool_ops = { 
	.get_strings		= ionic_get_strings,

	.get_ethtool_stats	= ionic_get_stats,

	.get_sset_count		= ionic_get_sset_count,

	.get_priv_flags		= ionic_get_priv_flags,

	.set_priv_flags		= ionic_set_priv_flags,

	.get_rxnfc		= ionic_get_rxnfc,

	.get_rxfh_indir_size	= ionic_get_rxfh_indir_size,

	.get_rxfh_key_size	= ionic_get_rxfh_key_size,

drivers/net/ethernet/pensando/ionic/ionic_lif.h

+0 −45
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#define IONIC_ADMINQ_LENGTH	16	/* must be a power of two */

#define IONIC_NOTIFYQ_LENGTH	64	/* must be a power of two */



#define IONIC_MAX_NUM_NAPI_CNTR		(NAPI_POLL_WEIGHT + 1)

#define IONIC_MAX_NUM_SG_CNTR		(IONIC_TX_MAX_SG_ELEMS + 1)



#define ADD_ADDR	true

#define DEL_ADDR	false

#define CAN_SLEEP	true
@@ -37,7 +34,6 @@ struct ionic_tx_stats { 
	u64 clean;

	u64 linearize;

	u64 crc32_csum;

	u64 sg_cntr[IONIC_MAX_NUM_SG_CNTR];

	u64 dma_map_err;

	u64 hwstamp_valid;

	u64 hwstamp_invalid;
@@ -48,7 +44,6 @@ struct ionic_rx_stats { 
	u64 bytes;

	u64 csum_none;

	u64 csum_complete;

	u64 buffers_posted;

	u64 dropped;

	u64 vlan_stripped;

	u64 csum_error;
@@ -65,11 +60,6 @@ struct ionic_rx_stats { 
#define IONIC_QCQ_F_RX_STATS		BIT(4)

#define IONIC_QCQ_F_NOTIFYQ		BIT(5)



struct ionic_napi_stats {

	u64 poll_count;

	u64 work_done_cntr[IONIC_MAX_NUM_NAPI_CNTR];

};



struct ionic_qcq {

	void *q_base;

	dma_addr_t q_base_pa;
@@ -85,7 +75,6 @@ struct ionic_qcq { 
	struct ionic_cq cq;

	struct ionic_intr_info intr;

	struct napi_struct napi;

	struct ionic_napi_stats napi_stats;

	unsigned int flags;

	struct dentry *dentry;

};
@@ -142,7 +131,6 @@ struct ionic_lif_sw_stats { 


enum ionic_lif_state_flags {

	IONIC_LIF_F_INITED,

	IONIC_LIF_F_SW_DEBUG_STATS,

	IONIC_LIF_F_UP,

	IONIC_LIF_F_LINK_CHECK_REQUESTED,

	IONIC_LIF_F_FILTER_SYNC_NEEDED,
@@ -350,37 +338,4 @@ int ionic_lif_rss_config(struct ionic_lif *lif, u16 types, 
void ionic_lif_rx_mode(struct ionic_lif *lif);

int ionic_reconfigure_queues(struct ionic_lif *lif,

			     struct ionic_queue_params *qparam);



static inline void debug_stats_txq_post(struct ionic_queue *q, bool dbell)

{

	struct ionic_txq_desc *desc = &q->txq[q->head_idx];

	u8 num_sg_elems;



	q->dbell_count += dbell;



	num_sg_elems = ((le64_to_cpu(desc->cmd) >> IONIC_TXQ_DESC_NSGE_SHIFT)

						& IONIC_TXQ_DESC_NSGE_MASK);

	if (num_sg_elems > (IONIC_MAX_NUM_SG_CNTR - 1))

		num_sg_elems = IONIC_MAX_NUM_SG_CNTR - 1;



	q->lif->txqstats[q->index].sg_cntr[num_sg_elems]++;

}



static inline void debug_stats_napi_poll(struct ionic_qcq *qcq,

					 unsigned int work_done)

{

	qcq->napi_stats.poll_count++;



	if (work_done > (IONIC_MAX_NUM_NAPI_CNTR - 1))

		work_done = IONIC_MAX_NUM_NAPI_CNTR - 1;



	qcq->napi_stats.work_done_cntr[work_done]++;

}



#define DEBUG_STATS_CQE_CNT(cq)		((cq)->compl_count++)

#define DEBUG_STATS_RX_BUFF_CNT(q)	((q)->lif->rxqstats[q->index].buffers_posted++)

#define DEBUG_STATS_TXQ_POST(q, dbell)  debug_stats_txq_post(q, dbell)

#define DEBUG_STATS_NAPI_POLL(qcq, work_done) \

	debug_stats_napi_poll(qcq, work_done)



#endif /* _IONIC_LIF_H_ */