please pull infiniband.git
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a couple of fixes to low-level drivers that fix crashes seen when running NFS/RDMA:
Jack Morgenstein (1):
IB/mlx4: Don't overwrite fast registration page list when posting work request
Roland Dreier (1):
Merge branches 'cxgb3' and 'mlx4' into for-linus
Steve Wise (1):
RDMA/cxgb3: Don't complete flushed send work requests twice
drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + drivers/infiniband/hw/mlx4/mr.c | 10 ++++++++-- drivers/infiniband/hw/mlx4/qp.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-)
drivers/infiniband/hw/cxgb3/cxio_hal.c +1 -0
@@ -410,6 +410,7 @@ int cxio_flush_sq(struct t3_wq *wq, struct t3_cq *cq, int count) ptr = wq->sq_rptr + count; sqp = wq->sq +Q_PTR2IDX (ptr, wq->sq_size_log2);while (ptr != wq->sq_wptr) { + sqp->signaled =0 ;insert_sq_cqe (wq, cq, sqp); ptr++; sqp = wq->sq +Q_PTR2IDX (ptr, wq->sq_size_log2);
drivers/infiniband/hw/mlx4/mlx4_ib.h +1 -0
@@ -86,6 +86,7 @@ struct mlx4_ib_mr {struct mlx4_ib_fast_reg_page_list {struct ib_fast_reg_page_list ibfrpl; +__be64 *mapped_page_list;dma_addr_t map; };
drivers/infiniband/hw/mlx4/mr.c +8 -2
@@ -231,7 +231,11 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_deviceif (!mfrpl)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,GFP_KERNEL );if (!mfrpl->ibfrpl.page_list)
@@ -242,6 +246,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_devicereturn &mfrpl->ibfrpl; err_free: +kfree (mfrpl->ibfrpl.page_list);kfree (mfrpl);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);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); +kfree (mfrpl->ibfrpl.page_list);kfree (mfrpl); }
drivers/infiniband/hw/mlx4/qp.c +1 -1
@@ -1365,7 +1365,7 @@ static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)int 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] |MLX4_MTT_FLAG_PRESENT );