Skip to content

Commit

Permalink
svcrdma: avoid duplicate dma unmapping during error recovery
Browse files Browse the repository at this point in the history
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: 412a15c ("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]>
  • Loading branch information
sbasavapatna authored and J. Bruce Fields committed Jan 12, 2017
1 parent 546125d commit ce1ca7d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ce1ca7d

Please sign in to comment.