leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/mlx5: Fix error handling in reg_umr

Browse Source 
If ib_post_send fails when posting the UMR work request in reg_umr,
the code doesn't release the temporary pas buffer allocated, and
doesn't dma_unmap it.

Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Haggai Eran 2014-05-22 14:50:08 +03:00 committed by Roland Dreier
parent c7f44fbda6
commit 096f7e72c6
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/infiniband/hw/mlx5/mr.c
View File

@ -730,7 +730,7 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
struct mlx5_ib_mr *mr; struct mlx5_ib_mr *mr;
struct ib_sge sg; struct ib_sge sg;
int size = sizeof(u64) * npages; int size = sizeof(u64) * npages;
int err; int err = 0;
int i; int i;
for (i = 0; i < 1; i++) { for (i = 0; i < 1; i++) {
@ -751,7 +751,7 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL); mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL);
if (!mr->pas) { if (!mr->pas) {
err = -ENOMEM; err = -ENOMEM;
goto error; goto free_mr;
} }
mlx5_ib_populate_pas(dev, umem, page_shift, mlx5_ib_populate_pas(dev, umem, page_shift,
@ -760,9 +760,8 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size, mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (dma_mapping_error(ddev, mr->dma)) { if (dma_mapping_error(ddev, mr->dma)) {
kfree(mr->pas);
err = -ENOMEM; err = -ENOMEM;
goto error; goto free_pas;
} }
memset(&wr, 0, sizeof(wr)); memset(&wr, 0, sizeof(wr));
@ -778,26 +777,28 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
err = ib_post_send(umrc->qp, &wr, &bad); err = ib_post_send(umrc->qp, &wr, &bad);
if (err) { if (err) {
mlx5_ib_warn(dev, "post send failed, err %d\n", err); mlx5_ib_warn(dev, "post send failed, err %d\n", err);
up(&umrc->sem); goto unmap_dma;
goto error;
} }
wait_for_completion(&mr->done); wait_for_completion(&mr->done);
up(&umrc->sem);
dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
kfree(mr->pas);
if (mr->status != IB_WC_SUCCESS) { if (mr->status != IB_WC_SUCCESS) {
mlx5_ib_warn(dev, "reg umr failed\n"); mlx5_ib_warn(dev, "reg umr failed\n");
err = -EFAULT; err = -EFAULT;
goto error; }
unmap_dma:
up(&umrc->sem);
dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
free_pas:
kfree(mr->pas);
free_mr:
if (err) {
free_cached_mr(dev, mr);
return ERR_PTR(err);
} }
return mr; return mr;
error:
free_cached_mr(dev, mr);
return ERR_PTR(err);
} }
static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, u64 virt_addr, static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, u64 virt_addr,