Skip to contentSkip to conversation

nfs4 over rdma transport oops

DISCUSSION Talpey, Thomas 1 participant 1 message Mar 6, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Trond - the following patch worked to correct the oops in RPC/RDMA on Shirish P's PPC machine. Can it be included in 2.6.25?

Tom.

------

Author: Tom Talpey <[email protected]>
Date:   Wed Feb 27 15:04:26 2008 -0500

Prevent an RPC oops when freeing a dynamically allocated RDMA buffer, used in certain special-case large metadata operations.

net/sunrpc/xprtrdma/transport.c +5 -1
Index: linux-2.6.25-rc3/net/sunrpc/xprtrdma/transport.c
===================================================================
@@ -610,7 +610,11 @@
 		return;
 
 	req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]);
-	r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
+	if (req->rl_iov.length == 0) {	/* see allocate above */
+		r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer, 
+				      struct rpcrdma_xprt, rx_buf);
+	} else
+		r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
 	rep = req->rl_reply;
 
 	dprintk("RPC:       %s: called on 0x%p%s\n",