From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Subject: [PATCH mt76-next 06/20] wifi: mt76: mt7996: list only published links on sta_rc_list
Date: Thu, 19 Nov 2026 13:43:38 +0100 [thread overview]
Message-ID: <20261119124352.1842164-6-nbd@nbd.name> (raw)
In-Reply-To: <20261119124352.1842164-1-nbd@nbd.name>
mt7996_mac_sta_remove_link() takes a link off dev->sta_rc_list while
msta->link[] still names it. An rc update that looked the link up can
thus list it again, and mt7996_mac_sta_rc_work() later uses the link
after kfree_rcu() freed it. Reachable via an HT SMPS action frame that
mac80211 receives while mt7996_mac_reset_sta_iter() runs.
Unpublish the link before it goes off the list, and only list a link
that msta->link[] still names, tested under sta_poll_lock, as
mt76_wcid_add_poll() does with dev->wcid[].
Fixes: ace5d3b6b49e ("wifi: mt76: mt7996: improve hardware restart reliability")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt7996/main.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 2c09351a56f3..3028c92c2efb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -1396,8 +1396,10 @@ void mt7996_mac_sta_remove_link(struct mt7996_dev *dev,
if (!msta_link)
return;
- if (flush)
+ if (flush) {
+ rcu_assign_pointer(msta->link[link_id], NULL);
rcu_assign_pointer(dev->mt76.wcid[msta_link->wcid.idx], NULL);
+ }
spin_lock_bh(&dev->mt76.sta_poll_lock);
if (!list_empty(&msta_link->wcid.poll_list))
@@ -1424,7 +1426,6 @@ void mt7996_mac_sta_remove_link(struct mt7996_dev *dev,
if (phy)
phy->mt76->num_sta--;
- rcu_assign_pointer(msta->link[link_id], NULL);
mt76_wcid_mask_clear(dev->mt76.wcid_mask, msta_link->wcid.idx);
if (msta_link != &msta->deflink)
kfree_rcu(msta_link, rcu_head);
@@ -2543,6 +2544,7 @@ static void mt7996_link_rate_ctrl_update(void *data,
{
struct mt7996_sta *msta = msta_link->sta;
struct mt7996_phy *phy = mt7996_vif_link_phy(&msta->vif->deflink);
+ u8 link_id = msta_link->wcid.link_id;
struct mt7996_dev *dev;
u32 *changed = data;
@@ -2553,7 +2555,8 @@ static void mt7996_link_rate_ctrl_update(void *data,
spin_lock_bh(&dev->mt76.sta_poll_lock);
msta_link->changed |= *changed;
- if (list_empty(&msta_link->rc_list))
+ if (list_empty(&msta_link->rc_list) &&
+ rcu_access_pointer(msta->link[link_id]) == msta_link)
list_add_tail(&msta_link->rc_list, &dev->sta_rc_list);
spin_unlock_bh(&dev->mt76.sta_poll_lock);
--
2.47.3
next prev parent reply other threads:[~2026-11-19 12:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 12:43 [PATCH mt76-next 01/20] wifi: mt76: mt7921: skip the ND offload update of a vif not in the driver Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 02/20] wifi: mt76: mt7925: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 03/20] wifi: mt76: take the remaining wcids off the phy tx_list at reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 04/20] wifi: mt76: take the remaining wcids off sta_poll_list " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 05/20] wifi: mt76: mt7915: take the remaining stations off sta_rc_list " Felix Fietkau
2026-11-19 12:43 ` Felix Fietkau [this message]
2026-11-19 12:43 ` [PATCH mt76-next 07/20] wifi: mt76: mt7996: take the remaining links " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 08/20] wifi: mt76: mt7915: take the TWT flows of a removed station off twt_list Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 09/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 10/20] wifi: mt76: mt7915: drop the TWT agreements at a full reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 11/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 12/20] wifi: mt76: mt7915: read twt_list under the mutex in twt_stats Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 13/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 14/20] wifi: mt76: mt7915: publish the global wcid again after a full reset Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 15/20] wifi: mt76: mt7996: " Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 16/20] wifi: mt76: mt7925: keep the antenna mask across a firmware reload Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 17/20] wifi: mt76: mt7925: remove mt7925_mcu_del_dev() Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 18/20] wifi: mt76: mt7921: keep the antenna mask across a firmware reload Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 19/20] wifi: mt76: mt792x: flush frames that still wait for the TX worker Felix Fietkau
2026-11-19 12:43 ` [PATCH mt76-next 20/20] wifi: mt76: mt7925: send the deauth of an MLD station on its AC queue Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119124352.1842164-6-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox