From: Chuck Lever Date: Tue, 9 Apr 2019 21:04:09 +0000 (-0400) Subject: xprtrdma: Fix helper that drains the transport X-Git-Tag: v5.4-rc1~1229^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1ede312f17e96a9c5cda9aaa1cdcf442c1a5da8;p=platform%2Fkernel%2Flinux-rpi.git 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: 6d2d0ee27c7a ("xprtrdma: Replace rpcrdma_receive_wq ... ") Signed-off-by: Chuck Lever Cc: stable@vger.kernel.org # v5.0+ Signed-off-by: Trond Myklebust --- diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 89a6339..30cfc0e 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -90,7 +90,7 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) /* Flush Receives, then wait for deferred Reply work * to complete. */ - ib_drain_qp(ia->ri_id->qp); + ib_drain_rq(ia->ri_id->qp); drain_workqueue(buf->rb_completion_wq); /* Deferred Reply processing might have scheduled