Commit 8fc3beeb authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/core: Delete duplicated and unreachable code 

The ib_create_named_qp() is kernel verb and no kernel users exist that use
XRC_INI QP. Hence such QP path is not reachable. In addition, delete
duplicated assignments of QP attributes from the initialization structure.

Link: https://lore.kernel.org/r/1b4c0d1def5f8f6d26839e14d19da950cc4a0b05.1628014762.git.leonro@nvidia.com


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 5f6bb7e3

drivers/infiniband/core/core_priv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -341,6 +341,7 @@ _ib_create_qp(struct ib_device *dev, struct ib_pd *pd, 
	qp->srq = attr->srq;

	qp->srq = attr->srq;

	qp->event_handler = attr->event_handler;

	qp->event_handler = attr->event_handler;

	qp->port = attr->port_num;

	qp->port = attr->port_num;

	qp->qp_context = attr->qp_context;





	spin_lock_init(&qp->mr_lock);

	spin_lock_init(&qp->mr_lock);

	INIT_LIST_HEAD(&qp->rdma_mrs);

	INIT_LIST_HEAD(&qp->rdma_mrs);

drivers/infiniband/core/verbs.c

+4 −18
Original line number Original line Diff line number Diff line
@@ -1257,28 +1257,14 @@ struct ib_qp *ib_create_named_qp(struct ib_pd *pd, 
		return xrc_qp;

		return xrc_qp;

	}

	}





	qp->event_handler = qp_init_attr->event_handler;

	qp->qp_context = qp_init_attr->qp_context;

	if (qp_init_attr->qp_type == IB_QPT_XRC_INI) {

		qp->recv_cq = NULL;

		qp->srq = NULL;

	} else {

		qp->recv_cq = qp_init_attr->recv_cq;

	if (qp_init_attr->recv_cq)

	if (qp_init_attr->recv_cq)

		atomic_inc(&qp_init_attr->recv_cq->usecnt);

		atomic_inc(&qp_init_attr->recv_cq->usecnt);

		qp->srq = qp_init_attr->srq;

	if (qp->srq)

	if (qp->srq)

		atomic_inc(&qp_init_attr->srq->usecnt);

		atomic_inc(&qp_init_attr->srq->usecnt);

	}



	qp->send_cq = qp_init_attr->send_cq;

	qp->xrcd    = NULL;





	atomic_inc(&pd->usecnt);

	atomic_inc(&pd->usecnt);

	if (qp_init_attr->send_cq)

	if (qp_init_attr->send_cq)

		atomic_inc(&qp_init_attr->send_cq->usecnt);

		atomic_inc(&qp_init_attr->send_cq->usecnt);

	if (qp_init_attr->rwq_ind_tbl)

		atomic_inc(&qp->rwq_ind_tbl->usecnt);





	if (qp_init_attr->cap.max_rdma_ctxs) {

	if (qp_init_attr->cap.max_rdma_ctxs) {

		ret = rdma_rw_init_mrs(qp, qp_init_attr);

		ret = rdma_rw_init_mrs(qp, qp_init_attr);