From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Felix Fietkau <nbd@nbd.name>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH mt76-next 15/19] wifi: mt76: guard the tx_list of every phy with one lock
Date: Wed, 18 Nov 2026 09:52:40 +0100 [thread overview]
Message-ID: <av1nWCZcshfm6Vg2@lore-qca> (raw)
In-Reply-To: <20261117180134.2940930-15-nbd@nbd.name>
[-- Attachment #1: Type: text/plain, Size: 5668 bytes --]
> mt76_tx() lists a wcid on the tx_list of the phy its caller passes,
> under the tx_lock of that phy, while mt76_wcid_cleanup() unlists it
> under the tx_lock of wcid->phy_idx. mt7996_tx() and
> mt76_offchannel_send_nullfunc() can list a wcid on the phy of another
> link, so no common lock guards its node, and the tx_list gets corrupted.
>
> Guard the tx_list of every phy with one lock per device.
>
> Fixes: ce35ecffc96e ("wifi: mt76: mt7996: fix MLD ID in MAC TXD and HIF TXP")
> Fixes: 381733b3a14a ("wifi: mt76: send nullfunc PS frames on offchannel transitions")
> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/mac80211.c | 7 +++----
> drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++-
> drivers/net/wireless/mediatek/mt76/tx.c | 13 +++++++------
> 3 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
> index 6b496dfda5cc..da1da160909a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mac80211.c
> +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
> @@ -431,7 +431,6 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)
> int i;
>
> INIT_LIST_HEAD(&phy->tx_list);
> - spin_lock_init(&phy->tx_lock);
> for (i = 0; i < ARRAY_SIZE(phy->rx_amsdu); i++)
> spin_lock_init(&phy->rx_amsdu[i].lock);
> INIT_DELAYED_WORK(&phy->roc_work, mt76_roc_complete_work);
> @@ -753,6 +752,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
> spin_lock_init(&dev->cc_lock);
> spin_lock_init(&dev->status_lock);
> spin_lock_init(&dev->wed_lock);
> + spin_lock_init(&dev->tx_lock);
> mutex_init(&dev->mutex);
> init_waitqueue_head(&dev->tx_wait);
>
> @@ -1837,7 +1837,6 @@ EXPORT_SYMBOL_GPL(mt76_wcid_init);
>
> void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
> {
> - struct mt76_phy *phy = mt76_dev_phy(dev, wcid->phy_idx);
> struct ieee80211_hw *hw;
> struct sk_buff_head list;
> struct sk_buff *skb;
> @@ -1859,7 +1858,7 @@ void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
> list_del_init(&wcid->poll_list);
> spin_unlock_bh(&dev->sta_poll_lock);
>
> - spin_lock_bh(&phy->tx_lock);
> + spin_lock_bh(&dev->tx_lock);
>
> if (!list_empty(&wcid->tx_list))
> list_del_init(&wcid->tx_list);
> @@ -1872,7 +1871,7 @@ void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
> skb_queue_splice_tail_init(&wcid->tx_offchannel, &list);
> spin_unlock(&wcid->tx_offchannel.lock);
>
> - spin_unlock_bh(&phy->tx_lock);
> + spin_unlock_bh(&dev->tx_lock);
>
> while ((skb = __skb_dequeue(&list)) != NULL) {
> hw = mt76_tx_status_get_hw(dev, skb);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 7a2a6afc3c21..77bfecb7d49b 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -872,7 +872,6 @@ struct mt76_phy {
> unsigned int num_sta;
> u8 band_idx;
>
> - spinlock_t tx_lock;
> struct list_head tx_list;
> struct mt76_queue *q_tx[__MT_TXQ_MAX];
>
> @@ -988,6 +987,8 @@ struct mt76_dev {
>
> struct mt76_worker tx_worker;
> struct napi_struct tx_napi;
> + /* protects the tx_list of every phy */
> + spinlock_t tx_lock;
>
> spinlock_t token_lock;
> struct idr token;
> diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
> index 0085b7a29fce..9eafc86ec288 100644
> --- a/drivers/net/wireless/mediatek/mt76/tx.c
> +++ b/drivers/net/wireless/mediatek/mt76/tx.c
> @@ -392,10 +392,10 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,
> __skb_queue_tail(head, skb);
> spin_unlock_bh(&head->lock);
>
> - spin_lock_bh(&phy->tx_lock);
> + spin_lock_bh(&phy->dev->tx_lock);
> if (list_empty(&wcid->tx_list))
> list_add_tail(&wcid->tx_list, &phy->tx_list);
> - spin_unlock_bh(&phy->tx_lock);
> + spin_unlock_bh(&phy->dev->tx_lock);
>
> mt76_worker_schedule(&phy->dev->tx_worker);
> }
> @@ -740,6 +740,7 @@ mt76_txq_schedule_pending_wcid(struct mt76_phy *phy, struct mt76_wcid *wcid,
>
> void mt76_txq_schedule_pending(struct mt76_phy *phy)
> {
> + struct mt76_dev *dev = phy->dev;
> LIST_HEAD(tx_list);
> int ret = 0;
>
> @@ -749,7 +750,7 @@ void mt76_txq_schedule_pending(struct mt76_phy *phy)
> local_bh_disable();
> rcu_read_lock();
>
> - spin_lock(&phy->tx_lock);
> + spin_lock(&dev->tx_lock);
> list_splice_init(&phy->tx_list, &tx_list);
> while (!list_empty(&tx_list)) {
> struct mt76_wcid *wcid;
> @@ -757,19 +758,19 @@ void mt76_txq_schedule_pending(struct mt76_phy *phy)
> wcid = list_first_entry(&tx_list, struct mt76_wcid, tx_list);
> list_del_init(&wcid->tx_list);
>
> - spin_unlock(&phy->tx_lock);
> + spin_unlock(&dev->tx_lock);
> if (ret >= 0)
> ret = mt76_txq_schedule_pending_wcid(phy, wcid, &wcid->tx_offchannel);
> if (ret >= 0 && !phy->offchannel)
> ret = mt76_txq_schedule_pending_wcid(phy, wcid, &wcid->tx_pending);
> - spin_lock(&phy->tx_lock);
> + spin_lock(&dev->tx_lock);
>
> if ((!skb_queue_empty(&wcid->tx_pending) ||
> !skb_queue_empty(&wcid->tx_offchannel)) &&
> list_empty(&wcid->tx_list))
> list_add_tail(&wcid->tx_list, &phy->tx_list);
> }
> - spin_unlock(&phy->tx_lock);
> + spin_unlock(&dev->tx_lock);
>
> rcu_read_unlock();
> local_bh_enable();
> --
> 2.47.3
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-11-18 8:52 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 18:01 [PATCH mt76-next 01/19] wifi: mt76: don't pin undrainable PS stations in the tx scheduler Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 02/19] wifi: mt76: mt7996: return a negative error for a firmware status Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 03/19] wifi: mt76: mt7996: use the default timeout for STA_REC and BSS_INFO Felix Fietkau
2026-11-18 8:22 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 04/19] wifi: mt76: mt7915: " Felix Fietkau
2026-11-18 8:23 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 05/19] wifi: mt76: delete only the RX NAPIs that were added Felix Fietkau
2026-11-18 8:32 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 06/19] wifi: mt76: mt7996: report radar on the channel context of its band Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 07/19] wifi: mt76: mt7996: stop WED before the DMA reset of a full reset Felix Fietkau
2026-11-18 8:38 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 08/19] wifi: mt76: skip the radiotap TLVs in mt76_skb_get_hdr() Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 09/19] wifi: mt76: find the first A-MSDU subframe behind the radiotap data Felix Fietkau
2026-11-18 8:43 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 10/19] wifi: mt76: mark all but the last subframe of an A-MSDU chain Felix Fietkau
2026-11-18 8:47 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 11/19] wifi: mt76: mt7996: set qos_ctl of a frame that hardware reordered Felix Fietkau
2026-11-18 8:50 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 12/19] wifi: mt76: check the PN of a BA session frame at its release Felix Fietkau
2026-11-18 8:55 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 13/19] wifi: mt76: check the RX PN of CCMP-256, GCMP and GCMP-256 keys Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 14/19] wifi: mt76: connac: return a negative error for a firmware status Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 15/19] wifi: mt76: guard the tx_list of every phy with one lock Felix Fietkau
2026-11-18 8:52 ` Lorenzo Bianconi [this message]
2026-11-17 18:01 ` [PATCH mt76-next 16/19] wifi: mt76: keep an unpublished wcid off the TX and poll lists Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 17/19] wifi: mt76: mt7925: do not take iflist_mtx under the mutex Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 18/19] wifi: mt76: mt7925: take each polled link under sta_poll_lock Felix Fietkau
2026-11-18 8:58 ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 19/19] wifi: mt76: mt7615: take each polled station " Felix Fietkau
2026-11-18 8:57 ` Lorenzo Bianconi
2026-11-18 8:20 ` [PATCH mt76-next 01/19] wifi: mt76: don't pin undrainable PS stations in the tx scheduler Lorenzo Bianconi
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=av1nWCZcshfm6Vg2@lore-qca \
--to=lorenzo@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.