Skip to content

Commit 7153257

Browse files
LorenzoBianconinbd168
authored andcommitted
wifi: mt76: Remove RCU section in mt7996_mac_sta_rc_work()
Since mt7996_mcu_add_rate_ctrl() and mt7996_mcu_set_fixed_field() can't run in atomic context, move RCU critical section in mt7996_mcu_add_rate_ctrl() and mt7996_mcu_set_fixed_field(). This patch fixes a 'sleep while atomic' issue in mt7996_mac_sta_rc_work(). Fixes: 0762bdd ("wifi: mt76: mt7996: rework mt7996_mac_sta_rc_work to support MLO") Signed-off-by: Lorenzo Bianconi <[email protected]> Tested-by: Ben Greear <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Felix Fietkau <[email protected]>
1 parent 3dd6f67 commit 7153257

File tree

1 file changed

+7
-28
lines changed
  • drivers/net/wireless/mediatek/mt76/mt7996

1 file changed

+7
-28
lines changed

drivers/net/wireless/mediatek/mt76/mt7996/mac.c

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2353,19 +2353,12 @@ void mt7996_mac_update_stats(struct mt7996_phy *phy)
23532353
void mt7996_mac_sta_rc_work(struct work_struct *work)
23542354
{
23552355
struct mt7996_dev *dev = container_of(work, struct mt7996_dev, rc_work);
2356-
struct ieee80211_bss_conf *link_conf;
2357-
struct ieee80211_link_sta *link_sta;
23582356
struct mt7996_sta_link *msta_link;
2359-
struct mt76_vif_link *mlink;
2360-
struct ieee80211_sta *sta;
23612357
struct ieee80211_vif *vif;
2362-
struct mt7996_sta *msta;
23632358
struct mt7996_vif *mvif;
23642359
LIST_HEAD(list);
23652360
u32 changed;
2366-
u8 link_id;
23672361

2368-
rcu_read_lock();
23692362
spin_lock_bh(&dev->mt76.sta_poll_lock);
23702363
list_splice_init(&dev->sta_rc_list, &list);
23712364

@@ -2376,42 +2369,28 @@ void mt7996_mac_sta_rc_work(struct work_struct *work)
23762369

23772370
changed = msta_link->changed;
23782371
msta_link->changed = 0;
2379-
2380-
sta = wcid_to_sta(&msta_link->wcid);
2381-
link_id = msta_link->wcid.link_id;
2382-
msta = msta_link->sta;
2383-
mvif = msta->vif;
2384-
vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);
2385-
2386-
mlink = rcu_dereference(mvif->mt76.link[link_id]);
2387-
if (!mlink)
2388-
continue;
2389-
2390-
link_sta = rcu_dereference(sta->link[link_id]);
2391-
if (!link_sta)
2392-
continue;
2393-
2394-
link_conf = rcu_dereference(vif->link_conf[link_id]);
2395-
if (!link_conf)
2396-
continue;
2372+
mvif = msta_link->sta->vif;
2373+
vif = container_of((void *)mvif, struct ieee80211_vif,
2374+
drv_priv);
23972375

23982376
spin_unlock_bh(&dev->mt76.sta_poll_lock);
23992377

24002378
if (changed & (IEEE80211_RC_SUPP_RATES_CHANGED |
24012379
IEEE80211_RC_NSS_CHANGED |
24022380
IEEE80211_RC_BW_CHANGED))
24032381
mt7996_mcu_add_rate_ctrl(dev, msta_link->sta, vif,
2404-
link_id, true);
2382+
msta_link->wcid.link_id,
2383+
true);
24052384

24062385
if (changed & IEEE80211_RC_SMPS_CHANGED)
2407-
mt7996_mcu_set_fixed_field(dev, msta, NULL, link_id,
2386+
mt7996_mcu_set_fixed_field(dev, msta_link->sta, NULL,
2387+
msta_link->wcid.link_id,
24082388
RATE_PARAM_MMPS_UPDATE);
24092389

24102390
spin_lock_bh(&dev->mt76.sta_poll_lock);
24112391
}
24122392

24132393
spin_unlock_bh(&dev->mt76.sta_poll_lock);
2414-
rcu_read_unlock();
24152394
}
24162395

24172396
void mt7996_mac_work(struct work_struct *work)

0 commit comments

Comments
 (0)