IB/hfi1: switch to core handling of rx/tx byte/packet counters

Use netdev->tstats instead of a member of hfi1_ipoib_dev_priv for storing
a pointer to the per-cpu counters. This allows us to use core
functionality for statistics handling.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index a40701a6e1b6485065514cf6ce9094b4513b46a6..0b64aa87ab73bc8ba1124dc81394ea5b15705a9d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -1686,7 +1686,6 @@ static void hfi1_ipoib_ib_rcv(struct hfi1_packet *packet)
        u32 extra_bytes;
        u32 tlen, qpnum;
        bool do_work, do_cnp;
-       struct hfi1_ipoib_dev_priv *priv;
 
        trace_hfi1_rcvhdr(packet);
 
@@ -1734,8 +1733,7 @@ static void hfi1_ipoib_ib_rcv(struct hfi1_packet *packet)
        if (unlikely(!skb))
                goto drop;
 
-       priv = hfi1_ipoib_priv(netdev);
-       hfi1_ipoib_update_rx_netstats(priv, 1, skb->len);
+       dev_sw_netstats_rx_add(netdev, skb->len);
 
        skb->dev = netdev;
        skb->pkt_type = PACKET_HOST;

diff --git a/drivers/infiniband/hw/hfi1/ipoib.h b/drivers/infiniband/hw/hfi1/ipoib.h
index b8c9d0a003fb34f432ed0fded5cc98af2d4dda01..f650cac9d424c2c6fe2ca4f9f8f1ca62e151f5bf 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ipoib.h
+++ b/drivers/infiniband/hw/hfi1/ipoib.h
@@ -110,7 +110,6 @@ struct hfi1_ipoib_dev_priv {
 
        const struct net_device_ops *netdev_ops;
        struct rvt_qp *qp;
-       struct pcpu_sw_netstats __percpu *netstats;
 };
 
 /* hfi1 ipoib rdma netdev's private data structure */
@@ -126,32 +125,6 @@ hfi1_ipoib_priv(const struct net_device *dev)
        return &((struct hfi1_ipoib_rdma_netdev *)netdev_priv(dev))->dev_priv;
 }
 
-static inline void
-hfi1_ipoib_update_rx_netstats(struct hfi1_ipoib_dev_priv *priv,
-                             u64 packets,
-                             u64 bytes)
-{
-       struct pcpu_sw_netstats *netstats = this_cpu_ptr(priv->netstats);
-
-       u64_stats_update_begin(&netstats->syncp);
-       netstats->rx_packets += packets;
-       netstats->rx_bytes += bytes;
-       u64_stats_update_end(&netstats->syncp);
-}
-
-static inline void
-hfi1_ipoib_update_tx_netstats(struct hfi1_ipoib_dev_priv *priv,
-                             u64 packets,
-                             u64 bytes)
-{
-       struct pcpu_sw_netstats *netstats = this_cpu_ptr(priv->netstats);
-
-       u64_stats_update_begin(&netstats->syncp);
-       netstats->tx_packets += packets;
-       netstats->tx_bytes += bytes;
-       u64_stats_update_end(&netstats->syncp);
-}
-
 int hfi1_ipoib_send_dma(struct net_device *dev,
                        struct sk_buff *skb,
                        struct ib_ah *address,

diff --git a/drivers/infiniband/hw/hfi1/ipoib_main.c b/drivers/infiniband/hw/hfi1/ipoib_main.c
index 9f71b9d706bd9efdf8b7b8c885788aabf155db0c..3242290eb6a7c895eb1e73dcec9aaffb59b03592 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ipoib_main.c
+++ b/drivers/infiniband/hw/hfi1/ipoib_main.c
@@ -21,7 +21,7 @@ static int hfi1_ipoib_dev_init(struct net_device *dev)
        struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev);
        int ret;
 
-       priv->netstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
+       dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
 
        ret = priv->netdev_ops->ndo_init(dev);
        if (ret)
@@ -93,21 +93,12 @@ static int hfi1_ipoib_dev_stop(struct net_device *dev)
        return priv->netdev_ops->ndo_stop(dev);
 }
 
-static void hfi1_ipoib_dev_get_stats64(struct net_device *dev,
-                                      struct rtnl_link_stats64 *storage)
-{
-       struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev);
-
-       netdev_stats_to_stats64(storage, &dev->stats);
-       dev_fetch_sw_netstats(storage, priv->netstats);
-}
-
 static const struct net_device_ops hfi1_ipoib_netdev_ops = {
        .ndo_init         = hfi1_ipoib_dev_init,
        .ndo_uninit       = hfi1_ipoib_dev_uninit,
        .ndo_open         = hfi1_ipoib_dev_open,
        .ndo_stop         = hfi1_ipoib_dev_stop,
-       .ndo_get_stats64  = hfi1_ipoib_dev_get_stats64,
+       .ndo_get_stats64  = dev_get_tstats64,
 };
 
 static int hfi1_ipoib_send(struct net_device *dev,
@@ -182,7 +173,7 @@ static void hfi1_ipoib_netdev_dtor(struct net_device *dev)
        hfi1_ipoib_txreq_deinit(priv);
        hfi1_ipoib_rxq_deinit(priv->netdev);
 
-       free_percpu(priv->netstats);
+       free_percpu(dev->tstats);
 }
 
 static void hfi1_ipoib_free_rdma_netdev(struct net_device *dev)

diff --git a/drivers/infiniband/hw/hfi1/ipoib_tx.c b/drivers/infiniband/hw/hfi1/ipoib_tx.c
index 9df292b51a05b929b054be85758dbe71d582558a..edd4eeac8dd1dd42760d723ac7a5717ee22d709f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ipoib_tx.c
+++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c
@@ -121,7 +121,7 @@ static void hfi1_ipoib_free_tx(struct ipoib_txreq *tx, int budget)
        struct hfi1_ipoib_dev_priv *priv = tx->priv;
 
        if (likely(!tx->sdma_status)) {
-               hfi1_ipoib_update_tx_netstats(priv, 1, tx->skb->len);
+               dev_sw_netstats_tx_add(priv->netdev, 1, tx->skb->len);
        } else {
                ++priv->netdev->stats.tx_errors;
                dd_dev_warn(priv->dd,