From: Hans Westgaard Ry Date: Wed, 13 Apr 2016 13:23:20 +0000 (+0200) Subject: IB/ipoib: Add readout of statistics using ethtool X-Git-Tag: v4.1.12-92~164^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c5e10ed0dcbdaac8ef4c6e08c55b040048dd7c6;p=users%2Fjedix%2Flinux-maple.git IB/ipoib: Add readout of statistics using ethtool Orabug: 21498734 IPoIB collects statistics of traffic including number of packets sent/received, number of bytes transferred, and certain errors. This patch makes these statistics available to be queried by ethtool. Change-Id: Ic159815fe0cc08770cd4111ec1df117b7349c154 Signed-off-by: Hans Westgaard Ry Reviewed-by: Yuval Shaia Reviewed-by: Santosh Shilimkar Tested-by: Yuval Shaia Acked-by: Ajaykumar Hotchandani --- diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index 078cadd6c797..fb46b15a6774 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c @@ -36,6 +36,31 @@ #include "ipoib.h" +struct ipoib_stats { + char stat_string[ETH_GSTRING_LEN]; + int stat_offset; +}; + + +#define IPOIB_NETDEV_STAT(str, m) { \ + .stat_string = str, \ + .stat_offset = offsetof(struct rtnl_link_stats64, m) } + + + +static const struct ipoib_stats ipoib_gstrings_stats[] = { + IPOIB_NETDEV_STAT("rx_packets", rx_packets), + IPOIB_NETDEV_STAT("tx_packets", tx_packets), + IPOIB_NETDEV_STAT("rx_bytes", rx_bytes), + IPOIB_NETDEV_STAT("tx_bytes", tx_bytes), + IPOIB_NETDEV_STAT("tx_errors", tx_errors), + IPOIB_NETDEV_STAT("rx_dropped", rx_dropped), + IPOIB_NETDEV_STAT("tx_dropped", tx_dropped) +}; + +#define IPOIB_GLOBAL_STATS_LEN ARRAY_SIZE(ipoib_gstrings_stats) + + static void ipoib_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) { @@ -96,11 +121,56 @@ static int ipoib_set_coalesce(struct net_device *dev, return 0; } +static void ipoib_get_ethtool_stats(struct net_device *dev, + struct ethtool_stats __always_unused *stats, + u64 *data) +{ + int i; + struct net_device_stats *net_stats = &dev->stats; + u8 *p = (u8 *)net_stats; + + for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++) + data[i] = *(u64 *)(p + ipoib_gstrings_stats[i].stat_offset); + +} +static void ipoib_get_strings(struct net_device __always_unused *dev, + u32 stringset, u8 *data) +{ + u8 *p = data; + int i; + + switch (stringset) { + case ETH_SS_TEST: + break; + case ETH_SS_STATS: + for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++) { + memcpy(p, ipoib_gstrings_stats[i].stat_string, + ETH_GSTRING_LEN); + p += ETH_GSTRING_LEN; + } + break; + } +} +static int ipoib_get_sset_count(struct net_device __always_unused *dev, + int sset) +{ + switch (sset) { + case ETH_SS_TEST: + return -EOPNOTSUPP; + case ETH_SS_STATS: + return IPOIB_GLOBAL_STATS_LEN; + default: + return -EOPNOTSUPP; + } +} static const struct ethtool_ops ipoib_ethtool_ops = { .get_drvinfo = ipoib_get_drvinfo, .get_coalesce = ipoib_get_coalesce, .set_coalesce = ipoib_set_coalesce, + .get_strings = ipoib_get_strings, + .get_ethtool_stats = ipoib_get_ethtool_stats, + .get_sset_count = ipoib_get_sset_count, }; void ipoib_set_ethtool_ops(struct net_device *dev)