android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Don't overwrite fast registration page list when posting work request
  RDMA/cxgb3: Don't complete flushed send work requests twice
This commit is contained in:
Linus Torvalds 2009-05-13 16:31:12 -07:00
commit c98861f7de
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/hw/cxgb3/cxio_hal.c
View File

@ -410,6 +410,7 @@ int cxio_flush_sq(struct t3_wq *wq, struct t3_cq *cq, int count)
ptr = wq->sq_rptr + count; ptr = wq->sq_rptr + count;
sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2); sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2);
while (ptr != wq->sq_wptr) { while (ptr != wq->sq_wptr) {
sqp->signaled = 0;
insert_sq_cqe(wq, cq, sqp); insert_sq_cqe(wq, cq, sqp);
ptr++; ptr++;
sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2); sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2);

1
drivers/infiniband/hw/mlx4/mlx4_ib.h
View File

@ -86,6 +86,7 @@ struct mlx4_ib_mr {
struct mlx4_ib_fast_reg_page_list { struct mlx4_ib_fast_reg_page_list {
struct ib_fast_reg_page_list ibfrpl; struct ib_fast_reg_page_list ibfrpl;
__be64 *mapped_page_list;
dma_addr_t map; dma_addr_t map;
}; };

10
drivers/infiniband/hw/mlx4/mr.c
View File

@ -231,7 +231,11 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
if (!mfrpl) if (!mfrpl)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
mfrpl->ibfrpl.page_list = dma_alloc_coherent(&dev->dev->pdev->dev, mfrpl->ibfrpl.page_list = kmalloc(size, GFP_KERNEL);
if (!mfrpl->ibfrpl.page_list)
goto err_free;
mfrpl->mapped_page_list = dma_alloc_coherent(&dev->dev->pdev->dev,
size, &mfrpl->map, size, &mfrpl->map,
GFP_KERNEL); GFP_KERNEL);
if (!mfrpl->ibfrpl.page_list) if (!mfrpl->ibfrpl.page_list)
@ -242,6 +246,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
return &mfrpl->ibfrpl; return &mfrpl->ibfrpl;
err_free: err_free:
kfree(mfrpl->ibfrpl.page_list);
kfree(mfrpl); kfree(mfrpl);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
@ -252,8 +257,9 @@ void mlx4_ib_free_fast_reg_page_list(struct ib_fast_reg_page_list *page_list)
struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(page_list); struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(page_list);
int size = page_list->max_page_list_len * sizeof (u64); int size = page_list->max_page_list_len * sizeof (u64);
dma_free_coherent(&dev->dev->pdev->dev, size, page_list->page_list, dma_free_coherent(&dev->dev->pdev->dev, size, mfrpl->mapped_page_list,
mfrpl->map); mfrpl->map);
kfree(mfrpl->ibfrpl.page_list);
kfree(mfrpl); kfree(mfrpl);
} }

2
drivers/infiniband/hw/mlx4/qp.c
View File

@ -1365,7 +1365,7 @@ static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)
int i; int i;
for (i = 0; i < wr->wr.fast_reg.page_list_len; ++i) for (i = 0; i < wr->wr.fast_reg.page_list_len; ++i)
wr->wr.fast_reg.page_list->page_list[i] = mfrpl->mapped_page_list[i] =
cpu_to_be64(wr->wr.fast_reg.page_list->page_list[i] | cpu_to_be64(wr->wr.fast_reg.page_list->page_list[i] |
MLX4_MTT_FLAG_PRESENT); MLX4_MTT_FLAG_PRESENT);