lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 371/413] IB/mlx5: Report correctly tag matching rendezvous capability
    Date
    From: Danit Goldberg <danitg@mellanox.com>

    commit 89705e92700170888236555fe91b45e4c1bb0985 upstream.

    Userspace expects the IB_TM_CAP_RC bit to indicate that the device
    supports RC transport tag matching with rendezvous offload. However the
    firmware splits this into two capabilities for eager and rendezvous tag
    matching.

    Only if the FW supports both modes should userspace be told the tag
    matching capability is available.

    Cc: <stable@vger.kernel.org> # 4.13
    Fixes: eb761894351d ("IB/mlx5: Fill XRQ capabilities")
    Signed-off-by: Danit Goldberg <danitg@mellanox.com>
    Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
    Reviewed-by: Artemy Kovalyov <artemyko@mellanox.com>
    Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/hw/mlx5/main.c | 8 ++++++--
    include/rdma/ib_verbs.h | 4 ++--
    2 files changed, 8 insertions(+), 4 deletions(-)

    --- a/drivers/infiniband/hw/mlx5/main.c
    +++ b/drivers/infiniband/hw/mlx5/main.c
    @@ -1043,15 +1043,19 @@ static int mlx5_ib_query_device(struct i
    }

    if (MLX5_CAP_GEN(mdev, tag_matching)) {
    - props->tm_caps.max_rndv_hdr_size = MLX5_TM_MAX_RNDV_MSG_SIZE;
    props->tm_caps.max_num_tags =
    (1 << MLX5_CAP_GEN(mdev, log_tag_matching_list_sz)) - 1;
    - props->tm_caps.flags = IB_TM_CAP_RC;
    props->tm_caps.max_ops =
    1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
    props->tm_caps.max_sge = MLX5_TM_MAX_SGE;
    }

    + if (MLX5_CAP_GEN(mdev, tag_matching) &&
    + MLX5_CAP_GEN(mdev, rndv_offload_rc)) {
    + props->tm_caps.flags = IB_TM_CAP_RNDV_RC;
    + props->tm_caps.max_rndv_hdr_size = MLX5_TM_MAX_RNDV_MSG_SIZE;
    + }
    +
    if (MLX5_CAP_GEN(dev->mdev, cq_moderation)) {
    props->cq_caps.max_cq_moderation_count =
    MLX5_MAX_CQ_COUNT;
    --- a/include/rdma/ib_verbs.h
    +++ b/include/rdma/ib_verbs.h
    @@ -327,8 +327,8 @@ struct ib_rss_caps {
    };

    enum ib_tm_cap_flags {
    - /* Support tag matching on RC transport */
    - IB_TM_CAP_RC = 1 << 0,
    + /* Support tag matching with rendezvous offload for RC transport */
    + IB_TM_CAP_RNDV_RC = 1 << 0,
    };

    struct ib_tm_caps {

    \
     
     \ /
      Last update: 2019-07-24 22:09    [W:4.157 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site