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

Commit 3d433ad8 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: No qp_event disconnect 



After thinking about this more, and auditing other kernel ULP imple-
mentations, I believe that a DISCONNECT cm_event will occur after a
fatal QP event. If that's the case, there's no need for an explicit
disconnect in the QP event handler.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6d2d0ee2

net/sunrpc/xprtrdma/verbs.c

+0 −32
Original line number Diff line number Diff line
@@ -99,25 +99,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) 
	ib_drain_sq(ia->ri_id->qp);

}



/**

 * rpcrdma_disconnect_worker - Force a disconnect

 * @work: endpoint to be disconnected

 *

 * Provider callbacks can possibly run in an IRQ context. This function

 * is invoked in a worker thread to guarantee that disconnect wake-up

 * calls are always done in process context.

 */

static void

rpcrdma_disconnect_worker(struct work_struct *work)

{

	struct rpcrdma_ep *ep = container_of(work, struct rpcrdma_ep,

					     rep_disconnect_worker.work);

	struct rpcrdma_xprt *r_xprt =

		container_of(ep, struct rpcrdma_xprt, rx_ep);



	xprt_force_disconnect(&r_xprt->rx_xprt);

}



/**

 * rpcrdma_qp_event_handler - Handle one QP event (error notification)

 * @event: details of the event
@@ -134,15 +115,6 @@ rpcrdma_qp_event_handler(struct ib_event *event, void *context) 
						   rx_ep);



	trace_xprtrdma_qp_event(r_xprt, event);

	pr_err("rpcrdma: %s on device %s connected to %s:%s\n",

	       ib_event_msg(event->event), event->device->name,

	       rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt));



	if (ep->rep_connected == 1) {

		ep->rep_connected = -EIO;

		schedule_delayed_work(&ep->rep_disconnect_worker, 0);

		wake_up_all(&ep->rep_connect_wait);

	}

}



/**
@@ -571,8 +543,6 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
				   cdata->max_requests >> 2);

	ep->rep_send_count = ep->rep_send_batch;

	init_waitqueue_head(&ep->rep_connect_wait);

	INIT_DELAYED_WORK(&ep->rep_disconnect_worker,

			  rpcrdma_disconnect_worker);

	ep->rep_receive_count = 0;



	sendcq = ib_alloc_cq(ia->ri_device, NULL,
@@ -646,8 +616,6 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
void

rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)

{

	cancel_delayed_work_sync(&ep->rep_disconnect_worker);



	if (ia->ri_id && ia->ri_id->qp) {

		rpcrdma_ep_disconnect(ep, ia);

		rdma_destroy_qp(ia->ri_id);

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ struct rpcrdma_ep { 
	wait_queue_head_t 	rep_connect_wait;

	struct rpcrdma_connect_private	rep_cm_private;

	struct rdma_conn_param	rep_remote_cma;

	struct delayed_work	rep_disconnect_worker;

	int			rep_receive_count;

};