Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27159f50 authored by Gottumukkala, Naresh's avatar Gottumukkala, Naresh Committed by Roland Dreier
Browse files

RDMA/ocrdma: Remove use_cnt for queues 



Remove use_cnt.  Rely on IB midlayer to keep track of the use count.

Signed-off-by: default avatarNaresh Gottumukkala <bgottumukkala@emulex.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent fedaf4ff

drivers/infiniband/hw/ocrdma/ocrdma.h

+0 −4
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct ocrdma_queue_info { 
	u16 id;			/* qid, where to ring the doorbell. */

	u16 head, tail;

	bool created;

	atomic_t used;		/* Number of valid elements in the queue */

};



struct ocrdma_eq {
@@ -198,7 +197,6 @@ struct ocrdma_cq { 
	struct ocrdma_ucontext *ucontext;

	dma_addr_t pa;

	u32 len;

	atomic_t use_cnt;



	/* head of all qp's sq and rq for which cqes need to be flushed

	 * by the software.
@@ -210,7 +208,6 @@ struct ocrdma_pd { 
	struct ib_pd ibpd;

	struct ocrdma_dev *dev;

	struct ocrdma_ucontext *uctx;

	atomic_t use_cnt;

	u32 id;

	int num_dpp_qp;

	u32 dpp_page;
@@ -246,7 +243,6 @@ struct ocrdma_srq { 


	struct ocrdma_qp_hwq_info rq;

	struct ocrdma_pd *pd;

	atomic_t use_cnt;

	u32 id;

	u64 *rqe_wr_id_tbl;

	u32 *idx_bit_fields;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static inline struct ocrdma_mqe *ocrdma_get_mqe(struct ocrdma_dev *dev) 
static inline void ocrdma_mq_inc_head(struct ocrdma_dev *dev)

{

	dev->mq.sq.head = (dev->mq.sq.head + 1) & (OCRDMA_MQ_LEN - 1);

	atomic_inc(&dev->mq.sq.used);

}



static inline void *ocrdma_get_mqe_rsp(struct ocrdma_dev *dev)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+1 −38
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ struct ib_pd *ocrdma_alloc_pd(struct ib_device *ibdev, 
		kfree(pd);

		return ERR_PTR(status);

	}

	atomic_set(&pd->use_cnt, 0);



	if (udata && context) {

		status = ocrdma_copy_pd_uresp(pd, context, udata);
@@ -419,12 +418,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd) 
	int status;

	u64 usr_db;



	if (atomic_read(&pd->use_cnt)) {

		ocrdma_err("%s(%d) pd=0x%x is in use.\n",

			   __func__, dev->id, pd->id);

		status = -EFAULT;

		goto dealloc_err;

	}

	status = ocrdma_mbx_dealloc_pd(dev, pd);

	if (pd->uctx) {

		u64 dpp_db = dev->nic_info.dpp_unmapped_addr +
@@ -436,7 +429,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd) 
		ocrdma_del_mmap(pd->uctx, usr_db, dev->nic_info.db_page_size);

	}

	kfree(pd);

dealloc_err:

	return status;

}
@@ -474,7 +466,6 @@ static struct ocrdma_mr *ocrdma_alloc_lkey(struct ib_pd *ibpd, 
		return ERR_PTR(-ENOMEM);

	}

	mr->pd = pd;

	atomic_inc(&pd->use_cnt);

	mr->ibmr.lkey = mr->hwmr.lkey;

	if (mr->hwmr.remote_wr || mr->hwmr.remote_rd)

		mr->ibmr.rkey = mr->hwmr.lkey;
@@ -664,7 +655,6 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, 
	if (status)

		goto mbx_err;

	mr->pd = pd;

	atomic_inc(&pd->use_cnt);

	mr->ibmr.lkey = mr->hwmr.lkey;

	if (mr->hwmr.remote_wr || mr->hwmr.remote_rd)

		mr->ibmr.rkey = mr->hwmr.lkey;
@@ -689,7 +679,6 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr) 
	if (mr->hwmr.fr_mr == 0)

		ocrdma_free_mr_pbl_tbl(dev, &mr->hwmr);



	atomic_dec(&mr->pd->use_cnt);

	/* it could be user registered memory. */

	if (mr->umem)

		ib_umem_release(mr->umem);
@@ -752,7 +741,6 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev, int entries, int vector, 


	spin_lock_init(&cq->cq_lock);

	spin_lock_init(&cq->comp_handler_lock);

	atomic_set(&cq->use_cnt, 0);

	INIT_LIST_HEAD(&cq->sq_head);

	INIT_LIST_HEAD(&cq->rq_head);

	cq->dev = dev;
@@ -799,9 +787,6 @@ int ocrdma_destroy_cq(struct ib_cq *ibcq) 
	struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);

	struct ocrdma_dev *dev = cq->dev;



	if (atomic_read(&cq->use_cnt))

		return -EINVAL;



	status = ocrdma_mbx_destroy_cq(dev, cq);



	if (cq->ucontext) {
@@ -1023,15 +1008,6 @@ static void ocrdma_set_qp_init_params(struct ocrdma_qp *qp, 
	qp->state = OCRDMA_QPS_RST;

}



static void ocrdma_set_qp_use_cnt(struct ocrdma_qp *qp, struct ocrdma_pd *pd)

{

	atomic_inc(&pd->use_cnt);

	atomic_inc(&qp->sq_cq->use_cnt);

	atomic_inc(&qp->rq_cq->use_cnt);

	if (qp->srq)

		atomic_inc(&qp->srq->use_cnt);

	qp->ibqp.qp_num = qp->id;

}



static void ocrdma_store_gsi_qp_cq(struct ocrdma_dev *dev,

				   struct ib_qp_init_attr *attrs)
@@ -1099,7 +1075,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd, 
			goto cpy_err;

	}

	ocrdma_store_gsi_qp_cq(dev, attrs);

	ocrdma_set_qp_use_cnt(qp, pd);

	qp->ibqp.qp_num = qp->id;

	mutex_unlock(&dev->dev_lock);

	return &qp->ibqp;
@@ -1475,11 +1451,6 @@ int ocrdma_destroy_qp(struct ib_qp *ibqp) 


	ocrdma_del_flush_qp(qp);



	atomic_dec(&qp->pd->use_cnt);

	atomic_dec(&qp->sq_cq->use_cnt);

	atomic_dec(&qp->rq_cq->use_cnt);

	if (qp->srq)

		atomic_dec(&qp->srq->use_cnt);

	kfree(qp->wqe_wr_id_tbl);

	kfree(qp->rqe_wr_id_tbl);

	kfree(qp);
@@ -1565,14 +1536,12 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd, 
			goto arm_err;

	}



	atomic_set(&srq->use_cnt, 0);

	if (udata) {

		status = ocrdma_copy_srq_uresp(srq, udata);

		if (status)

			goto arm_err;

	}



	atomic_inc(&pd->use_cnt);

	return &srq->ibsrq;



arm_err:
@@ -1618,18 +1587,12 @@ int ocrdma_destroy_srq(struct ib_srq *ibsrq) 


	srq = get_ocrdma_srq(ibsrq);

	dev = srq->dev;

	if (atomic_read(&srq->use_cnt)) {

		ocrdma_err("%s(%d) err, srq=0x%x in use\n",

			   __func__, dev->id, srq->id);

		return -EAGAIN;

	}



	status = ocrdma_mbx_destroy_srq(dev, srq);



	if (srq->pd->uctx)

		ocrdma_del_mmap(srq->pd->uctx, (u64) srq->rq.pa, srq->rq.len);



	atomic_dec(&srq->pd->use_cnt);

	kfree(srq->idx_bit_fields);

	kfree(srq->rqe_wr_id_tbl);

	kfree(srq);