Skip to content

Commit bab9693

Browse files
lxindavem330
authored andcommitted
net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task()
A dead lock was triggered on thunderx driver: CPU0 CPU1 ---- ---- [01] lock(&(&nic->rx_mode_wq_lock)->rlock); [11] lock(&(&mc->mca_lock)->rlock); [12] lock(&(&nic->rx_mode_wq_lock)->rlock); [02] <Interrupt> lock(&(&mc->mca_lock)->rlock); The path for each is: [01] worker_thread() -> process_one_work() -> nicvf_set_rx_mode_task() [02] mld_ifc_timer_expire() [11] ipv6_add_dev() -> ipv6_dev_mc_inc() -> igmp6_group_added() -> [12] dev_mc_add() -> __dev_set_rx_mode() -> nicvf_set_rx_mode() To fix it, it needs to disable bh on [1], so that the timer on [2] wouldn't be triggered until rx_mode_wq_lock is released. So change to use spin_lock_bh() instead of spin_lock(). Thanks to Paolo for helping with this. v1->v2: - post to netdev. Reported-by: Rafael P. <[email protected]> Tested-by: Dean Nelson <[email protected]> Fixes: 469998c ("net: thunderx: prevent concurrent data re-writing by nicvf_set_rx_mode") Signed-off-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2ac24d6 commit bab9693

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/cavium/thunder/nicvf_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,11 +2039,11 @@ static void nicvf_set_rx_mode_task(struct work_struct *work_arg)
20392039
/* Save message data locally to prevent them from
20402040
* being overwritten by next ndo_set_rx_mode call().
20412041
*/
2042-
spin_lock(&nic->rx_mode_wq_lock);
2042+
spin_lock_bh(&nic->rx_mode_wq_lock);
20432043
mode = vf_work->mode;
20442044
mc = vf_work->mc;
20452045
vf_work->mc = NULL;
2046-
spin_unlock(&nic->rx_mode_wq_lock);
2046+
spin_unlock_bh(&nic->rx_mode_wq_lock);
20472047

20482048
__nicvf_set_rx_mode_task(mode, mc, nic);
20492049
}

0 commit comments

Comments
 (0)