lkml.org 
[lkml]   [2017]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 052/133] IB/mlx5: Fix integer overflow when page_shift == 31
    3.16.51-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ilya Lesokhin <ilyal@mellanox.com>

    commit 7b4cdaae73ee833975a767cf54a3354d355b3f8d upstream.

    Fix a bug where MR registration fails when mlx5_ib_cont_pages
    indicates that the MR can be mapped using 2GB pages (page_shift == 31).

    Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
    Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com>
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/infiniband/hw/mlx5/mr.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/infiniband/hw/mlx5/mr.c
    +++ b/drivers/infiniband/hw/mlx5/mr.c
    @@ -682,13 +682,14 @@ err_free:
    return ERR_PTR(err);
    }

    -static int get_octo_len(u64 addr, u64 len, int page_size)
    +static int get_octo_len(u64 addr, u64 len, int page_shift)
    {
    + u64 page_size = 1ULL << page_shift;
    u64 offset;
    int npages;

    offset = addr & (page_size - 1);
    - npages = ALIGN(len + offset, page_size) >> ilog2(page_size);
    + npages = ALIGN(len + offset, page_size) >> page_shift;
    return (npages + 1) / 2;
    }

    @@ -870,11 +871,11 @@ static struct mlx5_ib_mr *reg_create(str
    in->seg.start_addr = cpu_to_be64(virt_addr);
    in->seg.len = cpu_to_be64(length);
    in->seg.bsfs_octo_size = 0;
    - in->seg.xlt_oct_size = cpu_to_be32(get_octo_len(virt_addr, length, 1 << page_shift));
    + in->seg.xlt_oct_size = cpu_to_be32(get_octo_len(virt_addr, length, page_shift));
    in->seg.log2_page_size = page_shift;
    in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
    in->xlat_oct_act_size = cpu_to_be32(get_octo_len(virt_addr, length,
    - 1 << page_shift));
    + page_shift));
    err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in, inlen, NULL,
    NULL, NULL);
    if (err) {
    \
     
     \ /
      Last update: 2017-11-22 03:25    [W:4.144 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site