Commit 063975fe authored by Chandramohan Akula's avatar Chandramohan Akula Committed by Leon Romanovsky
Browse files

bnxt_re: Reorganize the resource stats 



Move the resource stats to a separate stats structure.

Signed-off-by: default avatarChandramohan Akula <chandramohan.akula@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://lore.kernel.org/r/1690383081-15033-2-git-send-email-selvin.xavier@broadcom.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 693e1cde

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -175,16 +175,9 @@ struct bnxt_re_dev { 
	struct bnxt_qplib_res		qplib_res;

	struct bnxt_qplib_res		qplib_res;

	struct bnxt_qplib_dpi		dpi_privileged;

	struct bnxt_qplib_dpi		dpi_privileged;





	atomic_t			qp_count;

	struct mutex			qp_lock;	/* protect qp list */

	struct mutex			qp_lock;	/* protect qp list */

	struct list_head		qp_list;

	struct list_head		qp_list;





	atomic_t			cq_count;

	atomic_t			srq_count;

	atomic_t			mr_count;

	atomic_t			mw_count;

	atomic_t			ah_count;

	atomic_t			pd_count;

	/* Max of 2 lossless traffic class supported per port */

	/* Max of 2 lossless traffic class supported per port */

	u16				cosq[2];

	u16				cosq[2];

drivers/infiniband/hw/bnxt_re/hw_counters.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -254,21 +254,22 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, 
			    u32 port, int index)

			    u32 port, int index)

{

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct ctx_hw_stats *hw_stats = NULL;

	struct bnxt_re_res_cntrs *res_s = &rdev->stats.res;

	struct bnxt_qplib_roce_stats *err_s = NULL;

	struct bnxt_qplib_roce_stats *err_s = NULL;

	struct ctx_hw_stats *hw_stats = NULL;

	int rc  = 0;

	int rc  = 0;





	hw_stats = rdev->qplib_ctx.stats.dma;

	hw_stats = rdev->qplib_ctx.stats.dma;

	if (!port || !stats)

	if (!port || !stats)

		return -EINVAL;

		return -EINVAL;





	stats->value[BNXT_RE_ACTIVE_QP] = atomic_read(&rdev->qp_count);

	stats->value[BNXT_RE_ACTIVE_QP] = atomic_read(&res_s->qp_count);

	stats->value[BNXT_RE_ACTIVE_SRQ] = atomic_read(&rdev->srq_count);

	stats->value[BNXT_RE_ACTIVE_SRQ] = atomic_read(&res_s->srq_count);

	stats->value[BNXT_RE_ACTIVE_CQ] = atomic_read(&rdev->cq_count);

	stats->value[BNXT_RE_ACTIVE_CQ] = atomic_read(&res_s->cq_count);

	stats->value[BNXT_RE_ACTIVE_MR] = atomic_read(&rdev->mr_count);

	stats->value[BNXT_RE_ACTIVE_MR] = atomic_read(&res_s->mr_count);

	stats->value[BNXT_RE_ACTIVE_MW] = atomic_read(&rdev->mw_count);

	stats->value[BNXT_RE_ACTIVE_MW] = atomic_read(&res_s->mw_count);

	stats->value[BNXT_RE_ACTIVE_PD] = atomic_read(&rdev->pd_count);

	stats->value[BNXT_RE_ACTIVE_PD] = atomic_read(&res_s->pd_count);

	stats->value[BNXT_RE_ACTIVE_AH] = atomic_read(&rdev->ah_count);

	stats->value[BNXT_RE_ACTIVE_AH] = atomic_read(&res_s->ah_count);





	if (hw_stats) {

	if (hw_stats) {

		stats->value[BNXT_RE_RECOVERABLE_ERRORS] =

		stats->value[BNXT_RE_RECOVERABLE_ERRORS] =

drivers/infiniband/hw/bnxt_re/hw_counters.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,16 @@ enum bnxt_re_hw_stats { 




#define BNXT_RE_NUM_STD_COUNTERS (BNXT_RE_OUT_OF_SEQ_ERR + 1)

#define BNXT_RE_NUM_STD_COUNTERS (BNXT_RE_OUT_OF_SEQ_ERR + 1)





struct bnxt_re_res_cntrs {

	atomic_t qp_count;

	atomic_t cq_count;

	atomic_t srq_count;

	atomic_t mr_count;

	atomic_t mw_count;

	atomic_t ah_count;

	atomic_t pd_count;

};



struct bnxt_re_rstat {

struct bnxt_re_rstat {

	struct bnxt_qplib_roce_stats    errs;

	struct bnxt_qplib_roce_stats    errs;

	struct bnxt_qplib_ext_stat      ext_stat;

	struct bnxt_qplib_ext_stat      ext_stat;
@@ -120,6 +130,7 @@ struct bnxt_re_rstat { 




struct bnxt_re_stats {

struct bnxt_re_stats {

	struct bnxt_re_rstat            rstat;

	struct bnxt_re_rstat            rstat;

	struct bnxt_re_res_cntrs        res;

};

};





struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,

struct rdma_hw_stats *bnxt_re_ib_alloc_hw_port_stats(struct ib_device *ibdev,

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+20 −20
Original line number Original line Diff line number Diff line
@@ -602,7 +602,7 @@ int bnxt_re_dealloc_pd(struct ib_pd *ib_pd, struct ib_udata *udata) 
		if (!bnxt_qplib_dealloc_pd(&rdev->qplib_res,

		if (!bnxt_qplib_dealloc_pd(&rdev->qplib_res,

					   &rdev->qplib_res.pd_tbl,

					   &rdev->qplib_res.pd_tbl,

					   &pd->qplib_pd))

					   &pd->qplib_pd))

			atomic_dec(&rdev->pd_count);

			atomic_dec(&rdev->stats.res.pd_count);

	}

	}

	return 0;

	return 0;

}

}
@@ -665,7 +665,7 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) 
		if (bnxt_re_create_fence_mr(pd))

		if (bnxt_re_create_fence_mr(pd))

			ibdev_warn(&rdev->ibdev,

			ibdev_warn(&rdev->ibdev,

				   "Failed to create Fence-MR\n");

				   "Failed to create Fence-MR\n");

	atomic_inc(&rdev->pd_count);

	atomic_inc(&rdev->stats.res.pd_count);





	return 0;

	return 0;

dbfail:

dbfail:
@@ -691,7 +691,7 @@ int bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags) 
		else

		else

			goto fail;

			goto fail;

	}

	}

	atomic_dec(&rdev->ah_count);

	atomic_dec(&rdev->stats.res.ah_count);

fail:

fail:

	return rc;

	return rc;

}

}
@@ -777,7 +777,7 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_init_attr *init_attr, 
		wmb(); /* make sure cache is updated. */

		wmb(); /* make sure cache is updated. */

		spin_unlock_irqrestore(&uctx->sh_lock, flag);

		spin_unlock_irqrestore(&uctx->sh_lock, flag);

	}

	}

	atomic_inc(&rdev->ah_count);

	atomic_inc(&rdev->stats.res.ah_count);





	return 0;

	return 0;

}

}
@@ -838,7 +838,7 @@ static int bnxt_re_destroy_gsi_sqp(struct bnxt_re_qp *qp) 
	bnxt_qplib_destroy_ah(&rdev->qplib_res,

	bnxt_qplib_destroy_ah(&rdev->qplib_res,

			      &gsi_sah->qplib_ah,

			      &gsi_sah->qplib_ah,

			      true);

			      true);

	atomic_dec(&rdev->ah_count);

	atomic_dec(&rdev->stats.res.ah_count);

	bnxt_qplib_clean_qp(&qp->qplib_qp);

	bnxt_qplib_clean_qp(&qp->qplib_qp);





	ibdev_dbg(&rdev->ibdev, "Destroy the shadow QP\n");

	ibdev_dbg(&rdev->ibdev, "Destroy the shadow QP\n");
@@ -853,7 +853,7 @@ static int bnxt_re_destroy_gsi_sqp(struct bnxt_re_qp *qp) 
	mutex_lock(&rdev->qp_lock);

	mutex_lock(&rdev->qp_lock);

	list_del(&gsi_sqp->list);

	list_del(&gsi_sqp->list);

	mutex_unlock(&rdev->qp_lock);

	mutex_unlock(&rdev->qp_lock);

	atomic_dec(&rdev->qp_count);

	atomic_dec(&rdev->stats.res.qp_count);





	kfree(rdev->gsi_ctx.sqp_tbl);

	kfree(rdev->gsi_ctx.sqp_tbl);

	kfree(gsi_sah);

	kfree(gsi_sah);
@@ -900,7 +900,7 @@ int bnxt_re_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata) 
	mutex_lock(&rdev->qp_lock);

	mutex_lock(&rdev->qp_lock);

	list_del(&qp->list);

	list_del(&qp->list);

	mutex_unlock(&rdev->qp_lock);

	mutex_unlock(&rdev->qp_lock);

	atomic_dec(&rdev->qp_count);

	atomic_dec(&rdev->stats.res.qp_count);





	ib_umem_release(qp->rumem);

	ib_umem_release(qp->rumem);

	ib_umem_release(qp->sumem);

	ib_umem_release(qp->sumem);
@@ -1085,7 +1085,7 @@ static struct bnxt_re_ah *bnxt_re_create_shadow_qp_ah 
			  "Failed to allocate HW AH for Shadow QP");

			  "Failed to allocate HW AH for Shadow QP");

		goto fail;

		goto fail;

	}

	}

	atomic_inc(&rdev->ah_count);

	atomic_inc(&rdev->stats.res.ah_count);





	return ah;

	return ah;
@@ -1153,7 +1153,7 @@ static struct bnxt_re_qp *bnxt_re_create_shadow_qp 
	INIT_LIST_HEAD(&qp->list);

	INIT_LIST_HEAD(&qp->list);

	mutex_lock(&rdev->qp_lock);

	mutex_lock(&rdev->qp_lock);

	list_add_tail(&qp->list, &rdev->qp_list);

	list_add_tail(&qp->list, &rdev->qp_list);

	atomic_inc(&rdev->qp_count);

	atomic_inc(&rdev->stats.res.qp_count);

	mutex_unlock(&rdev->qp_lock);

	mutex_unlock(&rdev->qp_lock);

	return qp;

	return qp;

fail:

fail:
@@ -1535,7 +1535,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr, 
	mutex_lock(&rdev->qp_lock);

	mutex_lock(&rdev->qp_lock);

	list_add_tail(&qp->list, &rdev->qp_list);

	list_add_tail(&qp->list, &rdev->qp_list);

	mutex_unlock(&rdev->qp_lock);

	mutex_unlock(&rdev->qp_lock);

	atomic_inc(&rdev->qp_count);

	atomic_inc(&rdev->stats.res.qp_count);





	return 0;

	return 0;

qp_destroy:

qp_destroy:
@@ -1638,7 +1638,7 @@ int bnxt_re_destroy_srq(struct ib_srq *ib_srq, struct ib_udata *udata) 
		nq = qplib_srq->cq->nq;

		nq = qplib_srq->cq->nq;

	bnxt_qplib_destroy_srq(&rdev->qplib_res, qplib_srq);

	bnxt_qplib_destroy_srq(&rdev->qplib_res, qplib_srq);

	ib_umem_release(srq->umem);

	ib_umem_release(srq->umem);

	atomic_dec(&rdev->srq_count);

	atomic_dec(&rdev->stats.res.srq_count);

	if (nq)

	if (nq)

		nq->budget--;

		nq->budget--;

	return 0;

	return 0;
@@ -1750,7 +1750,7 @@ int bnxt_re_create_srq(struct ib_srq *ib_srq, 
	}

	}

	if (nq)

	if (nq)

		nq->budget++;

		nq->budget++;

	atomic_inc(&rdev->srq_count);

	atomic_inc(&rdev->stats.res.srq_count);

	spin_lock_init(&srq->lock);

	spin_lock_init(&srq->lock);





	return 0;

	return 0;
@@ -2876,7 +2876,7 @@ int bnxt_re_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata) 
	bnxt_qplib_destroy_cq(&rdev->qplib_res, &cq->qplib_cq);

	bnxt_qplib_destroy_cq(&rdev->qplib_res, &cq->qplib_cq);

	ib_umem_release(cq->umem);

	ib_umem_release(cq->umem);





	atomic_dec(&rdev->cq_count);

	atomic_dec(&rdev->stats.res.cq_count);

	nq->budget--;

	nq->budget--;

	kfree(cq->cql);

	kfree(cq->cql);

	return 0;

	return 0;
@@ -2960,7 +2960,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	cq->cq_period = cq->qplib_cq.period;

	cq->cq_period = cq->qplib_cq.period;

	nq->budget++;

	nq->budget++;





	atomic_inc(&rdev->cq_count);

	atomic_inc(&rdev->stats.res.cq_count);

	spin_lock_init(&cq->cq_lock);

	spin_lock_init(&cq->cq_lock);





	if (udata) {

	if (udata) {
@@ -3785,7 +3785,7 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *ib_pd, int mr_access_flags) 
	if (mr_access_flags & (IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ |

	if (mr_access_flags & (IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ |

			       IB_ACCESS_REMOTE_ATOMIC))

			       IB_ACCESS_REMOTE_ATOMIC))

		mr->ib_mr.rkey = mr->ib_mr.lkey;

		mr->ib_mr.rkey = mr->ib_mr.lkey;

	atomic_inc(&rdev->mr_count);

	atomic_inc(&rdev->stats.res.mr_count);





	return &mr->ib_mr;

	return &mr->ib_mr;
@@ -3818,7 +3818,7 @@ int bnxt_re_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) 
	ib_umem_release(mr->ib_umem);

	ib_umem_release(mr->ib_umem);





	kfree(mr);

	kfree(mr);

	atomic_dec(&rdev->mr_count);

	atomic_dec(&rdev->stats.res.mr_count);

	return rc;

	return rc;

}

}
@@ -3886,7 +3886,7 @@ struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type type, 
		goto fail_mr;

		goto fail_mr;

	}

	}





	atomic_inc(&rdev->mr_count);

	atomic_inc(&rdev->stats.res.mr_count);

	return &mr->ib_mr;

	return &mr->ib_mr;





fail_mr:

fail_mr:
@@ -3922,7 +3922,7 @@ struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type, 
	}

	}

	mw->ib_mw.rkey = mw->qplib_mw.rkey;

	mw->ib_mw.rkey = mw->qplib_mw.rkey;





	atomic_inc(&rdev->mw_count);

	atomic_inc(&rdev->stats.res.mw_count);

	return &mw->ib_mw;

	return &mw->ib_mw;





fail:

fail:
@@ -3943,7 +3943,7 @@ int bnxt_re_dealloc_mw(struct ib_mw *ib_mw) 
	}

	}





	kfree(mw);

	kfree(mw);

	atomic_dec(&rdev->mw_count);

	atomic_dec(&rdev->stats.res.mw_count);

	return rc;

	return rc;

}

}
@@ -4010,7 +4010,7 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length, 




	mr->ib_mr.lkey = mr->qplib_mr.lkey;

	mr->ib_mr.lkey = mr->qplib_mr.lkey;

	mr->ib_mr.rkey = mr->qplib_mr.lkey;

	mr->ib_mr.rkey = mr->qplib_mr.lkey;

	atomic_inc(&rdev->mr_count);

	atomic_inc(&rdev->stats.res.mr_count);





	return &mr->ib_mr;

	return &mr->ib_mr;

free_umem:

free_umem:

drivers/infiniband/hw/bnxt_re/main.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -918,13 +918,13 @@ static struct bnxt_re_dev *bnxt_re_dev_add(struct bnxt_aux_priv *aux_priv, 
	rdev->id = rdev->en_dev->pdev->devfn;

	rdev->id = rdev->en_dev->pdev->devfn;

	INIT_LIST_HEAD(&rdev->qp_list);

	INIT_LIST_HEAD(&rdev->qp_list);

	mutex_init(&rdev->qp_lock);

	mutex_init(&rdev->qp_lock);

	atomic_set(&rdev->qp_count, 0);

	atomic_set(&rdev->stats.res.qp_count, 0);

	atomic_set(&rdev->cq_count, 0);

	atomic_set(&rdev->stats.res.cq_count, 0);

	atomic_set(&rdev->srq_count, 0);

	atomic_set(&rdev->stats.res.srq_count, 0);

	atomic_set(&rdev->mr_count, 0);

	atomic_set(&rdev->stats.res.mr_count, 0);

	atomic_set(&rdev->mw_count, 0);

	atomic_set(&rdev->stats.res.mw_count, 0);

	atomic_set(&rdev->ah_count, 0);

	atomic_set(&rdev->stats.res.ah_count, 0);

	atomic_set(&rdev->pd_count, 0);

	atomic_set(&rdev->stats.res.pd_count, 0);

	rdev->cosq[0] = 0xFFFF;

	rdev->cosq[0] = 0xFFFF;

	rdev->cosq[1] = 0xFFFF;

	rdev->cosq[1] = 0xFFFF;