Skip to content

Commit e1ede31

Browse files
chuckleverTrond Myklebust
authored andcommitted
xprtrdma: Fix helper that drains the transport
We want to drain only the RQ first. Otherwise the transport can deadlock on ->close if there are outstanding Send completions. Fixes: 6d2d0ee ("xprtrdma: Replace rpcrdma_receive_wq ... ") Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Cc: stable@vger.kernel.org # v5.0+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 29e7ca7 commit e1ede31

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sunrpc/xprtrdma/verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt)
9090
/* Flush Receives, then wait for deferred Reply work
9191
* to complete.
9292
*/
93-
ib_drain_qp(ia->ri_id->qp);
93+
ib_drain_rq(ia->ri_id->qp);
9494
drain_workqueue(buf->rb_completion_wq);
9595

9696
/* Deferred Reply processing might have scheduled

0 commit comments

Comments
 (0)