Commit dc70f7c3 authored by Håkon Bugge's avatar Håkon Bugge Committed by Jason Gunthorpe
Browse files

RDMA/cma: Remove unnecessary INIT->INIT transition 

In rdma_create_qp(), a connected QP will be transitioned to the INIT
state.

Afterwards, the QP will be transitioned to the RTR state by the
cma_modify_qp_rtr() function. But this function starts by performing an
ib_modify_qp() to the INIT state again, before another ib_modify_qp() is
performed to transition the QP to the RTR state.

Hence, there is no need to transition the QP to the INIT state in
rdma_create_qp().

Link: https://lore.kernel.org/r/1624369197-24578-2-git-send-email-haakon.bugge@oracle.com


Signed-off-by: default avatarHåkon Bugge <haakon.bugge@oracle.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 7ae61c5f

drivers/infiniband/core/cma.c

+1 −16
Original line number Diff line number Diff line
@@ -926,25 +926,12 @@ static int cma_init_ud_qp(struct rdma_id_private *id_priv, struct ib_qp *qp) 
	return ret;

}



static int cma_init_conn_qp(struct rdma_id_private *id_priv, struct ib_qp *qp)

{

	struct ib_qp_attr qp_attr;

	int qp_attr_mask, ret;



	qp_attr.qp_state = IB_QPS_INIT;

	ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);

	if (ret)

		return ret;



	return ib_modify_qp(qp, &qp_attr, qp_attr_mask);

}



int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,

		   struct ib_qp_init_attr *qp_init_attr)

{

	struct rdma_id_private *id_priv;

	struct ib_qp *qp;

	int ret;

	int ret = 0;



	id_priv = container_of(id, struct rdma_id_private, id);

	if (id->device != pd->device) {
@@ -961,8 +948,6 @@ int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd, 


	if (id->qp_type == IB_QPT_UD)

		ret = cma_init_ud_qp(id_priv, qp);

	else

		ret = cma_init_conn_qp(id_priv, qp);

	if (ret)

		goto out_destroy;