> 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 Reviewed-by: Lorenzo Bianconi > --- > 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 > >