diff mbox

[for-4.1,09/11] RDMA/ocrdma: Add CQ usage statistics counters

Message ID 1431762709-20740-10-git-send-email-selvin.xavier@avagotech.com (mailing list archive)
State Superseded
Headers show

Commit Message

Selvin Xavier May 16, 2015, 7:51 a.m. UTC 
From: Meghana Cheripady <meghana.cheripady@avagotech.com>

Add counters for tracking the CQ usage by applications.

Signed-off-by: Meghana Cheripady <meghana.cheripady@avagotech.com>
Signed-off-by: Selvin Xavier <selvin.xavier@avagotech.com>
---
 drivers/infiniband/hw/ocrdma/ocrdma.h       |  2 ++
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |  8 ++++++++
 drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 15 +++++++++++++++
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |  2 ++
 4 files changed, 27 insertions(+)

Comments

Doug Ledford May 15, 2015, 3:57 p.m. UTC | #1 
On Sat, 2015-05-16 at 13:21 +0530, Selvin Xavier wrote:
> From: Meghana Cheripady <meghana.cheripady@avagotech.com>
> 
> Add counters for tracking the CQ usage by applications.

This isn't a bug fix, it's an enhancement.  We are already in the
4.1-rc3+ phase, enhancements aren't really appropriate (even if they
seem minor).  Please drop this one from the patchset.

> 
> Signed-off-by: Meghana Cheripady <meghana.cheripady@avagotech.com>
> Signed-off-by: Selvin Xavier <selvin.xavier@avagotech.com>
> ---
>  drivers/infiniband/hw/ocrdma/ocrdma.h       |  2 ++
>  drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |  8 ++++++++
>  drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 15 +++++++++++++++
>  drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |  2 ++
>  4 files changed, 27 insertions(+)
> 
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
> index ee9e335..8782e1f 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma.h
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
> @@ -290,6 +290,8 @@ struct ocrdma_dev {
>  	struct dentry *dir;
>  	atomic_t async_err_stats[OCRDMA_MAX_ASYNC_ERRORS];
>  	atomic_t cqe_err_stats[OCRDMA_MAX_CQE_ERR];
> +	atomic_t act_cq_stats;
> +	atomic_t th_cq_stats;
>  	struct ocrdma_pd_resource_mgr *pd_mgr;
>  };
>  
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> index 319675c..596d8c9 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
> @@ -1720,6 +1720,7 @@ int ocrdma_mbx_create_cq(struct ocrdma_dev *dev, struct ocrdma_cq *cq,
>  	struct ocrdma_create_cq *cmd;
>  	struct ocrdma_create_cq_rsp *rsp;
>  	u32 hw_pages, cqe_size, page_size, cqe_count;
> +	int act_cq_cnt, th_cq_cnt;
>  
>  	if (entries > dev->attr.max_cqe) {
>  		pr_err("%s(%d) max_cqe=0x%x, requester_cqe=0x%x\n",
> @@ -1808,6 +1809,13 @@ int ocrdma_mbx_create_cq(struct ocrdma_dev *dev, struct ocrdma_cq *cq,
>  
>  	rsp = (struct ocrdma_create_cq_rsp *)cmd;
>  	cq->id = (u16) (rsp->rsp.cq_id & OCRDMA_CREATE_CQ_RSP_CQ_ID_MASK);
> +
> +	atomic_inc(&dev->act_cq_stats);
> +	act_cq_cnt = atomic_read(&dev->act_cq_stats);
> +	th_cq_cnt = atomic_read(&dev->th_cq_stats);
> +	if (th_cq_cnt < act_cq_cnt)
> +		atomic_set(&dev->th_cq_stats, act_cq_cnt);
> +
>  	kfree(cmd);
>  	return 0;
>  mbx_err:
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
> index 48d7ef5..47fef14 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
> @@ -146,6 +146,8 @@ static char *ocrdma_resource_stats(struct ocrdma_dev *dev)
>  				(u64)rsrc_stats->phy_mr);
>  	pcur += ocrdma_add_stat(stats, pcur, "active_mw",
>  				(u64)rsrc_stats->mw);
> +	pcur += ocrdma_add_stat(stats, pcur, "active_cq_usage_stats",
> +				(u64)atomic_read(&dev->act_cq_stats));
>  
>  	/* Print the threshold stats */
>  	rsrc_stats = &rdma_stats->th_rsrc_stats;
> @@ -200,6 +202,8 @@ static char *ocrdma_resource_stats(struct ocrdma_dev *dev)
>  				(u64)rsrc_stats->phy_mr);
>  	pcur += ocrdma_add_stat(stats, pcur, "threshold_mw",
>  				(u64)rsrc_stats->mw);
> +	pcur += ocrdma_add_stat(stats, pcur, "threshold_cq_usage_stats",
> +				(u64)atomic_read(&dev->th_cq_stats));
>  	return stats;
>  }
>  
> @@ -745,6 +749,16 @@ static const struct file_operations ocrdma_dbg_ops = {
>  	.write = ocrdma_dbgfs_ops_write,
>  };
>  
> +static void ocrdma_init_cq_stats(struct ocrdma_dev *dev)
> +{
> +	int i, cq_cnt = 0;
> +
> +	for (i = 0; i < dev->eq_cnt; i++)
> +		cq_cnt += dev->eq_tbl[i].cq_cnt;
> +	atomic_set(&dev->act_cq_stats, cq_cnt);
> +	atomic_set(&dev->th_cq_stats, cq_cnt);
> +}
> +
>  void ocrdma_add_port_stats(struct ocrdma_dev *dev)
>  {
>  	if (!ocrdma_dbgfs_dir)
> @@ -828,6 +842,7 @@ void ocrdma_add_port_stats(struct ocrdma_dev *dev)
>  		goto err;
>  
>  	mutex_init(&dev->stats_lock);
> +	ocrdma_init_cq_stats(dev);
>  
>  	return;
>  err:
> diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> index 9dcb660..48ec56f 100644
> --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
> @@ -1119,6 +1119,8 @@ int ocrdma_destroy_cq(struct ib_cq *ibcq)
>  				dev->nic_info.db_page_size);
>  	}
>  
> +	atomic_dec(&dev->act_cq_stats);
> +
>  	kfree(cq);
>  	return 0;
>  }
Selvin Xavier May 15, 2015, 4:55 p.m. UTC | #2 
> -----Original Message-----
> From: Doug Ledford [mailto:dledford@redhat.com]
> Sent: Friday, May 15, 2015 9:28 PM
> To: Selvin Xavier
> Cc: linux-rdma@vger.kernel.org
> Subject: Re: [PATCH for-4.1 09/11] RDMA/ocrdma: Add CQ usage statistics
> counters
>
> On Sat, 2015-05-16 at 13:21 +0530, Selvin Xavier wrote:
> > From: Meghana Cheripady <meghana.cheripady@avagotech.com>
> >
> > Add counters for tracking the CQ usage by applications.
>
> This isn't a bug fix, it's an enhancement.  We are already in the 4.1-rc3+
> phase, enhancements aren't really appropriate (even if they seem minor).
> Please drop this one from the patchset.
>
Sure.. I will drop this patch from this patch set.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index ee9e335..8782e1f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -290,6 +290,8 @@  struct ocrdma_dev {
 	struct dentry *dir;
 	atomic_t async_err_stats[OCRDMA_MAX_ASYNC_ERRORS];
 	atomic_t cqe_err_stats[OCRDMA_MAX_CQE_ERR];
+	atomic_t act_cq_stats;
+	atomic_t th_cq_stats;
 	struct ocrdma_pd_resource_mgr *pd_mgr;
 };
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 319675c..596d8c9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1720,6 +1720,7 @@  int ocrdma_mbx_create_cq(struct ocrdma_dev *dev, struct ocrdma_cq *cq,
 	struct ocrdma_create_cq *cmd;
 	struct ocrdma_create_cq_rsp *rsp;
 	u32 hw_pages, cqe_size, page_size, cqe_count;
+	int act_cq_cnt, th_cq_cnt;
 
 	if (entries > dev->attr.max_cqe) {
 		pr_err("%s(%d) max_cqe=0x%x, requester_cqe=0x%x\n",
@@ -1808,6 +1809,13 @@  int ocrdma_mbx_create_cq(struct ocrdma_dev *dev, struct ocrdma_cq *cq,
 
 	rsp = (struct ocrdma_create_cq_rsp *)cmd;
 	cq->id = (u16) (rsp->rsp.cq_id & OCRDMA_CREATE_CQ_RSP_CQ_ID_MASK);
+
+	atomic_inc(&dev->act_cq_stats);
+	act_cq_cnt = atomic_read(&dev->act_cq_stats);
+	th_cq_cnt = atomic_read(&dev->th_cq_stats);
+	if (th_cq_cnt < act_cq_cnt)
+		atomic_set(&dev->th_cq_stats, act_cq_cnt);
+
 	kfree(cmd);
 	return 0;
 mbx_err:
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
index 48d7ef5..47fef14 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
@@ -146,6 +146,8 @@  static char *ocrdma_resource_stats(struct ocrdma_dev *dev)
 				(u64)rsrc_stats->phy_mr);
 	pcur += ocrdma_add_stat(stats, pcur, "active_mw",
 				(u64)rsrc_stats->mw);
+	pcur += ocrdma_add_stat(stats, pcur, "active_cq_usage_stats",
+				(u64)atomic_read(&dev->act_cq_stats));
 
 	/* Print the threshold stats */
 	rsrc_stats = &rdma_stats->th_rsrc_stats;
@@ -200,6 +202,8 @@  static char *ocrdma_resource_stats(struct ocrdma_dev *dev)
 				(u64)rsrc_stats->phy_mr);
 	pcur += ocrdma_add_stat(stats, pcur, "threshold_mw",
 				(u64)rsrc_stats->mw);
+	pcur += ocrdma_add_stat(stats, pcur, "threshold_cq_usage_stats",
+				(u64)atomic_read(&dev->th_cq_stats));
 	return stats;
 }
 
@@ -745,6 +749,16 @@  static const struct file_operations ocrdma_dbg_ops = {
 	.write = ocrdma_dbgfs_ops_write,
 };
 
+static void ocrdma_init_cq_stats(struct ocrdma_dev *dev)
+{
+	int i, cq_cnt = 0;
+
+	for (i = 0; i < dev->eq_cnt; i++)
+		cq_cnt += dev->eq_tbl[i].cq_cnt;
+	atomic_set(&dev->act_cq_stats, cq_cnt);
+	atomic_set(&dev->th_cq_stats, cq_cnt);
+}
+
 void ocrdma_add_port_stats(struct ocrdma_dev *dev)
 {
 	if (!ocrdma_dbgfs_dir)
@@ -828,6 +842,7 @@  void ocrdma_add_port_stats(struct ocrdma_dev *dev)
 		goto err;
 
 	mutex_init(&dev->stats_lock);
+	ocrdma_init_cq_stats(dev);
 
 	return;
 err:
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 9dcb660..48ec56f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1119,6 +1119,8 @@  int ocrdma_destroy_cq(struct ib_cq *ibcq)
 				dev->nic_info.db_page_size);
 	}
 
+	atomic_dec(&dev->act_cq_stats);
+
 	kfree(cq);
 	return 0;
 }