On Mon, May 12, 2008 at 02:13:51PM -0500, Tom Tucker wrote:
> This is an updated version of the patchset that includes changes per
> your recommendations, plus:
>
> - cleanup: changed the return type on svc_rdma_send_error to void
> - bug: added copy of transport address to the rqstp structure in rdma read
> completion logic
> - bug: fixed svc_rdma_accept race that was found by inspection,
OK, thanks. A minor whine: whatever procedure you're using to mail
these seems to alphabetize them like:
11/20
1/20
12/20
13/20
14/20
15/20
16/20
17/20
18/20
19/20
20/20
2/20
3/20
...
So the threading doesn't help apply them in the right order.
Anyway, not a big problem. And I'd also be just as happy to take them
from git if that'd be simpler. (But from a quick glance I didn't see
a branch with the identical patches?)
--b.
>
> The original description follows:
>
> This patchset fixes a number of defects in the close path of the SVCRDMA
> transport provider. The defects were found by injecting errors on the
> transport at random intervals while running concurrent iozone tests on
> IB and iWARP mounts. With this set of patches applied I was able to run
> the above tests for several hours without causing a crash or leaking
> resources. The transport recovers correctly on a client reconnect.
>
> This patchset is based on 2.6 top of tree, however, I think these fixes are
> good candidates for a 2.6.25 dot release as well. I have a set that is
> already merged for that release if you would like them. They are available in
> my git tree on linux-nfs.org in the '2.6.25' branch. Please let me know if you
> would like me to post them here.
>
> [PATCH 1/20] svcrdma: Simplify receive buffer posting
>
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 17 +----------------
> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 ++++++++++
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 -------------------
> 3 files changed, 11 insertions(+), 35 deletions(-)
>
> [PATCH 2/20] svcrdma: Fix race with dto_tasklet in svc_rdma_send
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 ++++++++++++++++-------------
> 1 files changed, 22 insertions(+), 18 deletions(-)
>
> [PATCH 3/20] svcrdma: Fix return value in svc_rdma_send
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> [PATCH 4/20] svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> [PATCH 5/20] svcrdma: Free context on ib_post_recv error
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> [PATCH 6/20] svcrdma: Free context on post_recv error in send_reply
>
> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> [PATCH 7/20] svcrdma: Fix error handling during listening endpoint creation
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
> [PATCH 8/20] svcrdma: Return error from rdma_read_xdr so caller knows to free context
>
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 23 ++++++++++++++++-------
> 1 files changed, 16 insertions(+), 7 deletions(-)
>
> [PATCH 9/20] svcrdma: Remove unused READ_DONE context flags bit
>
> include/linux/sunrpc/svc_rdma.h | 1 -
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 -
> 3 files changed, 0 insertions(+), 3 deletions(-)
>
> [PATCH 10/20] svcrdma: Simplify RDMA_READ deferral buffer management
>
> include/linux/sunrpc/svc_rdma.h | 1 +
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 58 ++++++------------------------
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ++-
> 3 files changed, 16 insertions(+), 48 deletions(-)
>
> [PATCH 11/20] svcrdma: Use standard Linux lists for context cache
>
> include/linux/sunrpc/svc_rdma.h | 5 ++-
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 ++++++++++++++++-------------
> 2 files changed, 29 insertions(+), 23 deletions(-)
>
> [PATCH 12/20] svcrdma: Shrink scope of spinlock on RQ CQ
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> [PATCH 13/20] svcrdma: Move destroy to kernel thread
>
> include/linux/sunrpc/svc_rdma.h | 1 +
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++---
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> [PATCH 14/20] svcrdma: Add reference for each SQ/RQ WR
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++++++++++--
> 1 files changed, 16 insertions(+), 2 deletions(-)
>
> [PATCH 15/20] svcrdma: Move the QP and cm_id destruction to svc_rdma_free
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 +++++++++++++++---------------
> 1 files changed, 20 insertions(+), 20 deletions(-)
>
> [PATCH 16/20] svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 +++++++++++++++++++++++++++--
> 1 files changed, 35 insertions(+), 3 deletions(-)
>
> [PATCH 17/20] svcrdma: Use ib verbs version of dma_unmap
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> [PATCH 18/20] svcrdma: Set rqstp transport address in rdma_read_complete function
>
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> [PATCH 19/20] svcrdma: Copy transport address and arm CQ before calling rdma_accept
>
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 23 ++++++++++++++---------
> 1 files changed, 14 insertions(+), 9 deletions(-)
>
> [PATCH 20/20] svcrdma: Change svc_rdma_send_error return type to void
>
> include/linux/sunrpc/svc_rdma.h | 4 ++--
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
> net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 ++++-----
> 3 files changed, 7 insertions(+), 8 deletions(-)
>
> Signed-off-by: Tom Tucker <[email protected]>
> .
>
The for-bfields branch should contain those same patches.
Tom
On May 13, 2008, at 1:33 AM, "J. Bruce Fields" <[email protected]>
wrote:
> On Mon, May 12, 2008 at 02:13:51PM -0500, Tom Tucker wrote:
>> This is an updated version of the patchset that includes changes per
>> your recommendations, plus:
>>
>> - cleanup: changed the return type on svc_rdma_send_error to void
>> - bug: added copy of transport address to the rqstp structure in
>> rdma read
>> completion logic
>> - bug: fixed svc_rdma_accept race that was found by inspection,
>
> OK, thanks. A minor whine: whatever procedure you're using to mail
> these seems to alphabetize them like:
>
> 11/20
> 1/20
> 12/20
> 13/20
> 14/20
> 15/20
> 16/20
> 17/20
> 18/20
> 19/20
> 20/20
> 2/20
> 3/20
> ...
>
> So the threading doesn't help apply them in the right order.
>
> Anyway, not a big problem. And I'd also be just as happy to take them
> from git if that'd be simpler. (But from a quick glance I didn't see
> a branch with the identical patches?)
>
> --b.
>
>>
>> The original description follows:
>>
>> This patchset fixes a number of defects in the close path of the
>> SVCRDMA
>> transport provider. The defects were found by injecting errors on the
>> transport at random intervals while running concurrent iozone tests
>> on
>> IB and iWARP mounts. With this set of patches applied I was able to
>> run
>> the above tests for several hours without causing a crash or leaking
>> resources. The transport recovers correctly on a client reconnect.
>>
>> This patchset is based on 2.6 top of tree, however, I think these
>> fixes are
>> good candidates for a 2.6.25 dot release as well. I have a set that
>> is
>> already merged for that release if you would like them. They are
>> available in
>> my git tree on linux-nfs.org in the '2.6.25' branch. Please let me
>> know if you
>> would like me to post them here.
>>
>> [PATCH 1/20] svcrdma: Simplify receive buffer posting
>>
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 17 +----------------
>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 ++++++++++
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 -------------------
>> 3 files changed, 11 insertions(+), 35 deletions(-)
>>
>> [PATCH 2/20] svcrdma: Fix race with dto_tasklet in svc_rdma_send
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 +++++++++++++++
>> +-------------
>> 1 files changed, 22 insertions(+), 18 deletions(-)
>>
>> [PATCH 3/20] svcrdma: Fix return value in svc_rdma_send
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> [PATCH 4/20] svcrdma: Add put of connection ESTABLISHED reference
>> in rdma_cma_handler
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> [PATCH 5/20] svcrdma: Free context on ib_post_recv error
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> [PATCH 6/20] svcrdma: Free context on post_recv error in send_reply
>>
>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> [PATCH 7/20] svcrdma: Fix error handling during listening endpoint
>> creation
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 24 ++++++++++++
>> +-----------
>> 1 files changed, 13 insertions(+), 11 deletions(-)
>>
>> [PATCH 8/20] svcrdma: Return error from rdma_read_xdr so caller
>> knows to free context
>>
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 23 +++++++++++++++
>> +-------
>> 1 files changed, 16 insertions(+), 7 deletions(-)
>>
>> [PATCH 9/20] svcrdma: Remove unused READ_DONE context flags bit
>>
>> include/linux/sunrpc/svc_rdma.h | 1 -
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 -
>> 3 files changed, 0 insertions(+), 3 deletions(-)
>>
>> [PATCH 10/20] svcrdma: Simplify RDMA_READ deferral buffer management
>>
>> include/linux/sunrpc/svc_rdma.h | 1 +
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 58 +++++
>> +------------------------
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ++-
>> 3 files changed, 16 insertions(+), 48 deletions(-)
>>
>> [PATCH 11/20] svcrdma: Use standard Linux lists for context cache
>>
>> include/linux/sunrpc/svc_rdma.h | 5 ++-
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 +++++++++++++++
>> +-------------
>> 2 files changed, 29 insertions(+), 23 deletions(-)
>>
>> [PATCH 12/20] svcrdma: Shrink scope of spinlock on RQ CQ
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> [PATCH 13/20] svcrdma: Move destroy to kernel thread
>>
>> include/linux/sunrpc/svc_rdma.h | 1 +
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++---
>> 2 files changed, 15 insertions(+), 3 deletions(-)
>>
>> [PATCH 14/20] svcrdma: Add reference for each SQ/RQ WR
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++++++++++--
>> 1 files changed, 16 insertions(+), 2 deletions(-)
>>
>> [PATCH 15/20] svcrdma: Move the QP and cm_id destruction to
>> svc_rdma_free
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 ++++++++++++++
>> +---------------
>> 1 files changed, 20 insertions(+), 20 deletions(-)
>>
>> [PATCH 16/20] svcrdma: Cleanup queued, but unprocessed I/O in
>> svc_rdma_free
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 ++++++++++++++++++++
>> +++++++--
>> 1 files changed, 35 insertions(+), 3 deletions(-)
>>
>> [PATCH 17/20] svcrdma: Use ib verbs version of dma_unmap
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> [PATCH 18/20] svcrdma: Set rqstp transport address in
>> rdma_read_complete function
>>
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> [PATCH 19/20] svcrdma: Copy transport address and arm CQ before
>> calling rdma_accept
>>
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 23 +++++++++++++
>> +---------
>> 1 files changed, 14 insertions(+), 9 deletions(-)
>>
>> [PATCH 20/20] svcrdma: Change svc_rdma_send_error return type to void
>>
>> include/linux/sunrpc/svc_rdma.h | 4 ++--
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 ++++-----
>> 3 files changed, 7 insertions(+), 8 deletions(-)
>>
>> Signed-off-by: Tom Tucker <[email protected]>
>> .
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs"
> in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 2008-05-13 at 02:33 -0400, J. Bruce Fields wrote:
> On Mon, May 12, 2008 at 02:13:51PM -0500, Tom Tucker wrote:
> > This is an updated version of the patchset that includes changes per
> > your recommendations, plus:
> >
> > - cleanup: changed the return type on svc_rdma_send_error to void
> > - bug: added copy of transport address to the rqstp structure in rdma read
> > completion logic
> > - bug: fixed svc_rdma_accept race that was found by inspection,
>
> OK, thanks. A minor whine: whatever procedure you're using to mail
> these seems to alphabetize them like:
Ok, sorry about this. I was relying on the git send-email threading to
get the order.
I've modified my tool to format the subject like "%02/%02". This will
get you 01/20, 02/20, etc... So they should sort alphabetically for
subsequent submissions.
Tom
>
> 11/20
> 1/20
> 12/20
> 13/20
> 14/20
> 15/20
> 16/20
> 17/20
> 18/20
> 19/20
> 20/20
> 2/20
> 3/20
> ...
>
> So the threading doesn't help apply them in the right order.
>
> Anyway, not a big problem. And I'd also be just as happy to take them
> from git if that'd be simpler. (But from a quick glance I didn't see
> a branch with the identical patches?)
>
> --b.
>
> >
> > The original description follows:
> >
> > This patchset fixes a number of defects in the close path of the SVCRDMA
> > transport provider. The defects were found by injecting errors on the
> > transport at random intervals while running concurrent iozone tests on
> > IB and iWARP mounts. With this set of patches applied I was able to run
> > the above tests for several hours without causing a crash or leaking
> > resources. The transport recovers correctly on a client reconnect.
> >
> > This patchset is based on 2.6 top of tree, however, I think these fixes are
> > good candidates for a 2.6.25 dot release as well. I have a set that is
> > already merged for that release if you would like them. They are available in
> > my git tree on linux-nfs.org in the '2.6.25' branch. Please let me know if you
> > would like me to post them here.
> >
> > [PATCH 1/20] svcrdma: Simplify receive buffer posting
> >
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 17 +----------------
> > net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 ++++++++++
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 -------------------
> > 3 files changed, 11 insertions(+), 35 deletions(-)
> >
> > [PATCH 2/20] svcrdma: Fix race with dto_tasklet in svc_rdma_send
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 ++++++++++++++++-------------
> > 1 files changed, 22 insertions(+), 18 deletions(-)
> >
> > [PATCH 3/20] svcrdma: Fix return value in svc_rdma_send
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > [PATCH 4/20] svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > [PATCH 5/20] svcrdma: Free context on ib_post_recv error
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > [PATCH 6/20] svcrdma: Free context on post_recv error in send_reply
> >
> > net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > [PATCH 7/20] svcrdma: Fix error handling during listening endpoint creation
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 24 +++++++++++++-----------
> > 1 files changed, 13 insertions(+), 11 deletions(-)
> >
> > [PATCH 8/20] svcrdma: Return error from rdma_read_xdr so caller knows to free context
> >
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 23 ++++++++++++++++-------
> > 1 files changed, 16 insertions(+), 7 deletions(-)
> >
> > [PATCH 9/20] svcrdma: Remove unused READ_DONE context flags bit
> >
> > include/linux/sunrpc/svc_rdma.h | 1 -
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 -
> > 3 files changed, 0 insertions(+), 3 deletions(-)
> >
> > [PATCH 10/20] svcrdma: Simplify RDMA_READ deferral buffer management
> >
> > include/linux/sunrpc/svc_rdma.h | 1 +
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 58 ++++++------------------------
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ++-
> > 3 files changed, 16 insertions(+), 48 deletions(-)
> >
> > [PATCH 11/20] svcrdma: Use standard Linux lists for context cache
> >
> > include/linux/sunrpc/svc_rdma.h | 5 ++-
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 ++++++++++++++++-------------
> > 2 files changed, 29 insertions(+), 23 deletions(-)
> >
> > [PATCH 12/20] svcrdma: Shrink scope of spinlock on RQ CQ
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > [PATCH 13/20] svcrdma: Move destroy to kernel thread
> >
> > include/linux/sunrpc/svc_rdma.h | 1 +
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++---
> > 2 files changed, 15 insertions(+), 3 deletions(-)
> >
> > [PATCH 14/20] svcrdma: Add reference for each SQ/RQ WR
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++++++++++--
> > 1 files changed, 16 insertions(+), 2 deletions(-)
> >
> > [PATCH 15/20] svcrdma: Move the QP and cm_id destruction to svc_rdma_free
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 +++++++++++++++---------------
> > 1 files changed, 20 insertions(+), 20 deletions(-)
> >
> > [PATCH 16/20] svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 +++++++++++++++++++++++++++--
> > 1 files changed, 35 insertions(+), 3 deletions(-)
> >
> > [PATCH 17/20] svcrdma: Use ib verbs version of dma_unmap
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > [PATCH 18/20] svcrdma: Set rqstp transport address in rdma_read_complete function
> >
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > [PATCH 19/20] svcrdma: Copy transport address and arm CQ before calling rdma_accept
> >
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 23 ++++++++++++++---------
> > 1 files changed, 14 insertions(+), 9 deletions(-)
> >
> > [PATCH 20/20] svcrdma: Change svc_rdma_send_error return type to void
> >
> > include/linux/sunrpc/svc_rdma.h | 4 ++--
> > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
> > net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 ++++-----
> > 3 files changed, 7 insertions(+), 8 deletions(-)
> >
> > Signed-off-by: Tom Tucker <[email protected]>
> > .
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Sorry for the delay:
On Tue, May 13, 2008 at 07:56:47AM -0500, Tom Tucker wrote:
> The for-bfields branch should contain those same patches.
The series in the for-bfield branch includes two patches at the start
that I don't think were in the series you mailed ("svcrdma: Remove extra
check for XPT_DEAD bit in svc_xprt_enqueue" and "svcrdma: Remove unused
header files from svc_xprt.c").
Small patches, so probably doesn't matter either way, but we may as well
go with whichever result was actually tested, if only one was?
--b.
>
> Tom
>
> On May 13, 2008, at 1:33 AM, "J. Bruce Fields" <[email protected]>
> wrote:
>
>> On Mon, May 12, 2008 at 02:13:51PM -0500, Tom Tucker wrote:
>>> This is an updated version of the patchset that includes changes per
>>> your recommendations, plus:
>>>
>>> - cleanup: changed the return type on svc_rdma_send_error to void
>>> - bug: added copy of transport address to the rqstp structure in
>>> rdma read
>>> completion logic
>>> - bug: fixed svc_rdma_accept race that was found by inspection,
>>
>> OK, thanks. A minor whine: whatever procedure you're using to mail
>> these seems to alphabetize them like:
>>
>> 11/20
>> 1/20
>> 12/20
>> 13/20
>> 14/20
>> 15/20
>> 16/20
>> 17/20
>> 18/20
>> 19/20
>> 20/20
>> 2/20
>> 3/20
>> ...
>>
>> So the threading doesn't help apply them in the right order.
>>
>> Anyway, not a big problem. And I'd also be just as happy to take them
>> from git if that'd be simpler. (But from a quick glance I didn't see
>> a branch with the identical patches?)
>>
>> --b.
>>
>>>
>>> The original description follows:
>>>
>>> This patchset fixes a number of defects in the close path of the
>>> SVCRDMA
>>> transport provider. The defects were found by injecting errors on the
>>> transport at random intervals while running concurrent iozone tests
>>> on
>>> IB and iWARP mounts. With this set of patches applied I was able to
>>> run
>>> the above tests for several hours without causing a crash or leaking
>>> resources. The transport recovers correctly on a client reconnect.
>>>
>>> This patchset is based on 2.6 top of tree, however, I think these
>>> fixes are
>>> good candidates for a 2.6.25 dot release as well. I have a set that
>>> is
>>> already merged for that release if you would like them. They are
>>> available in
>>> my git tree on linux-nfs.org in the '2.6.25' branch. Please let me
>>> know if you
>>> would like me to post them here.
>>>
>>> [PATCH 1/20] svcrdma: Simplify receive buffer posting
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 17 +----------------
>>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 ++++++++++
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 -------------------
>>> 3 files changed, 11 insertions(+), 35 deletions(-)
>>>
>>> [PATCH 2/20] svcrdma: Fix race with dto_tasklet in svc_rdma_send
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 +++++++++++++++
>>> +-------------
>>> 1 files changed, 22 insertions(+), 18 deletions(-)
>>>
>>> [PATCH 3/20] svcrdma: Fix return value in svc_rdma_send
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> [PATCH 4/20] svcrdma: Add put of connection ESTABLISHED reference in
>>> rdma_cma_handler
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> [PATCH 5/20] svcrdma: Free context on ib_post_recv error
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
>>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>>
>>> [PATCH 6/20] svcrdma: Free context on post_recv error in send_reply
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 ++-
>>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>>
>>> [PATCH 7/20] svcrdma: Fix error handling during listening endpoint
>>> creation
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 24 ++++++++++++
>>> +-----------
>>> 1 files changed, 13 insertions(+), 11 deletions(-)
>>>
>>> [PATCH 8/20] svcrdma: Return error from rdma_read_xdr so caller
>>> knows to free context
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 23 +++++++++++++++
>>> +-------
>>> 1 files changed, 16 insertions(+), 7 deletions(-)
>>>
>>> [PATCH 9/20] svcrdma: Remove unused READ_DONE context flags bit
>>>
>>> include/linux/sunrpc/svc_rdma.h | 1 -
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 -
>>> 3 files changed, 0 insertions(+), 3 deletions(-)
>>>
>>> [PATCH 10/20] svcrdma: Simplify RDMA_READ deferral buffer management
>>>
>>> include/linux/sunrpc/svc_rdma.h | 1 +
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 58 +++++
>>> +------------------------
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ++-
>>> 3 files changed, 16 insertions(+), 48 deletions(-)
>>>
>>> [PATCH 11/20] svcrdma: Use standard Linux lists for context cache
>>>
>>> include/linux/sunrpc/svc_rdma.h | 5 ++-
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 +++++++++++++++
>>> +-------------
>>> 2 files changed, 29 insertions(+), 23 deletions(-)
>>>
>>> [PATCH 12/20] svcrdma: Shrink scope of spinlock on RQ CQ
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> [PATCH 13/20] svcrdma: Move destroy to kernel thread
>>>
>>> include/linux/sunrpc/svc_rdma.h | 1 +
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++---
>>> 2 files changed, 15 insertions(+), 3 deletions(-)
>>>
>>> [PATCH 14/20] svcrdma: Add reference for each SQ/RQ WR
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++++++++++--
>>> 1 files changed, 16 insertions(+), 2 deletions(-)
>>>
>>> [PATCH 15/20] svcrdma: Move the QP and cm_id destruction to
>>> svc_rdma_free
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 ++++++++++++++
>>> +---------------
>>> 1 files changed, 20 insertions(+), 20 deletions(-)
>>>
>>> [PATCH 16/20] svcrdma: Cleanup queued, but unprocessed I/O in
>>> svc_rdma_free
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 ++++++++++++++++++++
>>> +++++++--
>>> 1 files changed, 35 insertions(+), 3 deletions(-)
>>>
>>> [PATCH 17/20] svcrdma: Use ib verbs version of dma_unmap
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 ++++----
>>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> [PATCH 18/20] svcrdma: Set rqstp transport address in
>>> rdma_read_complete function
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> [PATCH 19/20] svcrdma: Copy transport address and arm CQ before
>>> calling rdma_accept
>>>
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 23 +++++++++++++
>>> +---------
>>> 1 files changed, 14 insertions(+), 9 deletions(-)
>>>
>>> [PATCH 20/20] svcrdma: Change svc_rdma_send_error return type to void
>>>
>>> include/linux/sunrpc/svc_rdma.h | 4 ++--
>>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
>>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 ++++-----
>>> 3 files changed, 7 insertions(+), 8 deletions(-)
>>>
>>> Signed-off-by: Tom Tucker <[email protected]>
>>> .
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs"
>> in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 2008-05-18 at 17:34 -0400, J. Bruce Fields wrote:
> Sorry for the delay:
>
> On Tue, May 13, 2008 at 07:56:47AM -0500, Tom Tucker wrote:
> > The for-bfields branch should contain those same patches.
>
> The series in the for-bfield branch includes two patches at the start
> that I don't think were in the series you mailed ("svcrdma: Remove extra
> check for XPT_DEAD bit in svc_xprt_enqueue" and "svcrdma: Remove unused
> header files from svc_xprt.c").
Ah. So I think I understand the confusion.
I separated changes to the generic transport switch from changes to the
RDMA provider and mailed them in separate patchsets.
I do believe that I have posted both the generic transport changes and
the RDMA specific changes to the list. I've also posted a new set based
on some Connectathon testing.
All that aside... the tree in for-bfields has had iozone testing and
Connectathon testing on x86-64.
Tom
>
> Small patches, so probably doesn't matter either way, but we may as well
> go with whichever result was actually tested, if only one was?
>
> --b.
>
>
> >
> > Tom
> >
> > On May 13, 2008, at 1:33 AM, "J. Bruce Fields" <[email protected]>
> > wrote:
> >
> >> On Mon, May 12, 2008 at 02:13:51PM -0500, Tom Tucker wrote:
> >>> This is an updated version of the patchset that includes changes per
> >>> your recommendations, plus:
> >>>
> >>> - cleanup: changed the return type on svc_rdma_send_error to void
> >>> - bug: added copy of transport address to the rqstp structure in
> >>> rdma read
> >>> completion logic
> >>> - bug: fixed svc_rdma_accept race that was found by inspection,
> >>
> >> OK, thanks. A minor whine: whatever procedure you're using to mail
> >> these seems to alphabetize them like:
> >>
> >> 11/20
> >> 1/20
> >> 12/20
> >> 13/20
> >> 14/20
> >> 15/20
> >> 16/20
> >> 17/20
> >> 18/20
> >> 19/20
> >> 20/20
> >> 2/20
> >> 3/20
> >> ...
> >>
> >> So the threading doesn't help apply them in the right order.
> >>
> >> Anyway, not a big problem. And I'd also be just as happy to take them
> >> from git if that'd be simpler. (But from a quick glance I didn't see
> >> a branch with the identical patches?)
> >>
> >> --b.
> >>
> >>>
> >>> The original description follows:
> >>>
> >>> This patchset fixes a number of defects in the close path of the
> >>> SVCRDMA
> >>> transport provider. The defects were found by injecting errors on the
> >>> transport at random intervals while running concurrent iozone tests
> >>> on
> >>> IB and iWARP mounts. With this set of patches applied I was able to
> >>> run
> >>> the above tests for several hours without causing a crash or leaking
> >>> resources. The transport recovers correctly on a client reconnect.
> >>>
> >>> This patchset is based on 2.6 top of tree, however, I think these
> >>> fixes are
> >>> good candidates for a 2.6.25 dot release as well. I have a set that
> >>> is
> >>> already merged for that release if you would like them. They are
> >>> available in
> >>> my git tree on linux-nfs.org in the '2.6.25' branch. Please let me
> >>> know if you
> >>> would like me to post them here.
> >>>
> >>> [PATCH 1/20] svcrdma: Simplify receive buffer posting
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 17 +----------------
> >>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 10 ++++++++++
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 19 -------------------
> >>> 3 files changed, 11 insertions(+), 35 deletions(-)
> >>>
> >>> [PATCH 2/20] svcrdma: Fix race with dto_tasklet in svc_rdma_send
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 +++++++++++++++
> >>> +-------------
> >>> 1 files changed, 22 insertions(+), 18 deletions(-)
> >>>
> >>> [PATCH 3/20] svcrdma: Fix return value in svc_rdma_send
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
> >>> 1 files changed, 1 insertions(+), 1 deletions(-)
> >>>
> >>> [PATCH 4/20] svcrdma: Add put of connection ESTABLISHED reference in
> >>> rdma_cma_handler
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 +
> >>> 1 files changed, 1 insertions(+), 0 deletions(-)
> >>>
> >>> [PATCH 5/20] svcrdma: Free context on ib_post_recv error
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
> >>> 1 files changed, 2 insertions(+), 0 deletions(-)
> >>>
> >>> [PATCH 6/20] svcrdma: Free context on post_recv error in send_reply
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 ++-
> >>> 1 files changed, 2 insertions(+), 1 deletions(-)
> >>>
> >>> [PATCH 7/20] svcrdma: Fix error handling during listening endpoint
> >>> creation
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 24 ++++++++++++
> >>> +-----------
> >>> 1 files changed, 13 insertions(+), 11 deletions(-)
> >>>
> >>> [PATCH 8/20] svcrdma: Return error from rdma_read_xdr so caller
> >>> knows to free context
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 23 +++++++++++++++
> >>> +-------
> >>> 1 files changed, 16 insertions(+), 7 deletions(-)
> >>>
> >>> [PATCH 9/20] svcrdma: Remove unused READ_DONE context flags bit
> >>>
> >>> include/linux/sunrpc/svc_rdma.h | 1 -
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 -
> >>> 3 files changed, 0 insertions(+), 3 deletions(-)
> >>>
> >>> [PATCH 10/20] svcrdma: Simplify RDMA_READ deferral buffer management
> >>>
> >>> include/linux/sunrpc/svc_rdma.h | 1 +
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 58 +++++
> >>> +------------------------
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ++-
> >>> 3 files changed, 16 insertions(+), 48 deletions(-)
> >>>
> >>> [PATCH 11/20] svcrdma: Use standard Linux lists for context cache
> >>>
> >>> include/linux/sunrpc/svc_rdma.h | 5 ++-
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 +++++++++++++++
> >>> +-------------
> >>> 2 files changed, 29 insertions(+), 23 deletions(-)
> >>>
> >>> [PATCH 12/20] svcrdma: Shrink scope of spinlock on RQ CQ
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++--
> >>> 1 files changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> [PATCH 13/20] svcrdma: Move destroy to kernel thread
> >>>
> >>> include/linux/sunrpc/svc_rdma.h | 1 +
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++---
> >>> 2 files changed, 15 insertions(+), 3 deletions(-)
> >>>
> >>> [PATCH 14/20] svcrdma: Add reference for each SQ/RQ WR
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++++++++++--
> >>> 1 files changed, 16 insertions(+), 2 deletions(-)
> >>>
> >>> [PATCH 15/20] svcrdma: Move the QP and cm_id destruction to
> >>> svc_rdma_free
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 40 ++++++++++++++
> >>> +---------------
> >>> 1 files changed, 20 insertions(+), 20 deletions(-)
> >>>
> >>> [PATCH 16/20] svcrdma: Cleanup queued, but unprocessed I/O in
> >>> svc_rdma_free
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 ++++++++++++++++++++
> >>> +++++++--
> >>> 1 files changed, 35 insertions(+), 3 deletions(-)
> >>>
> >>> [PATCH 17/20] svcrdma: Use ib verbs version of dma_unmap
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 ++++----
> >>> 1 files changed, 4 insertions(+), 4 deletions(-)
> >>>
> >>> [PATCH 18/20] svcrdma: Set rqstp transport address in
> >>> rdma_read_complete function
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 +
> >>> 1 files changed, 1 insertions(+), 0 deletions(-)
> >>>
> >>> [PATCH 19/20] svcrdma: Copy transport address and arm CQ before
> >>> calling rdma_accept
> >>>
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 23 +++++++++++++
> >>> +---------
> >>> 1 files changed, 14 insertions(+), 9 deletions(-)
> >>>
> >>> [PATCH 20/20] svcrdma: Change svc_rdma_send_error return type to void
> >>>
> >>> include/linux/sunrpc/svc_rdma.h | 4 ++--
> >>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
> >>> net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 ++++-----
> >>> 3 files changed, 7 insertions(+), 8 deletions(-)
> >>>
> >>> Signed-off-by: Tom Tucker <[email protected]>
> >>> .
> >>>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-nfs"
> >> in
> >> the body of a message to [email protected]
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html