IB/rxe: Add port protocol stats
authorYonatan Cohen <yonatanc@mellanox.com>
Fri, 10 Mar 2017 16:23:56 +0000 (18:23 +0200)
committerDoug Ledford <dledford@redhat.com>
Fri, 21 Apr 2017 14:43:28 +0000 (10:43 -0400)
Expose new counters using the get_hw_stats callback.
We expose the following counters:

+---------------------+----------------------------------------+
|      Name           |           Description                  |
|---------------------+----------------------------------------|
|sent_pkts            | number of sent pkts                    |
|---------------------+----------------------------------------|
|rcvd_pkts            | number of received packets             |
|---------------------+----------------------------------------|
|out_of_sequence      | number of errors due to packet         |
|                     | transport sequence number              |
|---------------------+----------------------------------------|
|duplicate_request    | number of received duplicated packets. |
|                     | A request that previously executed is  |
|                     | named duplicated.                      |
|---------------------+----------------------------------------|
|rcvd_rnr_err         | number of received RNR by completer    |
|---------------------+----------------------------------------|
|send_rnr_err         | number of sent RNR by responder        |
|---------------------+----------------------------------------|
|rcvd_seq_err         | number of out of sequence packets      |
|                     | received                               |
|---------------------+----------------------------------------|
|ack_deffered         | number of deferred handling of ack     |
|                     | packets.                               |
|---------------------+----------------------------------------|
|retry_exceeded_err   | number of times retry exceeded         |
|---------------------+----------------------------------------|
|completer_retry_err  | number of times completer decided to   |
|                     | retry                                  |
|---------------------+----------------------------------------|
|send_err             | number of failed send packet           |
+---------------------+----------------------------------------+

Signed-off-by: Yonatan Cohen <yonatanc@mellanox.com>
Reviewed-by: Moni Shoua <monis@mellanox.com>
Reviewed-by: Andrew Boyer <andrew.boyer@dell.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/sw/rxe/Makefile
drivers/infiniband/sw/rxe/rxe_comp.c
drivers/infiniband/sw/rxe/rxe_hw_counters.c [new file with mode: 0644]
drivers/infiniband/sw/rxe/rxe_hw_counters.h [new file with mode: 0644]
drivers/infiniband/sw/rxe/rxe_loc.h
drivers/infiniband/sw/rxe/rxe_recv.c
drivers/infiniband/sw/rxe/rxe_resp.c
drivers/infiniband/sw/rxe/rxe_verbs.c
drivers/infiniband/sw/rxe/rxe_verbs.h

index ec35ff022a4298820bc2e6480066255b57fe915e..3f12beb7076fce060701c0284a0e0fd69a703386 100644 (file)
@@ -20,4 +20,5 @@ rdma_rxe-y := \
        rxe_mcast.o \
        rxe_task.o \
        rxe_net.o \
-       rxe_sysfs.o
+       rxe_sysfs.o \
+       rxe_hw_counters.o
index 4cd55d5617f7399d1820ec334b2ea66db538ae27..9eb12c2e3c74cf69499124e21fcb1b4a8be4a40f 100644 (file)
@@ -154,6 +154,8 @@ void rxe_comp_queue_pkt(struct rxe_dev *rxe, struct rxe_qp *qp,
        skb_queue_tail(&qp->resp_pkts, skb);
 
        must_sched = skb_queue_len(&qp->resp_pkts) > 1;
+       if (must_sched != 0)
+               rxe_counter_inc(rxe, RXE_CNT_COMPLETER_SCHED);
        rxe_run_task(&qp->comp.task, must_sched);
 }
 
@@ -236,6 +238,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
 {
        unsigned int mask = pkt->mask;
        u8 syn;
+       struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
 
        /* Check the sequence only */
        switch (qp->comp.opcode) {
@@ -298,6 +301,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
                        return COMPST_WRITE_SEND;
 
                case AETH_RNR_NAK:
+                       rxe_counter_inc(rxe, RXE_CNT_RCV_RNR);
                        return COMPST_RNR_RETRY;
 
                case AETH_NAK:
@@ -307,6 +311,8 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,
                                 * before
                                 */
                                if (psn_compare(pkt->psn, qp->comp.psn) > 0) {
+                                       rxe_counter_inc(rxe,
+                                                       RXE_CNT_RCV_SEQ_ERR);
                                        qp->comp.psn = pkt->psn;
                                        if (qp->req.wait_psn) {
                                                qp->req.wait_psn = 0;
@@ -534,6 +540,7 @@ static void rxe_drain_resp_pkts(struct rxe_qp *qp, bool notify)
 int rxe_completer(void *arg)
 {
        struct rxe_qp *qp = (struct rxe_qp *)arg;
+       struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
        struct rxe_send_wqe *wqe = wqe;
        struct sk_buff *skb = NULL;
        struct rxe_pkt_info *pkt = NULL;
@@ -683,8 +690,10 @@ int rxe_completer(void *arg)
                                if (psn_compare(qp->req.psn,
                                                qp->comp.psn) > 0) {
                                        /* tell the requester to retry the
-                                        * send send queue next time around
+                                        * send queue next time around
                                         */
+                                       rxe_counter_inc(rxe,
+                                                       RXE_CNT_COMP_RETRY);
                                        qp->req.need_retry = 1;
                                        rxe_run_task(&qp->req.task, 1);
                                }
@@ -699,6 +708,7 @@ int rxe_completer(void *arg)
                                goto exit;
 
                        } else {
+                               rxe_counter_inc(rxe, RXE_CNT_RETRY_EXCEEDED);
                                wqe->status = IB_WC_RETRY_EXC_ERR;
                                state = COMPST_ERROR;
                        }
@@ -720,6 +730,8 @@ int rxe_completer(void *arg)
                                skb = NULL;
                                goto exit;
                        } else {
+                               rxe_counter_inc(rxe,
+                                               RXE_CNT_RNR_RETRY_EXCEEDED);
                                wqe->status = IB_WC_RNR_RETRY_EXC_ERR;
                                state = COMPST_ERROR;
                        }
diff --git a/drivers/infiniband/sw/rxe/rxe_hw_counters.c b/drivers/infiniband/sw/rxe/rxe_hw_counters.c
new file mode 100644 (file)
index 0000000..7ef90aa
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     - Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer.
+ *
+ *     - Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "rxe.h"
+#include "rxe_hw_counters.h"
+
+const char * const rxe_counter_name[] = {
+       [RXE_CNT_SENT_PKTS]           =  "sent_pkts",
+       [RXE_CNT_RCVD_PKTS]           =  "rcvd_pkts",
+       [RXE_CNT_DUP_REQ]             =  "duplicate_request",
+       [RXE_CNT_OUT_OF_SEQ_REQ]      =  "out_of_sequence",
+       [RXE_CNT_RCV_RNR]             =  "rcvd_rnr_err",
+       [RXE_CNT_SND_RNR]             =  "send_rnr_err",
+       [RXE_CNT_RCV_SEQ_ERR]         =  "rcvd_seq_err",
+       [RXE_CNT_COMPLETER_SCHED]     =  "ack_deffered",
+       [RXE_CNT_RETRY_EXCEEDED]      =  "retry_exceeded_err",
+       [RXE_CNT_RNR_RETRY_EXCEEDED]  =  "retry_rnr_exceeded_err",
+       [RXE_CNT_COMP_RETRY]          =  "completer_retry_err",
+       [RXE_CNT_SEND_ERR]            =  "send_err",
+};
+
+int rxe_ib_get_hw_stats(struct ib_device *ibdev,
+                       struct rdma_hw_stats *stats,
+                       u8 port, int index)
+{
+       struct rxe_dev *dev = to_rdev(ibdev);
+       unsigned int cnt;
+
+       if (!port || !stats)
+               return -EINVAL;
+
+       for (cnt = 0; cnt  < ARRAY_SIZE(rxe_counter_name); cnt++)
+               stats->value[cnt] = dev->stats_counters[cnt];
+
+       return ARRAY_SIZE(rxe_counter_name);
+}
+
+struct rdma_hw_stats *rxe_ib_alloc_hw_stats(struct ib_device *ibdev,
+                                           u8 port_num)
+{
+       BUILD_BUG_ON(ARRAY_SIZE(rxe_counter_name) != RXE_NUM_OF_COUNTERS);
+       /* We support only per port stats */
+       if (!port_num)
+               return NULL;
+
+       return rdma_alloc_hw_stats_struct(rxe_counter_name,
+                                         ARRAY_SIZE(rxe_counter_name),
+                                         RDMA_HW_STATS_DEFAULT_LIFESPAN);
+}
diff --git a/drivers/infiniband/sw/rxe/rxe_hw_counters.h b/drivers/infiniband/sw/rxe/rxe_hw_counters.h
new file mode 100644 (file)
index 0000000..f44df1b
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     - Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer.
+ *
+ *     - Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef RXE_HW_COUNTERS_H
+#define RXE_HW_COUNTERS_H
+
+/*
+ * when adding counters to enum also add
+ * them to rxe_counter_name[] vector.
+ */
+enum rxe_counters {
+       RXE_CNT_SENT_PKTS,
+       RXE_CNT_RCVD_PKTS,
+       RXE_CNT_DUP_REQ,
+       RXE_CNT_OUT_OF_SEQ_REQ,
+       RXE_CNT_RCV_RNR,
+       RXE_CNT_SND_RNR,
+       RXE_CNT_RCV_SEQ_ERR,
+       RXE_CNT_COMPLETER_SCHED,
+       RXE_CNT_RETRY_EXCEEDED,
+       RXE_CNT_RNR_RETRY_EXCEEDED,
+       RXE_CNT_COMP_RETRY,
+       RXE_CNT_SEND_ERR,
+       RXE_NUM_OF_COUNTERS
+};
+
+struct rdma_hw_stats *rxe_ib_alloc_hw_stats(struct ib_device *ibdev,
+                                           u8 port_num);
+int rxe_ib_get_hw_stats(struct ib_device *ibdev,
+                       struct rdma_hw_stats *stats,
+                       u8 port, int index);
+#endif /* RXE_HW_COUNTERS_H */
index 183a9d379b41c087ce60361e985c6be2c0baa87b..651784358f2b909cac7f343bb1a991baca47b06d 100644 (file)
@@ -278,6 +278,7 @@ static inline int rxe_xmit_packet(struct rxe_dev *rxe, struct rxe_qp *qp,
 
        if (err) {
                rxe->xmit_errors++;
+               rxe_counter_inc(rxe, RXE_CNT_SEND_ERR);
                return err;
        }
 
@@ -287,6 +288,7 @@ static inline int rxe_xmit_packet(struct rxe_dev *rxe, struct rxe_qp *qp,
                rxe_run_task(&qp->comp.task, 1);
        }
 
+       rxe_counter_inc(rxe, RXE_CNT_SENT_PKTS);
        goto done;
 
 drop:
index 50886031096fb009c3876f1929304430ffe52916..dadd4a0e3cf71045711caa221f2d96e71af6f0c9 100644 (file)
@@ -403,6 +403,8 @@ int rxe_rcv(struct sk_buff *skb)
                goto drop;
        }
 
+       rxe_counter_inc(rxe, RXE_CNT_RCVD_PKTS);
+
        if (unlikely(bth_qpn(pkt) == IB_MULTICAST_QPN))
                rxe_rcv_mcast_pkt(rxe, skb);
        else
index c9dd385ce62e2c65b97e5bf16e5d8f6288b6f19c..ec11a9c25f23307f19e68b20d02d095b50815441 100644 (file)
@@ -149,6 +149,7 @@ static enum resp_states check_psn(struct rxe_qp *qp,
                                  struct rxe_pkt_info *pkt)
 {
        int diff = psn_compare(pkt->psn, qp->resp.psn);
+       struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
 
        switch (qp_type(qp)) {
        case IB_QPT_RC:
@@ -157,9 +158,11 @@ static enum resp_states check_psn(struct rxe_qp *qp,
                                return RESPST_CLEANUP;
 
                        qp->resp.sent_psn_nak = 1;
+                       rxe_counter_inc(rxe, RXE_CNT_OUT_OF_SEQ_REQ);
                        return RESPST_ERR_PSN_OUT_OF_SEQ;
 
                } else if (diff < 0) {
+                       rxe_counter_inc(rxe, RXE_CNT_DUP_REQ);
                        return RESPST_DUPLICATE_REQUEST;
                }
 
@@ -1223,6 +1226,7 @@ void rxe_drain_req_pkts(struct rxe_qp *qp, bool notify)
 int rxe_responder(void *arg)
 {
        struct rxe_qp *qp = (struct rxe_qp *)arg;
+       struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
        enum resp_states state;
        struct rxe_pkt_info *pkt = NULL;
        int ret = 0;
@@ -1311,6 +1315,7 @@ int rxe_responder(void *arg)
                        break;
                case RESPST_ERR_RNR:
                        if (qp_type(qp) == IB_QPT_RC) {
+                               rxe_counter_inc(rxe, RXE_CNT_SND_RNR);
                                /* RC - class B */
                                send_ack(qp, pkt, AETH_RNR_NAK |
                                         (~AETH_TYPE_MASK &
index 5113e502f6f969013cce0ac0f524bfba385f43f8..f75210e478024b692bc259aa3c76602cf24b359d 100644 (file)
@@ -35,6 +35,7 @@
 #include "rxe.h"
 #include "rxe_loc.h"
 #include "rxe_queue.h"
+#include "rxe_hw_counters.h"
 
 static int rxe_query_device(struct ib_device *dev,
                            struct ib_device_attr *attr,
@@ -1318,6 +1319,8 @@ int rxe_register_device(struct rxe_dev *rxe)
        dev->map_mr_sg = rxe_map_mr_sg;
        dev->attach_mcast = rxe_attach_mcast;
        dev->detach_mcast = rxe_detach_mcast;
+       dev->get_hw_stats = rxe_ib_get_hw_stats;
+       dev->alloc_hw_stats = rxe_ib_alloc_hw_stats;
 
        err = ib_register_device(dev, NULL);
        if (err) {
index e100c500ae851bca8b291ea81dd4e8c74542c5c3..8e0a093f04724e64584ac4f62770cc6b137e3750 100644 (file)
@@ -38,6 +38,7 @@
 #include <rdma/rdma_user_rxe.h>
 #include "rxe_pool.h"
 #include "rxe_task.h"
+#include "rxe_hw_counters.h"
 
 static inline int pkey_match(u16 key1, u16 key2)
 {
@@ -401,10 +402,17 @@ struct rxe_dev {
        spinlock_t              mmap_offset_lock; /* guard mmap_offset */
        int                     mmap_offset;
 
+       u64                     stats_counters[RXE_NUM_OF_COUNTERS];
+
        struct rxe_port         port;
        struct list_head        list;
 };
 
+static inline void rxe_counter_inc(struct rxe_dev *rxe, enum rxe_counters cnt)
+{
+       rxe->stats_counters[cnt]++;
+}
+
 static inline struct rxe_dev *to_rdev(struct ib_device *dev)
 {
        return dev ? container_of(dev, struct rxe_dev, ib_dev) : NULL;