Patch "IB/mlx4: Fix incorrect MC join state bit-masking on SR-IOV" has been added to the 4.7-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
IB/mlx4: Fix incorrect MC join state bit-masking on SR-IOV
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-mlx4-fix-incorrect-mc-join-state-bit-masking-on-sr-iov.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e5ac40cd66c2f3cd11bc5edc658f012661b16347Mon Sep 17 00:00:00 2001
From: Alex Vesker <[email protected]>
Date: Mon, 12 Sep 2016 19:16:18 +0300
Subject: IB/mlx4: Fix incorrect MC join state bit-masking on SR-IOV
From: Alex Vesker <[email protected]>
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.
--- drivers/infiniband/hw/mlx4/mcg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx4/mcg.c +7 -7
@@ -489,7 +489,7 @@ static u8 get_leave_state(struct mcast_gif (!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)
@@ -564,8 +564,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 ))
@@ -605,7 +605,7 @@ static int handle_leave_req(struct mcaststatic 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;
@@ -690,8 +690,8 @@ static void mlx4_ib_mcg_work_handler(stru8 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 */
@@ -710,7 +710,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
Patches currently in stable-queue which might be from [email protected] are
queue-4.7/ib-ipoib-don-t-allow-mc-joins-during-light-mc-flush.patch queue-4.7/ib-mlx4-fix-incorrect-mc-join-state-bit-masking-on-sr-iov.patch