[PATCH] SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send

[PATCH] SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send

[Tom Tucker]

SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
    
The svcrdma transport can crash if a send is waiting for an
empty SQ slot and the connection is closed due to an asynchronous error.
The crash is caused when svc_rdma_send attempts to send on a deleted
QP.
    
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
---

This is not a critical fix for 2.6.25, but part of a general clean up of the error paths.

 net/sunrpc/xprtrdma/svc_rdma_transport.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 16fd3f6..af408fc 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -1036,6 +1036,8 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
 			wait_event(xprt->sc_send_wait,
 				   atomic_read(&xprt->sc_sq_count) <
 				   xprt->sc_sq_depth);
+			if (test_bit(XPT_CLOSE, &xprt->sc_xprt.xpt_flags))
+				return 0;
 			continue;
 		}
 		/* Bumped used SQ WR count and post */

Re: [PATCH] SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send

[J. Bruce Fields]

On Tue, Mar 11, 2008 at 12:44:27PM -0500, Tom Tucker wrote:
> SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
>     
> The svcrdma transport can crash if a send is waiting for an
> empty SQ slot and the connection is closed due to an asynchronous error.
> The crash is caused when svc_rdma_send attempts to send on a deleted
> QP.
>     
> Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
> ---
> 
> This is not a critical fix for 2.6.25, but part of a general clean up of the error paths.

OK, thanks; I've applied this, and passed along the other two to Linus.

--b.

Re: [PATCH] SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send

[Tom Tucker]

On Tue, 2008-03-11 at 14:32 -0400, J. Bruce Fields wrote:
> On Tue, Mar 11, 2008 at 12:44:27PM -0500, Tom Tucker wrote:
> > SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
> >     
> > The svcrdma transport can crash if a send is waiting for an
> > empty SQ slot and the connection is closed due to an asynchronous error.
> > The crash is caused when svc_rdma_send attempts to send on a deleted
> > QP.
> >     
> > Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
> > ---
> > 
> > This is not a critical fix for 2.6.25, but part of a general clean up of the error paths.
> 
> OK, thanks; I've applied this, and passed along the other two to Linus.

Awesome, thanks.

> 
> --b.