Home| summaryrefslogtreecommitdiff |
diff options
| author | Hannes Reinecke <hare@suse.de> | 2018-07-12 09:57:49 +0200 |
|---|---|---|
| committer | Hannes Reinecke <hare@suse.de> | 2018-07-12 09:58:08 +0200 |
| commit | 72e83c1df2a13aef862a763e61d281666146e2be (patch) | |
| tree | 556c116e42d8b5bbee9a07a72cc3ba13436ba893 | |
| parent | f8128dec90a6688e96fed3c1ae39bcdbb5fa8711 (diff) | |
nvme-rdma: fix error flow during mapping request data
(bsc#1099041).
suse-commit: 029cb5b6c54e62bb023d9e54e5a631a360b33dfa
| -rw-r--r-- | drivers/nvme/host/rdma.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 9f550c0110ee..331cbf6e083f 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1180,21 +1180,38 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue, count = ib_dma_map_sg(ibdev, req->sg_table.sgl, req->nents, rq_data_dir(rq) == WRITE ? DMA_TO_DEVICE : DMA_FROM_DEVICE); if (unlikely(count <= 0)) { - sg_free_table_chained(&req->sg_table, true); - return -EIO; + ret = -EIO; + goto out_free_table; } if (count == 1) { if (rq_data_dir(rq) == WRITE && nvme_rdma_queue_idx(queue) && blk_rq_payload_bytes(rq) <= - nvme_rdma_inline_data_size(queue)) - return nvme_rdma_map_sg_inline(queue, req, c); + nvme_rdma_inline_data_size(queue)) { + ret = nvme_rdma_map_sg_inline(queue, req, c); + goto out; + } - if (dev->pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) - return nvme_rdma_map_sg_single(queue, req, c); + if (dev->pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) { + ret = nvme_rdma_map_sg_single(queue, req, c); + goto out; + } } - return nvme_rdma_map_sg_fr(queue, req, c, count); + ret = nvme_rdma_map_sg_fr(queue, req, c, count); +out: + if (unlikely(ret)) + goto out_unmap_sg; + + return 0; + +out_unmap_sg: + ib_dma_unmap_sg(ibdev, req->sg_table.sgl, + req->nents, rq_data_dir(rq) == + WRITE ? DMA_TO_DEVICE : DMA_FROM_DEVICE); +out_free_table: + sg_free_table_chained(&req->sg_table, true); + return ret; } static void nvme_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc) |