lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 300/346] IB/mlx4: Fix incorrect MC join state bit-masking on SR-IOV
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Alex Vesker <valex@mellanox.com>

    commit e5ac40cd66c2f3cd11bc5edc658f012661b16347 upstream.

    Because of an incorrect bit-masking done on the join state bits, when
    handling a join request we failed to detect a difference between the
    group join state and the request join state when joining as send only
    full member (0x8). This caused the MC join request not to be sent.
    This issue is relevant only when SRIOV is enabled and SM supports
    send only full member.

    This fix separates scope bits and join states bits a nibble each.

    Fixes: b9c5d6a64358 ('IB/mlx4: Add multicast group (MCG) paravirtualization for SR-IOV')
    Signed-off-by: Alex Vesker <valex@mellanox.com>
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/infiniband/hw/mlx4/mcg.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/infiniband/hw/mlx4/mcg.c
    +++ b/drivers/infiniband/hw/mlx4/mcg.c
    @@ -485,7 +485,7 @@ static u8 get_leave_state(struct mcast_g
    if (!group->members[i])
    leave_state |= (1 << i);

    - return leave_state & (group->rec.scope_join_state & 7);
    + return leave_state & (group->rec.scope_join_state & 0xf);
    }

    static int join_group(struct mcast_group *group, int slave, u8 join_mask)
    @@ -560,8 +560,8 @@ static void mlx4_ib_mcg_timeout_handler(
    } else
    mcg_warn_group(group, "DRIVER BUG\n");
    } else if (group->state == MCAST_LEAVE_SENT) {
    - if (group->rec.scope_join_state & 7)
    - group->rec.scope_join_state &= 0xf8;
    + if (group->rec.scope_join_state & 0xf)
    + group->rec.scope_join_state &= 0xf0;
    group->state = MCAST_IDLE;
    mutex_unlock(&group->lock);
    if (release_group(group, 1))
    @@ -601,7 +601,7 @@ static int handle_leave_req(struct mcast
    static int handle_join_req(struct mcast_group *group, u8 join_mask,
    struct mcast_req *req)
    {
    - u8 group_join_state = group->rec.scope_join_state & 7;
    + u8 group_join_state = group->rec.scope_join_state & 0xf;
    int ref = 0;
    u16 status;
    struct ib_sa_mcmember_data *sa_data = (struct ib_sa_mcmember_data *)req->sa_mad.data;
    @@ -686,8 +686,8 @@ static void mlx4_ib_mcg_work_handler(str
    u8 cur_join_state;

    resp_join_state = ((struct ib_sa_mcmember_data *)
    - group->response_sa_mad.data)->scope_join_state & 7;
    - cur_join_state = group->rec.scope_join_state & 7;
    + group->response_sa_mad.data)->scope_join_state & 0xf;
    + cur_join_state = group->rec.scope_join_state & 0xf;

    if (method == IB_MGMT_METHOD_GET_RESP) {
    /* successfull join */
    @@ -706,7 +706,7 @@ process_requests:
    req = list_first_entry(&group->pending_list, struct mcast_req,
    group_list);
    sa_data = (struct ib_sa_mcmember_data *)req->sa_mad.data;
    - req_join_state = sa_data->scope_join_state & 0x7;
    + req_join_state = sa_data->scope_join_state & 0xf;

    /* For a leave request, we will immediately answer the VF, and
    * update our internal counters. The actual leave will be sent
    \
     
     \ /
      Last update: 2016-11-14 03:43    [W:2.385 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site