xprtrdma: Put rpcrdma_reps before waking the tear-down completion
authorChuck Lever <chuck.lever@oracle.com>
Mon, 2 Aug 2021 18:44:24 +0000 (14:44 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Mon, 9 Aug 2021 20:42:02 +0000 (16:42 -0400)
Ensure the tear-down completion is awoken only /after/ we've stopped
fiddling with rpcrdma_rep objects in rpcrdma_post_recvs().

Fixes: 15788d1d1077 ("xprtrdma: Do not refresh Receive Queue while it is draining")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
net/sunrpc/xprtrdma/verbs.c

index c1797ea19418ef3ba8a2e5a58160419faec3f5fb..016f10a781b4f7b90cb35505cfe80bb31df96659 100644 (file)
@@ -1416,11 +1416,6 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp)
 
        rc = ib_post_recv(ep->re_id->qp, wr,
                          (const struct ib_recv_wr **)&bad_wr);
-       if (atomic_dec_return(&ep->re_receiving) > 0)
-               complete(&ep->re_done);
-
-out:
-       trace_xprtrdma_post_recvs(r_xprt, count, rc);
        if (rc) {
                for (wr = bad_wr; wr;) {
                        struct rpcrdma_rep *rep;
@@ -1431,6 +1426,11 @@ out:
                        --count;
                }
        }
+       if (atomic_dec_return(&ep->re_receiving) > 0)
+               complete(&ep->re_done);
+
+out:
+       trace_xprtrdma_post_recvs(r_xprt, count, rc);
        ep->re_receive_count += count;
        return;
 }