Re: [PATCH 5/5] rds: ib: unmap the scatter/gather list when error

[Santosh Shilimkar]

On 3/8/2017 11:26 PM, Zhu Yanjun wrote:

When some errors occur, the scatter/gather list mapped to DMA addresses
should be handled.

Cc: Joe Jin 
Cc: Junxiao Bi 
Signed-off-by: Zhu Yanjun 
---

Acked-by: Santosh Shilimkar 

Re: [PATCH 5/5] rds: ib: unmap the scatter/gather list when error

[Santosh Shilimkar]

On 3/8/2017 11:26 PM, Zhu Yanjun wrote:

When some errors occur, the scatter/gather list mapped to DMA addresses
should be handled.

Cc: Joe Jin 
Cc: Junxiao Bi 
Signed-off-by: Zhu Yanjun 
---

Looks good.
Acked-by: Santosh Shilimkar 

[PATCH 5/5] rds: ib: unmap the scatter/gather list when error

[Zhu Yanjun]

When some errors occur, the scatter/gather list mapped to DMA addresses
should be handled.

Cc: Joe Jin 
Cc: Junxiao Bi 
Signed-off-by: Zhu Yanjun 
---
 net/rds/ib_fmr.c | 26 +++---
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/net/rds/ib_fmr.c b/net/rds/ib_fmr.c
index 1e00371..c60247f 100644
--- a/net/rds/ib_fmr.c
+++ b/net/rds/ib_fmr.c
@@ -113,29 +113,39 @@ static int rds_ib_map_fmr(struct rds_ib_device *rds_ibdev,
u64 dma_addr = ib_sg_dma_address(dev, [i]);
 
if (dma_addr & ~PAGE_MASK) {
-   if (i > 0)
+   if (i > 0) {
+   ib_dma_unmap_sg(dev, sg, nents,
+   DMA_BIDIRECTIONAL);
return -EINVAL;
-   else
+   } else {
++page_cnt;
+   }
}
if ((dma_addr + dma_len) & ~PAGE_MASK) {
-   if (i < sg_dma_len - 1)
+   if (i < sg_dma_len - 1) {
+   ib_dma_unmap_sg(dev, sg, nents,
+   DMA_BIDIRECTIONAL);
return -EINVAL;
-   else
+   } else {
++page_cnt;
+   }
}
 
len += dma_len;
}
 
page_cnt += len >> PAGE_SHIFT;
-   if (page_cnt > ibmr->pool->fmr_attr.max_pages)
+   if (page_cnt > ibmr->pool->fmr_attr.max_pages) {
+   ib_dma_unmap_sg(dev, sg, nents, DMA_BIDIRECTIONAL);
return -EINVAL;
+   }
 
dma_pages = kmalloc_node(sizeof(u64) * page_cnt, GFP_ATOMIC,
 rdsibdev_to_node(rds_ibdev));
-   if (!dma_pages)
+   if (!dma_pages) {
+   ib_dma_unmap_sg(dev, sg, nents, DMA_BIDIRECTIONAL);
return -ENOMEM;
+   }
 
page_cnt = 0;
for (i = 0; i < sg_dma_len; ++i) {
@@ -148,8 +158,10 @@ static int rds_ib_map_fmr(struct rds_ib_device *rds_ibdev,
}
 
ret = ib_map_phys_fmr(fmr->fmr, dma_pages, page_cnt, io_addr);
-   if (ret)
+   if (ret) {
+   ib_dma_unmap_sg(dev, sg, nents, DMA_BIDIRECTIONAL);
goto out;
+   }
 
/* Success - we successfully remapped the MR, so we can
 * safely tear down the old mapping.
-- 
2.7.4