diff options
| author | Jérôme Glisse <jglisse@redhat.com> | 2015-04-02 16:53:24 -0400 |
|---|---|---|
| committer | Jérôme Glisse <jglisse@redhat.com> | 2015-10-20 15:47:59 -0400 |
| commit | c65cb74fb2440ac036ffac51500b66e951ce2543 (patch) | |
| tree | b6a28c2cb65a6fa54bcb908b3a935f91c46b70ea | |
| parent | 829577234be76d0a525bdd1a309b3c7d5a09e2d5 (diff) | |
IB/mlx5: add a new parameter to mlx5_ib_update_mtt() for ODP with HMM.
When using HMM for ODP it will be useful to pass the current mirror
page table iterator for mlx5_ib_update_mtt() function benefit. Add
void parameter for this.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mr.c | 4 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mlx5/odp.c | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 99d8bcfe59e2..a6de5b5508c5 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -568,7 +568,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, u64 virt_addr, int access_flags, struct ib_udata *udata); int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index, - int npages, int zap); + int npages, int zap, void *data); int mlx5_ib_dereg_mr(struct ib_mr *ibmr); struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 9feabeeaa40f..a1039294b4cb 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -841,7 +841,7 @@ free_mr: #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index, int npages, - int zap) + int zap, void *data) { struct mlx5_ib_dev *dev = mr->dev; struct device *ddev = dev->ib_dev.dma_device; @@ -908,7 +908,7 @@ int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index, int npages, if (!zap) { __mlx5_ib_populate_pas(dev, umem, PAGE_SHIFT, start_page_index, npages, pas, - MLX5_IB_MTT_PRESENT, NULL); + MLX5_IB_MTT_PRESENT, data); /* Clear padding after the pages brought from the * umem. */ memset(pas + npages, 0, size - npages * sizeof(u64)); diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c index aa8391e75385..df86d05b38f9 100644 --- a/drivers/infiniband/hw/mlx5/odp.c +++ b/drivers/infiniband/hw/mlx5/odp.c @@ -91,14 +91,15 @@ void mlx5_ib_invalidate_range(struct ib_umem *umem, unsigned long start, if (in_block && umr_offset == 0) { mlx5_ib_update_mtt(mr, blk_start_idx, - idx - blk_start_idx, 1); + idx - blk_start_idx, 1, + NULL); in_block = 0; } } } if (in_block) mlx5_ib_update_mtt(mr, blk_start_idx, idx - blk_start_idx + 1, - 1); + 1, NULL); /* * We are now sure that the device will not access the @@ -249,7 +250,8 @@ static int pagefault_single_data_segment(struct mlx5_ib_qp *qp, * this MR, since ib_umem_odp_map_dma_pages already * checks this. */ - ret = mlx5_ib_update_mtt(mr, start_idx, npages, 0); + ret = mlx5_ib_update_mtt(mr, start_idx, + npages, 0, NULL); } else { ret = -EAGAIN; } |