lkml.org 
[lkml]   [2019]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 091/167] IB/mlx5: Reset access mask when looping inside page fault handler
    Date
    From: Moni Shoua <monis@mellanox.com>

    [ Upstream commit 1abe186ed8a6593069bc122da55fc684383fdc1c ]

    If page-fault handler spans multiple MRs then the access mask needs to
    be reset before each MR handling or otherwise write access will be
    granted to mapped pages instead of read-only.

    Cc: <stable@vger.kernel.org> # 3.19
    Fixes: 7bdf65d411c1 ("IB/mlx5: Handle page faults")
    Reported-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Moni Shoua <monis@mellanox.com>
    Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/mlx5/odp.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
    index 9e1cac8cb2609..453e5c4ac19f4 100644
    --- a/drivers/infiniband/hw/mlx5/odp.c
    +++ b/drivers/infiniband/hw/mlx5/odp.c
    @@ -497,7 +497,7 @@ void mlx5_ib_free_implicit_mr(struct mlx5_ib_mr *imr)
    static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr,
    u64 io_virt, size_t bcnt, u32 *bytes_mapped)
    {
    - u64 access_mask = ODP_READ_ALLOWED_BIT;
    + u64 access_mask;
    int npages = 0, page_shift, np;
    u64 start_idx, page_mask;
    struct ib_umem_odp *odp;
    @@ -522,6 +522,7 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr,
    page_shift = mr->umem->page_shift;
    page_mask = ~(BIT(page_shift) - 1);
    start_idx = (io_virt - (mr->mmkey.iova & page_mask)) >> page_shift;
    + access_mask = ODP_READ_ALLOWED_BIT;

    if (mr->umem->writable)
    access_mask |= ODP_WRITE_ALLOWED_BIT;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-03 18:34    [W:4.130 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site