Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbcDUM6m (ORCPT ); Thu, 21 Apr 2016 08:58:42 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:28449 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbcDUM6l (ORCPT ); Thu, 21 Apr 2016 08:58:41 -0400 Subject: Re: [PATCH v3] IB/ipoib: Add readout of statistics using ethtool References: <1460715468-16235-1-git-send-email-hans.westgaard.ry@oracle.com> <1461237201-25738-1-git-send-email-hans.westgaard.ry@oracle.com> Cc: Doug Ledford , Sean Hefty , Hal Rosenstock , Or Gerlitz , Santosh Shilimkar , Yuval Shaia , "open list:INFINIBAND SUBSYSTEM" , open list From: Hans Westgaard Ry To: Leon Romanovsky Message-ID: <5718CE6F.8080105@oracle.com> Date: Thu, 21 Apr 2016 14:58:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1461237201-25738-1-git-send-email-hans.westgaard.ry@oracle.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3547 Lines: 115 The only difference between v2 and v3 of this patch is "cosmetics"; When running checkpatch I got an error ERROR: code indent should use tabs where possible #33: FILE: drivers/infiniband/ulp/ipoib/ipoib_ethtool.c:45: +^I^I .stat_string = #m, \$ So I decided to make yet another version ( I should of course have ran checkpatch before submitting v2) Hans On 04/21/2016 01:13 PM, Hans Westgaard Ry wrote: > 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. > > Signed-off-by: Hans Westgaard Ry > Reviewed-by: Yuval Shaia > Reviewed-by: Santosh Shilimkar > Tested-by: Yuval Shaia > --- > drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 67 ++++++++++++++++++++++++++++ > 1 file changed, 67 insertions(+) > > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c > index a53fa5f..1502199 100644 > --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c > +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c > @@ -36,6 +36,27 @@ > > #include "ipoib.h" > > +struct ipoib_stats { > + char stat_string[ETH_GSTRING_LEN]; > + int stat_offset; > +}; > + > +#define IPOIB_NETDEV_STAT(m) { \ > + .stat_string = #m, \ > + .stat_offset = offsetof(struct rtnl_link_stats64, m) } > + > +static const struct ipoib_stats ipoib_gstrings_stats[] = { > + IPOIB_NETDEV_STAT(rx_packets), > + IPOIB_NETDEV_STAT(tx_packets), > + IPOIB_NETDEV_STAT(rx_bytes), > + IPOIB_NETDEV_STAT(tx_bytes), > + IPOIB_NETDEV_STAT(tx_errors), > + IPOIB_NETDEV_STAT(rx_dropped), > + IPOIB_NETDEV_STAT(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) > { > @@ -92,11 +113,57 @@ 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_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; > + case ETH_SS_TEST: > + default: > + break; > + } > +} > +static int ipoib_get_sset_count(struct net_device __always_unused *dev, > + int sset) > +{ > + switch (sset) { > + case ETH_SS_STATS: > + return IPOIB_GLOBAL_STATS_LEN; > + case ETH_SS_TEST: > + default: > + break; > + } > + 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)