* [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
@ 2017-01-09 10:30 Sriharsha Basavapatna
2017-01-09 6:42 ` Yuval Shaia
0 siblings, 1 reply; 6+ messages in thread
From: Sriharsha Basavapatna @ 2017-01-09 10:30 UTC (permalink / raw)
To: bfields; +Cc: linux-nfs, linux-rdma
In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
problems when the iova being unmapped is subsequently reused. Remove
the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
handle it.
Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
Cc: stable@vger.kernel.org
Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 57d35fbb1c28..172b537f8cfc 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
atomic_inc(&rdma_stat_read);
return ret;
err:
- ib_dma_unmap_sg(xprt->sc_cm_id->device,
- frmr->sg, frmr->sg_nents, frmr->direction);
svc_rdma_put_context(ctxt, 0);
svc_rdma_put_frmr(xprt, frmr);
return ret;
--
2.11.0.258.ge05806da9
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
2017-01-09 10:30 [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery Sriharsha Basavapatna
@ 2017-01-09 6:42 ` Yuval Shaia
2017-01-09 15:05 ` Chuck Lever
0 siblings, 1 reply; 6+ messages in thread
From: Yuval Shaia @ 2017-01-09 6:42 UTC (permalink / raw)
To: Sriharsha Basavapatna; +Cc: bfields, linux-nfs, linux-rdma
On Mon, Jan 09, 2017 at 04:00:44PM +0530, Sriharsha Basavapatna wrote:
> In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
> invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
> svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
> ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
> problems when the iova being unmapped is subsequently reused. Remove
> the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
> handle it.
>
> Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
> Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> index 57d35fbb1c28..172b537f8cfc 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> @@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
> atomic_inc(&rdma_stat_read);
> return ret;
> err:
> - ib_dma_unmap_sg(xprt->sc_cm_id->device,
> - frmr->sg, frmr->sg_nents, frmr->direction);
> svc_rdma_put_context(ctxt, 0);
> svc_rdma_put_frmr(xprt, frmr);
> return ret;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> --
> 2.11.0.258.ge05806da9
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
2017-01-09 6:42 ` Yuval Shaia
@ 2017-01-09 15:05 ` Chuck Lever
2017-01-12 21:15 ` J. Bruce Fields
0 siblings, 1 reply; 6+ messages in thread
From: Chuck Lever @ 2017-01-09 15:05 UTC (permalink / raw)
To: J. Bruce Fields
Cc: Sriharsha Basavapatna, Yuval Shaia, Linux NFS Mailing List,
List Linux RDMA Mailing
> On Jan 9, 2017, at 1:42 AM, Yuval Shaia <yuval.shaia@oracle.com> wrote:
>
> On Mon, Jan 09, 2017 at 04:00:44PM +0530, Sriharsha Basavapatna wrote:
>> In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
>> invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
>> svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
>> ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
>> problems when the iova being unmapped is subsequently reused. Remove
>> the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
>> handle it.
>>
>> Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
>> Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
>> index 57d35fbb1c28..172b537f8cfc 100644
>> --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
>> +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
>> @@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
>> atomic_inc(&rdma_stat_read);
>> return ret;
>> err:
>> - ib_dma_unmap_sg(xprt->sc_cm_id->device,
>> - frmr->sg, frmr->sg_nents, frmr->direction);
>> svc_rdma_put_context(ctxt, 0);
>> svc_rdma_put_frmr(xprt, frmr);
>> return ret;
>
> Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Hi Bruce-
Is it possible to take this in v4.10-rc ?
--
Chuck Lever
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
2017-01-09 15:05 ` Chuck Lever
@ 2017-01-12 21:15 ` J. Bruce Fields
0 siblings, 0 replies; 6+ messages in thread
From: J. Bruce Fields @ 2017-01-12 21:15 UTC (permalink / raw)
To: Chuck Lever
Cc: Sriharsha Basavapatna, Yuval Shaia, Linux NFS Mailing List,
List Linux RDMA Mailing
On Mon, Jan 09, 2017 at 10:05:48AM -0500, Chuck Lever wrote:
>
> > On Jan 9, 2017, at 1:42 AM, Yuval Shaia <yuval.shaia@oracle.com> wrote:
> >
> > On Mon, Jan 09, 2017 at 04:00:44PM +0530, Sriharsha Basavapatna wrote:
> >> In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
> >> invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
> >> svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
> >> ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
> >> problems when the iova being unmapped is subsequently reused. Remove
> >> the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
> >> handle it.
> >>
> >> Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
> >> Cc: stable@vger.kernel.org
> >> Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
> >> Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
> >> ---
> >> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
> >> 1 file changed, 2 deletions(-)
> >>
> >> diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> >> index 57d35fbb1c28..172b537f8cfc 100644
> >> --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> >> +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> >> @@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
> >> atomic_inc(&rdma_stat_read);
> >> return ret;
> >> err:
> >> - ib_dma_unmap_sg(xprt->sc_cm_id->device,
> >> - frmr->sg, frmr->sg_nents, frmr->direction);
> >> svc_rdma_put_context(ctxt, 0);
> >> svc_rdma_put_frmr(xprt, frmr);
> >> return ret;
> >
> > Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
>
> Hi Bruce-
>
> Is it possible to take this in v4.10-rc ?
Yep, thanks to all of you.--b.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
@ 2017-01-04 16:03 Sriharsha Basavapatna
2017-01-04 18:20 ` Chuck Lever
0 siblings, 1 reply; 6+ messages in thread
From: Sriharsha Basavapatna @ 2017-01-04 16:03 UTC (permalink / raw)
To: linux-nfs, linux-rdma
In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
problems when the iova being unmapped is subsequently reused. Remove
the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
handle it.
Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
Cc: stable@vger.kernel.org
Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
---
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 57d35fbb1c28..172b537f8cfc 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
atomic_inc(&rdma_stat_read);
return ret;
err:
- ib_dma_unmap_sg(xprt->sc_cm_id->device,
- frmr->sg, frmr->sg_nents, frmr->direction);
svc_rdma_put_context(ctxt, 0);
svc_rdma_put_frmr(xprt, frmr);
return ret;
--
2.11.0.258.ge05806da9
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery
2017-01-04 16:03 Sriharsha Basavapatna
@ 2017-01-04 18:20 ` Chuck Lever
0 siblings, 0 replies; 6+ messages in thread
From: Chuck Lever @ 2017-01-04 18:20 UTC (permalink / raw)
To: Sriharsha Basavapatna
Cc: Linux NFS Mailing List, List Linux RDMA Mailing, Sagi Grimberg
> On Jan 4, 2017, at 11:03 AM, Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com> wrote:
>
> In rdma_read_chunk_frmr() when ib_post_send() fails, the error code path
> invokes ib_dma_unmap_sg() to unmap the sg list. It then invokes
> svc_rdma_put_frmr() which in turn tries to unmap the same sg list through
> ib_dma_unmap_sg() again. This second unmap is invalid and could lead to
> problems when the iova being unmapped is subsequently reused. Remove
> the call to unmap in rdma_read_chunk_frmr() and let svc_rdma_put_frmr()
> handle it.
>
> Fixes: 412a15c0fe53 ("svcrdma: Port to new memory registration API")
> Cc: stable@vger.kernel.org
> Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> index 57d35fbb1c28..172b537f8cfc 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
> @@ -347,8 +347,6 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
> atomic_inc(&rdma_stat_read);
> return ret;
> err:
> - ib_dma_unmap_sg(xprt->sc_cm_id->device,
> - frmr->sg, frmr->sg_nents, frmr->direction);
> svc_rdma_put_context(ctxt, 0);
> svc_rdma_put_frmr(xprt, frmr);
> return ret;
> --
> 2.11.0.258.ge05806da9
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-12 21:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 10:30 [PATCH] svcrdma: avoid duplicate dma unmapping during error recovery Sriharsha Basavapatna
2017-01-09 6:42 ` Yuval Shaia
2017-01-09 15:05 ` Chuck Lever
2017-01-12 21:15 ` J. Bruce Fields
-- strict thread matches above, loose matches on Subject: below --
2017-01-04 16:03 Sriharsha Basavapatna
2017-01-04 18:20 ` Chuck Lever
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).