IB/opa-vnic: VNIC statistics support

OPA VNIC driver statistics support maintains various counters including
standard netdev counters and the Ethernet manager defined counters.
Add the Ethtool hook to read the counters.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
index b74f6ad32371caa959f252bf326a7baf9066c75d..a98948c4fe098f50c20b225f4c405d0c4a698462 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
@@ -53,9 +53,119 @@
 
 #include "opa_vnic_internal.h"
 
+enum {NETDEV_STATS, VNIC_STATS};
+
+struct vnic_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       struct {
+               int sizeof_stat;
+               int stat_offset;
+       };
+};
+
+#define VNIC_STAT(m)            { FIELD_SIZEOF(struct opa_vnic_stats, m),   \
+                                 offsetof(struct opa_vnic_stats, m) }
+
+static struct vnic_stats vnic_gstrings_stats[] = {
+       /* NETDEV stats */
+       {"rx_packets", VNIC_STAT(netstats.rx_packets)},
+       {"tx_packets", VNIC_STAT(netstats.tx_packets)},
+       {"rx_bytes", VNIC_STAT(netstats.rx_bytes)},
+       {"tx_bytes", VNIC_STAT(netstats.tx_bytes)},
+       {"rx_errors", VNIC_STAT(netstats.rx_errors)},
+       {"tx_errors", VNIC_STAT(netstats.tx_errors)},
+       {"rx_dropped", VNIC_STAT(netstats.rx_dropped)},
+       {"tx_dropped", VNIC_STAT(netstats.tx_dropped)},
+
+       /* SUMMARY counters */
+       {"tx_unicast", VNIC_STAT(tx_grp.unicast)},
+       {"tx_mcastbcast", VNIC_STAT(tx_grp.mcastbcast)},
+       {"tx_untagged", VNIC_STAT(tx_grp.untagged)},
+       {"tx_vlan", VNIC_STAT(tx_grp.vlan)},
+
+       {"tx_64_size", VNIC_STAT(tx_grp.s_64)},
+       {"tx_65_127", VNIC_STAT(tx_grp.s_65_127)},
+       {"tx_128_255", VNIC_STAT(tx_grp.s_128_255)},
+       {"tx_256_511", VNIC_STAT(tx_grp.s_256_511)},
+       {"tx_512_1023", VNIC_STAT(tx_grp.s_512_1023)},
+       {"tx_1024_1518", VNIC_STAT(tx_grp.s_1024_1518)},
+       {"tx_1519_max", VNIC_STAT(tx_grp.s_1519_max)},
+
+       {"rx_unicast", VNIC_STAT(rx_grp.unicast)},
+       {"rx_mcastbcast", VNIC_STAT(rx_grp.mcastbcast)},
+       {"rx_untagged", VNIC_STAT(rx_grp.untagged)},
+       {"rx_vlan", VNIC_STAT(rx_grp.vlan)},
+
+       {"rx_64_size", VNIC_STAT(rx_grp.s_64)},
+       {"rx_65_127", VNIC_STAT(rx_grp.s_65_127)},
+       {"rx_128_255", VNIC_STAT(rx_grp.s_128_255)},
+       {"rx_256_511", VNIC_STAT(rx_grp.s_256_511)},
+       {"rx_512_1023", VNIC_STAT(rx_grp.s_512_1023)},
+       {"rx_1024_1518", VNIC_STAT(rx_grp.s_1024_1518)},
+       {"rx_1519_max", VNIC_STAT(rx_grp.s_1519_max)},
+
+       /* ERROR counters */
+       {"rx_fifo_errors", VNIC_STAT(netstats.rx_fifo_errors)},
+       {"rx_length_errors", VNIC_STAT(netstats.rx_length_errors)},
+
+       {"tx_fifo_errors", VNIC_STAT(netstats.tx_fifo_errors)},
+       {"tx_carrier_errors", VNIC_STAT(netstats.tx_carrier_errors)},
+
+       {"tx_dlid_zero", VNIC_STAT(tx_dlid_zero)},
+       {"tx_drop_state", VNIC_STAT(tx_drop_state)},
+       {"rx_drop_state", VNIC_STAT(rx_drop_state)},
+       {"rx_oversize", VNIC_STAT(rx_oversize)},
+       {"rx_runt", VNIC_STAT(rx_runt)},
+};
+
+#define VNIC_STATS_LEN  ARRAY_SIZE(vnic_gstrings_stats)
+
+/* vnic_get_sset_count - get string set count */
+static int vnic_get_sset_count(struct net_device *netdev, int sset)
+{
+       return (sset == ETH_SS_STATS) ? VNIC_STATS_LEN : -EOPNOTSUPP;
+}
+
+/* vnic_get_ethtool_stats - get statistics */
+static void vnic_get_ethtool_stats(struct net_device *netdev,
+                                  struct ethtool_stats *stats, u64 *data)
+{
+       struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
+       struct opa_vnic_stats vstats;
+       int i;
+
+       memset(&vstats, 0, sizeof(vstats));
+       mutex_lock(&adapter->stats_lock);
+       adapter->rn_ops->ndo_get_stats64(netdev, &vstats.netstats);
+       for (i = 0; i < VNIC_STATS_LEN; i++) {
+               char *p = (char *)&vstats + vnic_gstrings_stats[i].stat_offset;
+
+               data[i] = (vnic_gstrings_stats[i].sizeof_stat ==
+                          sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+       }
+       mutex_unlock(&adapter->stats_lock);
+}
+
+/* vnic_get_strings - get strings */
+static void vnic_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+{
+       int i;
+
+       if (stringset != ETH_SS_STATS)
+               return;
+
+       for (i = 0; i < VNIC_STATS_LEN; i++)
+               memcpy(data + i * ETH_GSTRING_LEN,
+                      vnic_gstrings_stats[i].stat_string,
+                      ETH_GSTRING_LEN);
+}
+
 /* ethtool ops */
 static const struct ethtool_ops opa_vnic_ethtool_ops = {
        .get_link = ethtool_op_get_link,
+       .get_strings = vnic_get_strings,
+       .get_sset_count = vnic_get_sset_count,
+       .get_ethtool_stats = vnic_get_ethtool_stats,
 };
 
 /* opa_vnic_set_ethtool_ops - set ethtool ops */

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h b/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
index 91c39bac0dc64050c72a2a37d9986e5e9b0c1170..1c10dc23b53b9b48e06862cfa0b77dedeaf71dad 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
@@ -169,6 +169,7 @@ struct __opa_veswport_trap {
  * @vport_num: vesw port number
  * @lock: adapter lock
  * @info: virtual ethernet switch port information
+ * @stats_lock: statistics lock
  * @flow_tbl: flow to default port redirection table
  */
 struct opa_vnic_adapter {
@@ -184,6 +185,9 @@ struct opa_vnic_adapter {
 
        struct __opa_veswport_info  info;
 
+       /* Lock used to protect access to vnic counters */
+       struct mutex stats_lock;
+
        u8 flow_tbl[OPA_VNIC_FLOW_TBL_SIZE];
 };
 

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
index 1e237b68e21ba60fb068638d3f54c055b9b0afd7..d2f455b5f90cbdd74576d03759b60f061232c0dd 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
@@ -60,6 +60,20 @@
 #define OPA_VNIC_SKB_HEADROOM  \
                        ALIGN((OPA_VNIC_HDR_LEN + OPA_VNIC_SKB_MDATA_LEN), 8)
 
+/* This function is overloaded for opa_vnic specific implementation */
+static void opa_vnic_get_stats64(struct net_device *netdev,
+                                struct rtnl_link_stats64 *stats)
+{
+       struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
+       struct opa_vnic_stats vstats;
+
+       memset(&vstats, 0, sizeof(vstats));
+       mutex_lock(&adapter->stats_lock);
+       adapter->rn_ops->ndo_get_stats64(netdev, &vstats.netstats);
+       mutex_unlock(&adapter->stats_lock);
+       memcpy(stats, &vstats.netstats, sizeof(*stats));
+}
+
 /* opa_netdev_start_xmit - transmit function */
 static netdev_tx_t opa_netdev_start_xmit(struct sk_buff *skb,
                                         struct net_device *netdev)
@@ -149,6 +163,7 @@ static const struct net_device_ops opa_netdev_ops = {
        .ndo_open = opa_netdev_open,
        .ndo_stop = opa_netdev_close,
        .ndo_start_xmit = opa_netdev_start_xmit,
+       .ndo_get_stats64 = opa_vnic_get_stats64,
        .ndo_select_queue = opa_vnic_select_queue,
        .ndo_set_mac_address = opa_vnic_set_mac_addr,
 };
@@ -191,6 +206,7 @@ struct opa_vnic_adapter *opa_vnic_add_netdev(struct ib_device *ibdev,
        netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
        netdev->hard_header_len += OPA_VNIC_SKB_HEADROOM;
        mutex_init(&adapter->lock);
+       mutex_init(&adapter->stats_lock);
 
        SET_NETDEV_DEV(netdev, ibdev->dev.parent);
 
@@ -206,6 +222,7 @@ struct opa_vnic_adapter *opa_vnic_add_netdev(struct ib_device *ibdev,
        return adapter;
 netdev_err:
        mutex_destroy(&adapter->lock);
+       mutex_destroy(&adapter->stats_lock);
        kfree(adapter);
 adapter_err:
        ibdev->free_rdma_netdev(netdev);
@@ -222,6 +239,7 @@ void opa_vnic_rem_netdev(struct opa_vnic_adapter *adapter)
        v_info("removing\n");
        unregister_netdev(netdev);
        mutex_destroy(&adapter->lock);
+       mutex_destroy(&adapter->stats_lock);
        kfree(adapter);
        ibdev->free_rdma_netdev(netdev);
 }