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

Commit 550d7502 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Use core ib_drain_qp() API 



Clean up: Replace rpcrdma_flush_cqs() and rpcrdma_clean_cqs() with
the new ib_drain_qp() API.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-By: default avatarLeon Romanovsky <leonro@mellanox.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 3c19409b

net/sunrpc/xprtrdma/verbs.c

+6 −35
Original line number Diff line number Diff line
@@ -203,15 +203,6 @@ rpcrdma_receive_wc(struct ib_cq *cq, struct ib_wc *wc) 
	goto out_schedule;

}



static void

rpcrdma_flush_cqs(struct rpcrdma_ep *ep)

{

	struct ib_wc wc;



	while (ib_poll_cq(ep->rep_attr.recv_cq, 1, &wc) > 0)

		rpcrdma_receive_wc(NULL, &wc);

}



static int

rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)

{
@@ -373,23 +364,6 @@ rpcrdma_create_id(struct rpcrdma_xprt *xprt, 
	return ERR_PTR(rc);

}



/*

 * Drain any cq, prior to teardown.

 */

static void

rpcrdma_clean_cq(struct ib_cq *cq)

{

	struct ib_wc wc;

	int count = 0;



	while (1 == ib_poll_cq(cq, 1, &wc))

		++count;



	if (count)

		dprintk("RPC:       %s: flushed %d events (last 0x%x)\n",

			__func__, count, wc.opcode);

}



/*

 * Exported functions.

 */
@@ -515,7 +489,7 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
			__func__);

		return -ENOMEM;

	}

	max_qp_wr = ia->ri_device->attrs.max_qp_wr - RPCRDMA_BACKWARD_WRS;

	max_qp_wr = ia->ri_device->attrs.max_qp_wr - RPCRDMA_BACKWARD_WRS - 1;



	/* check provider's send/recv wr limits */

	if (cdata->max_requests > max_qp_wr)
@@ -526,11 +500,13 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
	ep->rep_attr.srq = NULL;

	ep->rep_attr.cap.max_send_wr = cdata->max_requests;

	ep->rep_attr.cap.max_send_wr += RPCRDMA_BACKWARD_WRS;

	ep->rep_attr.cap.max_send_wr += 1;	/* drain cqe */

	rc = ia->ri_ops->ro_open(ia, ep, cdata);

	if (rc)

		return rc;

	ep->rep_attr.cap.max_recv_wr = cdata->max_requests;

	ep->rep_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS;

	ep->rep_attr.cap.max_recv_wr += 1;	/* drain cqe */

	ep->rep_attr.cap.max_send_sge = RPCRDMA_MAX_IOVS;

	ep->rep_attr.cap.max_recv_sge = 1;

	ep->rep_attr.cap.max_inline_data = 0;
@@ -622,13 +598,8 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 


	cancel_delayed_work_sync(&ep->rep_connect_worker);



	if (ia->ri_id->qp)

		rpcrdma_ep_disconnect(ep, ia);



	rpcrdma_clean_cq(ep->rep_attr.recv_cq);

	rpcrdma_clean_cq(ep->rep_attr.send_cq);



	if (ia->ri_id->qp) {

		rpcrdma_ep_disconnect(ep, ia);

		rdma_destroy_qp(ia->ri_id);

		ia->ri_id->qp = NULL;

	}
@@ -659,7 +630,6 @@ rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
		dprintk("RPC:       %s: reconnecting...\n", __func__);



		rpcrdma_ep_disconnect(ep, ia);

		rpcrdma_flush_cqs(ep);



		xprt = container_of(ia, struct rpcrdma_xprt, rx_ia);

		id = rpcrdma_create_id(xprt, ia,
@@ -785,7 +755,6 @@ rpcrdma_ep_disconnect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
{

	int rc;



	rpcrdma_flush_cqs(ep);

	rc = rdma_disconnect(ia->ri_id);

	if (!rc) {

		/* returns without wait if not connected */
@@ -797,6 +766,8 @@ rpcrdma_ep_disconnect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
		dprintk("RPC:       %s: rdma_disconnect %i\n", __func__, rc);

		ep->rep_connected = rc;

	}



	ib_drain_qp(ia->ri_id->qp);

}



struct rpcrdma_req *