projects/linux·commit ce1ca7d2

svcrdma: avoid duplicate dma unmapping during error recovery

ce1ca7d2 · Sriharsha Basavapatna <[email protected]> · 2017-01-09 16:00:44 +05:30

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: [email protected]
Signed-off-by: Sriharsha Basavapatna <[email protected]>
Reviewed-by: Chuck Lever <[email protected]>
Reviewed-by: Yuval Shaia <[email protected]>
Signed-off-by: J. Bruce Fields <[email protected]>
Commit
ce1ca7d2d140a1f4aaffd297ac487f246963dd2f
Parents
546125d1

Changes

1 files changed · +0 −2

FileStatusAddDelContent
net/sunrpc/xprtrdma/svc_rdma_recvfrom.cmodified+0−2View file

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

View file
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 57d35fb..172b537 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;