Commit ddbb4de9 authored by Brian King's avatar Brian King Committed by David S. Miller
Browse files

ibmveth: Add ethtool driver stats hooks 



Add ethtool hooks to ibmveth to retrieve driver statistics.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 80e53677

drivers/net/ibmveth.c

+51 −0
Original line number Diff line number Diff line
@@ -113,6 +113,28 @@ MODULE_DESCRIPTION("IBM i/pSeries Virtual Ethernet Driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(ibmveth_driver_version);



struct ibmveth_stat {

	char name[ETH_GSTRING_LEN];

	int offset;

};



#define IBMVETH_STAT_OFF(stat) offsetof(struct ibmveth_adapter, stat)

#define IBMVETH_GET_STAT(a, off) *((u64 *)(((unsigned long)(a)) + off))



struct ibmveth_stat ibmveth_stats[] = {

	{ "replenish_task_cycles", IBMVETH_STAT_OFF(replenish_task_cycles) },

	{ "replenish_no_mem", IBMVETH_STAT_OFF(replenish_no_mem) },

	{ "replenish_add_buff_failure", IBMVETH_STAT_OFF(replenish_add_buff_failure) },

	{ "replenish_add_buff_success", IBMVETH_STAT_OFF(replenish_add_buff_success) },

	{ "rx_invalid_buffer", IBMVETH_STAT_OFF(rx_invalid_buffer) },

	{ "rx_no_buffer", IBMVETH_STAT_OFF(rx_no_buffer) },

	{ "tx_multidesc_send", IBMVETH_STAT_OFF(tx_multidesc_send) },

	{ "tx_linearized", IBMVETH_STAT_OFF(tx_linearized) },

	{ "tx_linearize_failed", IBMVETH_STAT_OFF(tx_linearize_failed) },

	{ "tx_map_failed", IBMVETH_STAT_OFF(tx_map_failed) },

	{ "tx_send_failed", IBMVETH_STAT_OFF(tx_send_failed) },

};



/* simple methods of getting data from the current rxq entry */

static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter)

{
@@ -769,6 +791,32 @@ static u32 ibmveth_get_rx_csum(struct net_device *dev) 
	return adapter->rx_csum;

}



static void ibmveth_get_strings(struct net_device *dev, u32 stringset, u8 *data)

{

	int i;



	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < ARRAY_SIZE(ibmveth_stats); i++, data += ETH_GSTRING_LEN)

		memcpy(data, ibmveth_stats[i].name, ETH_GSTRING_LEN);

}



static int ibmveth_get_stats_count(struct net_device *dev)

{

	return ARRAY_SIZE(ibmveth_stats);

}



static void ibmveth_get_ethtool_stats(struct net_device *dev,

				      struct ethtool_stats *stats, u64 *data)

{

	int i;

	struct ibmveth_adapter *adapter = dev->priv;



	for (i = 0; i < ARRAY_SIZE(ibmveth_stats); i++)

		data[i] = IBMVETH_GET_STAT(adapter, ibmveth_stats[i].offset);

}



static const struct ethtool_ops netdev_ethtool_ops = {

	.get_drvinfo		= netdev_get_drvinfo,

	.get_settings		= netdev_get_settings,
@@ -780,6 +828,9 @@ static const struct ethtool_ops netdev_ethtool_ops = { 
	.set_rx_csum		= ibmveth_set_rx_csum,

	.get_tso			= ethtool_op_get_tso,

	.get_ufo			= ethtool_op_get_ufo,

	.get_strings		= ibmveth_get_strings,

	.get_stats_count		= ibmveth_get_stats_count,

	.get_ethtool_stats	= ibmveth_get_ethtool_stats,

};



static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)