lkml.org 
[lkml]   [2015]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/36] IB/mlx5: add a new paramter to __mlx_ib_populated_pas for ODP with HMM.
    Date
    From: Jérôme Glisse <jglisse@redhat.com>

    When using HMM for ODP it will be usefull to pass the current mirror
    page table iterator for __mlx_ib_populated_pas() function benefit. Add
    void parameter for this.

    Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
    ---
    drivers/infiniband/hw/mlx5/mem.c | 8 +++++---
    drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +-
    drivers/infiniband/hw/mlx5/mr.c | 2 +-
    3 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c
    index 40df2cc..df56b7d 100644
    --- a/drivers/infiniband/hw/mlx5/mem.c
    +++ b/drivers/infiniband/hw/mlx5/mem.c
    @@ -145,11 +145,13 @@ static u64 umem_dma_to_mtt(dma_addr_t umem_dma)
    * num_pages - total number of pages to fill
    * pas - bus addresses array to fill
    * access_flags - access flags to set on all present pages.
    - use enum mlx5_ib_mtt_access_flags for this.
    + * use enum mlx5_ib_mtt_access_flags for this.
    + * data - intended for odp with hmm, it should point to current mirror page
    + * table iterator.
    */
    void __mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
    int page_shift, size_t offset, size_t num_pages,
    - __be64 *pas, int access_flags)
    + __be64 *pas, int access_flags, void *data)
    {
    unsigned long umem_page_shift = ilog2(umem->page_size);
    int shift = page_shift - umem_page_shift;
    @@ -201,7 +203,7 @@ void mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
    {
    return __mlx5_ib_populate_pas(dev, umem, page_shift, 0,
    ib_umem_num_pages(umem), pas,
    - access_flags);
    + access_flags, NULL);
    }
    int mlx5_ib_get_buf_offset(u64 addr, int page_shift, u32 *offset)
    {
    diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
    index dff1cfc..ec532f0 100644
    --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
    +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
    @@ -602,7 +602,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift,
    int *ncont, int *order);
    void __mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
    int page_shift, size_t offset, size_t num_pages,
    - __be64 *pas, int access_flags);
    + __be64 *pas, int access_flags, void *data);
    void mlx5_ib_populate_pas(struct mlx5_ib_dev *dev, struct ib_umem *umem,
    int page_shift, __be64 *pas, int access_flags);
    void mlx5_ib_copy_pas(u64 *old, u64 *new, int step, int num);
    diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
    index 71c5935..51a7775 100644
    --- a/drivers/infiniband/hw/mlx5/mr.c
    +++ b/drivers/infiniband/hw/mlx5/mr.c
    @@ -912,7 +912,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);
    + MLX5_IB_MTT_PRESENT, NULL);
    /* Clear padding after the pages brought from the
    * umem. */
    memset(pas + npages, 0, size - npages * sizeof(u64));
    --
    1.9.3


    \
     
     \ /
      Last update: 2015-05-21 23:01    [W:5.225 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site