Commit 13cb886c authored Jan 03, 2020 by Chuck Lever Committed by Anna Schumaker Jan 14, 2020

xprtrdma: Fix completion wait during device removal



I've found that on occasion, "rmmod <dev>" will hang while if an NFS
is under load.

Ensure that ri_remove_done is initialized only just before the
transport is woken up to force a close. This avoids the completion
possibly getting initialized again while the CM event handler is
waiting for a wake-up.

Fixes: bebd0318 ("xprtrdma: Support unplugging an HCA from under an NFS mount")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent b32b9ed4

net/sunrpc/xprtrdma/verbs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ rpcrdma_cm_event_handler(struct rdma_cm_id id, struct rdma_cm_event event)
		ia->ri_id->device->name,
		rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt));
		#endif
		init_completion(&ia->ri_remove_done);
		set_bit(RPCRDMA_IAF_REMOVING, &ia->ri_flags);
		ep->rep_connected = -ENODEV;
		xprt_force_disconnect(xprt);
		@@ -297,7 +298,6 @@ rpcrdma_create_id(struct rpcrdma_xprt xprt, struct rpcrdma_ia ia)
		int rc;

		init_completion(&ia->ri_done);
		init_completion(&ia->ri_remove_done);

		id = rdma_create_id(xprt->rx_xprt.xprt_net, rpcrdma_cm_event_handler,
		xprt, RDMA_PS_TCP, IB_QPT_RC);

Admin message