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

Commit d1e458fe authored by Steve Wise's avatar Steve Wise Committed by J. Bruce Fields
Browse files

svcrdma: remove rdma_create_qp() failure recovery logic 



In svc_rdma_accept(), if rdma_create_qp() fails, there is useless
logic to try and call rdma_create_qp() again with reduced sge depths.
The assumption, I guess, was that perhaps the initial sge depths
chosen were too big.  However they initial depths are selected based
on the rdma device attribute max_sge returned from ib_query_device().
If rdma_create_qp() fails, it would not be because the max_send_sge and
max_recv_sge values passed in exceed the device's max.  So just remove
this code.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 14a571a8

net/sunrpc/xprtrdma/svc_rdma_transport.c

+2 −17
Original line number Diff line number Diff line
@@ -942,25 +942,10 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) 
		qp_attr.cap.max_recv_sge);



	ret = rdma_create_qp(newxprt->sc_cm_id, newxprt->sc_pd, &qp_attr);

	if (ret) {

		/*

		 * XXX: This is a hack. We need a xx_request_qp interface

		 * that will adjust the qp_attr's with a best-effort

		 * number

		 */

		qp_attr.cap.max_send_sge -= 2;

		qp_attr.cap.max_recv_sge -= 2;

		ret = rdma_create_qp(newxprt->sc_cm_id, newxprt->sc_pd,

				     &qp_attr);

	if (ret) {

		dprintk("svcrdma: failed to create QP, ret=%d\n", ret);

		goto errout;

	}

		newxprt->sc_max_sge = qp_attr.cap.max_send_sge;

		newxprt->sc_max_sge = qp_attr.cap.max_recv_sge;

		newxprt->sc_sq_depth = qp_attr.cap.max_send_wr;

		newxprt->sc_max_requests = qp_attr.cap.max_recv_wr;

	}

	newxprt->sc_qp = newxprt->sc_cm_id->qp;



	/*