xprtrdma: The transport should not bug-check when a dup reply is received

PATCH New Tom Tucker 1 participant 1 message Feb 20, 2012

Subsystems (3)

Networking NFS client NFS server

lore

Share & tools

lore

Tom Tucker

author

2012-02-20 19:07 UTC #0 lore raw

PATCH 1/1 xprtrdma: The transport should not bug-check when a dup reply is received

The client side RDMA transport will bug check if it receives a duplicate reply, instead we should simply drop the duplicate reply.

Signed-off-by Tom Tucker <[email protected]>

---

 net/sunrpc/xprtrdma/rpc_rdma.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

net/sunrpc/xprtrdma/rpc_rdma.c +7 -2

index 554d081..12de982 100644
@@ -771,13 +771,18 @@ repost:
 
 	/* get request object */
 	req = rpcr_to_rdmar(rqst);
+	if (req->rl_reply) {
+		spin_unlock(&xprt->transport_lock);
+		dprintk("RPC:       %s: duplicate reply 0x%p to RPC "
+			"request 0x%p: xid 0x%08x\n", __func__, rep, req,
+			headerp->rm_xid);
+		goto repost;
+	}
 
 	dprintk("RPC:       %s: reply 0x%p completes request 0x%p\n"
 		"                   RPC request 0x%p xid 0x%08x\n",
 			__func__, rep, req, rqst, headerp->rm_xid);
 
-	BUG_ON(!req || req->rl_reply);
-
 	/* from here on, the reply is no longer an orphan */
 	req->rl_reply = rep;