diff mbox

[for-next,2/2] RDMA/bnxt_re: Implement the alloc/get_hw_stats callback

Message ID 1501603579-13844-3-git-send-email-selvin.xavier@broadcom.com (mailing list archive)
State Superseded
Headers show

Commit Message

Selvin Xavier Aug. 1, 2017, 4:06 p.m. UTC
From: Somnath Kotur <somnath.kotur@broadcom.com>

Expose HW counters using the get_hw_stats callback

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
---
 drivers/infiniband/hw/bnxt_re/Makefile      |   2 +-
 drivers/infiniband/hw/bnxt_re/hw_counters.c | 105 ++++++++++++++++++++++++++++
 drivers/infiniband/hw/bnxt_re/hw_counters.h |  62 ++++++++++++++++
 drivers/infiniband/hw/bnxt_re/main.c        |   4 ++
 4 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.c
 create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.h

Comments

Leon Romanovsky Aug. 1, 2017, 6:26 p.m. UTC | #1
On Tue, Aug 01, 2017 at 09:06:19AM -0700, Selvin Xavier wrote:
> From: Somnath Kotur <somnath.kotur@broadcom.com>
>
> Expose HW counters using the get_hw_stats callback
>
> Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
> Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
> ---
>  drivers/infiniband/hw/bnxt_re/Makefile      |   2 +-
>  drivers/infiniband/hw/bnxt_re/hw_counters.c | 105 ++++++++++++++++++++++++++++
>  drivers/infiniband/hw/bnxt_re/hw_counters.h |  62 ++++++++++++++++
>  drivers/infiniband/hw/bnxt_re/main.c        |   4 ++
>  4 files changed, 172 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.c
>  create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.h
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
kernel test robot Aug. 1, 2017, 10:06 p.m. UTC | #2
Hi Somnath,

[auto build test ERROR on next-20170728]
[cannot apply to rdma/master v4.13-rc3 v4.13-rc2 v4.13-rc1 v4.13-rc3]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Selvin-Xavier/RDMA-bnxt_re-Allocate-multiple-notification-queues/20170802-040507
config: xtensa-allmodconfig (attached as .config)
compiler: xtensa-linux-gcc (GCC) 4.9.0
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=xtensa 

All errors (new ones prefixed by >>):

   In file included from drivers/infiniband/hw/bnxt_re/hw_counters.c:46:0:
>> drivers/infiniband/hw/bnxt_re/qplib_fp.h:413:25: error: field 'worker' has incomplete type
     struct tasklet_struct  worker;
                            ^
   In file included from drivers/infiniband/hw/bnxt_re/hw_counters.c:47:0:
>> drivers/infiniband/hw/bnxt_re/qplib_rcfw.h:160:24: error: field 'worker' has incomplete type
     struct tasklet_struct worker;
                           ^
   In file included from drivers/infiniband/hw/bnxt_re/hw_counters.c:48:0:
>> drivers/infiniband/hw/bnxt_re/bnxt_re.h:113:25: error: field 'nq_task' has incomplete type
     struct tasklet_struct  nq_task;
                            ^

vim +/worker +413 drivers/infiniband/hw/bnxt_re/qplib_fp.h

1ac5a404 Selvin Xavier 2017-02-10  391  
1ac5a404 Selvin Xavier 2017-02-10  392  #define NQ_CONS_PCI_BAR_REGION		2
1ac5a404 Selvin Xavier 2017-02-10  393  #define NQ_DB_KEY_CP			(0x2 << CMPL_DOORBELL_KEY_SFT)
1ac5a404 Selvin Xavier 2017-02-10  394  #define NQ_DB_IDX_VALID			CMPL_DOORBELL_IDX_VALID
1ac5a404 Selvin Xavier 2017-02-10  395  #define NQ_DB_IRQ_DIS			CMPL_DOORBELL_MASK
1ac5a404 Selvin Xavier 2017-02-10  396  #define NQ_DB_CP_FLAGS_REARM		(NQ_DB_KEY_CP |		\
1ac5a404 Selvin Xavier 2017-02-10  397  					 NQ_DB_IDX_VALID)
1ac5a404 Selvin Xavier 2017-02-10  398  #define NQ_DB_CP_FLAGS			(NQ_DB_KEY_CP    |	\
1ac5a404 Selvin Xavier 2017-02-10  399  					 NQ_DB_IDX_VALID |	\
1ac5a404 Selvin Xavier 2017-02-10  400  					 NQ_DB_IRQ_DIS)
1ac5a404 Selvin Xavier 2017-02-10  401  #define NQ_DB_REARM(db, raw_cons, cp_bit)			\
1ac5a404 Selvin Xavier 2017-02-10  402  	writel(NQ_DB_CP_FLAGS_REARM | ((raw_cons) & ((cp_bit) - 1)), db)
1ac5a404 Selvin Xavier 2017-02-10  403  #define NQ_DB(db, raw_cons, cp_bit)				\
1ac5a404 Selvin Xavier 2017-02-10  404  	writel(NQ_DB_CP_FLAGS | ((raw_cons) & ((cp_bit) - 1)), db)
1ac5a404 Selvin Xavier 2017-02-10  405  
1ac5a404 Selvin Xavier 2017-02-10  406  struct bnxt_qplib_nq {
1ac5a404 Selvin Xavier 2017-02-10  407  	struct pci_dev			*pdev;
1ac5a404 Selvin Xavier 2017-02-10  408  
1ac5a404 Selvin Xavier 2017-02-10  409  	int				vector;
8455dd37 Selvin Xavier 2017-08-01  410  	cpumask_t			mask;
1ac5a404 Selvin Xavier 2017-02-10  411  	int				budget;
1ac5a404 Selvin Xavier 2017-02-10  412  	bool				requested;
1ac5a404 Selvin Xavier 2017-02-10 @413  	struct tasklet_struct		worker;
1ac5a404 Selvin Xavier 2017-02-10  414  	struct bnxt_qplib_hwq		hwq;
1ac5a404 Selvin Xavier 2017-02-10  415  
1ac5a404 Selvin Xavier 2017-02-10  416  	u16				bar_reg;
1ac5a404 Selvin Xavier 2017-02-10  417  	u16				bar_reg_off;
1ac5a404 Selvin Xavier 2017-02-10  418  	u16				ring_id;
1ac5a404 Selvin Xavier 2017-02-10  419  	void __iomem			*bar_reg_iomem;
1ac5a404 Selvin Xavier 2017-02-10  420  
1ac5a404 Selvin Xavier 2017-02-10  421  	int				(*cqn_handler)
1ac5a404 Selvin Xavier 2017-02-10  422  						(struct bnxt_qplib_nq *nq,
1ac5a404 Selvin Xavier 2017-02-10  423  						 struct bnxt_qplib_cq *cq);
1ac5a404 Selvin Xavier 2017-02-10  424  	int				(*srqn_handler)
1ac5a404 Selvin Xavier 2017-02-10  425  						(struct bnxt_qplib_nq *nq,
1ac5a404 Selvin Xavier 2017-02-10  426  						 void *srq,
1ac5a404 Selvin Xavier 2017-02-10  427  						 u8 event);
f218d67e Selvin Xavier 2017-06-29  428  	struct workqueue_struct         *cqn_wq;
8455dd37 Selvin Xavier 2017-08-01  429  	char                            name[32];
f218d67e Selvin Xavier 2017-06-29  430  };
f218d67e Selvin Xavier 2017-06-29  431  

:::::: The code at line 413 was first introduced by commit
:::::: 1ac5a404797523cedaf424a3aaa3cf8f9548dff8 RDMA/bnxt_re: Add bnxt_re RoCE driver

:::::: TO: Selvin Xavier <selvin.xavier@broadcom.com>
:::::: CC: Doug Ledford <dledford@redhat.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/infiniband/hw/bnxt_re/Makefile b/drivers/infiniband/hw/bnxt_re/Makefile
index 036f84e..afbaa0e 100644
--- a/drivers/infiniband/hw/bnxt_re/Makefile
+++ b/drivers/infiniband/hw/bnxt_re/Makefile
@@ -3,4 +3,4 @@  ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt
 obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o
 bnxt_re-y := main.o ib_verbs.o \
 	     qplib_res.o qplib_rcfw.o	\
-	     qplib_sp.o qplib_fp.o
+	     qplib_sp.o qplib_fp.o  hw_counters.o
diff --git a/drivers/infiniband/hw/bnxt_re/hw_counters.c b/drivers/infiniband/hw/bnxt_re/hw_counters.c
new file mode 100644
index 0000000..8b0929e
--- /dev/null
+++ b/drivers/infiniband/hw/bnxt_re/hw_counters.c
@@ -0,0 +1,105 @@ 
+/*
+ * Broadcom NetXtreme-E RoCE driver.
+ *
+ * Copyright (c) 2016 - 2017, Broadcom. All rights reserved.  The term
+ * Broadcom refers to Broadcom Limited and/or its subsidiaries.
+ *
+ * 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
+ * BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Description: Statistics
+ *
+ */
+
+#include <rdma/ib_addr.h>
+
+#include "bnxt_ulp.h"
+#include "roce_hsi.h"
+#include "qplib_res.h"
+#include "qplib_sp.h"
+#include "qplib_fp.h"
+#include "qplib_rcfw.h"
+#include "bnxt_re.h"
+#include "hw_counters.h"
+
+static const char * const bnxt_re_stat_name[] = {
+	[BNXT_RE_ACTIVE_QP]           =  "active_qps",
+	[BNXT_RE_ACTIVE_SRQ]          =  "active_srqs",
+	[BNXT_RE_ACTIVE_CQ]           =  "active_cqs",
+	[BNXT_RE_ACTIVE_MR]           =  "active_mrs",
+	[BNXT_RE_ACTIVE_MW]           =  "active_mws",
+	[BNXT_RE_RX_PKTS]             =  "rx_pkts",
+	[BNXT_RE_RX_BYTES]            =  "rx_bytes",
+	[BNXT_RE_TX_PKTS]             =  "tx_pkts",
+	[BNXT_RE_TX_BYTES]            =  "tx_bytes",
+	[BNXT_RE_RECOVERABLE_ERRORS]  =  "recoverable_errors"
+};
+
+int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
+			    struct rdma_hw_stats *stats,
+			    u8 port, int index)
+{
+	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);
+	struct ctx_hw_stats *bnxt_re_stats = rdev->qplib_ctx.stats.dma;
+
+	if (!port || !stats)
+		return -EINVAL;
+
+	stats->value[BNXT_RE_ACTIVE_QP] = atomic_read(&rdev->qp_count);
+	stats->value[BNXT_RE_ACTIVE_SRQ] = atomic_read(&rdev->srq_count);
+	stats->value[BNXT_RE_ACTIVE_CQ] = atomic_read(&rdev->cq_count);
+	stats->value[BNXT_RE_ACTIVE_MR] = atomic_read(&rdev->mr_count);
+	stats->value[BNXT_RE_ACTIVE_MW] = atomic_read(&rdev->mw_count);
+	if (bnxt_re_stats) {
+		stats->value[BNXT_RE_RECOVERABLE_ERRORS] =
+			le64_to_cpu(bnxt_re_stats->tx_bcast_pkts);
+		stats->value[BNXT_RE_RX_PKTS] =
+			le64_to_cpu(bnxt_re_stats->rx_ucast_pkts);
+		stats->value[BNXT_RE_RX_BYTES] =
+			le64_to_cpu(bnxt_re_stats->rx_ucast_bytes);
+		stats->value[BNXT_RE_TX_PKTS] =
+			le64_to_cpu(bnxt_re_stats->tx_ucast_pkts);
+		stats->value[BNXT_RE_TX_BYTES] =
+			le64_to_cpu(bnxt_re_stats->tx_ucast_bytes);
+	}
+	return ARRAY_SIZE(bnxt_re_stat_name);
+}
+
+struct rdma_hw_stats *bnxt_re_ib_alloc_hw_stats(struct ib_device *ibdev,
+						u8 port_num)
+{
+	BUILD_BUG_ON(ARRAY_SIZE(bnxt_re_stat_name) != BNXT_RE_NUM_COUNTERS);
+	/* We support only per port stats */
+	if (!port_num)
+		return NULL;
+
+	return rdma_alloc_hw_stats_struct(bnxt_re_stat_name,
+					  ARRAY_SIZE(bnxt_re_stat_name),
+					  RDMA_HW_STATS_DEFAULT_LIFESPAN);
+}
diff --git a/drivers/infiniband/hw/bnxt_re/hw_counters.h b/drivers/infiniband/hw/bnxt_re/hw_counters.h
new file mode 100644
index 0000000..c624fa3
--- /dev/null
+++ b/drivers/infiniband/hw/bnxt_re/hw_counters.h
@@ -0,0 +1,62 @@ 
+/*
+ * Broadcom NetXtreme-E RoCE driver.
+ *
+ * Copyright (c) 2016 - 2017, Broadcom. All rights reserved.  The term
+ * Broadcom refers to Broadcom Limited and/or its subsidiaries.
+ *
+ * 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
+ * BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Description: Statistics (header)
+ *
+ */
+
+#ifndef HW_STATS_H
+#define HW_STATS_H
+
+enum bnxt_re_hw_stats {
+	BNXT_RE_ACTIVE_QP,
+	BNXT_RE_ACTIVE_SRQ,
+	BNXT_RE_ACTIVE_CQ,
+	BNXT_RE_ACTIVE_MR,
+	BNXT_RE_ACTIVE_MW,
+	BNXT_RE_RX_PKTS,
+	BNXT_RE_RX_BYTES,
+	BNXT_RE_TX_PKTS,
+	BNXT_RE_TX_BYTES,
+	BNXT_RE_RECOVERABLE_ERRORS,
+	BNXT_RE_NUM_COUNTERS
+};
+
+struct rdma_hw_stats *bnxt_re_ib_alloc_hw_stats(struct ib_device *ibdev,
+						u8 port_num);
+int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev,
+			    struct rdma_hw_stats *stats,
+			    u8 port, int index);
+#endif /* HW_STATS_H */
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 5b78d8f..82d1cbc 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -64,6 +64,8 @@ 
 #include "ib_verbs.h"
 #include <rdma/bnxt_re-abi.h>
 #include "bnxt.h"
+#include "hw_counters.h"
+
 static char version[] =
 		BNXT_RE_DESC " v" ROCE_DRV_MODULE_VERSION "\n";
 
@@ -513,6 +515,8 @@  static int bnxt_re_register_ib(struct bnxt_re_dev *rdev)
 	ibdev->alloc_ucontext		= bnxt_re_alloc_ucontext;
 	ibdev->dealloc_ucontext		= bnxt_re_dealloc_ucontext;
 	ibdev->mmap			= bnxt_re_mmap;
+	ibdev->get_hw_stats             = bnxt_re_ib_get_hw_stats;
+	ibdev->alloc_hw_stats           = bnxt_re_ib_alloc_hw_stats;
 
 	return ib_register_device(ibdev, NULL);
 }