wifi: mt76: mt7915: move sta_poll from tx_free to mac_work
Subsystems (2)
PATCH 1/1 wifi: mt76: mt7915: move sta_poll from tx_free to mac_work
mt7915_mac_sta_poll() performs direct MMIO reads of WTBL entries for airtime accounting, GI reporting, and RSSI. It is called from mt7915_mac_tx_free_done(), which runs in NAPI context on every TX-Free-Done event. The high-frequency WTBL access races with firmware WTBL operations, causing kernel warnings and panics at mt7915_mac_wtbl_lmac_addr, followed by MCU message timeouts and firmware communication breakdown.
Move mt7915_mac_sta_poll() into mt7915_mac_work() at the periodic 5th tick, under the device mutex. This reduces the access frequency from thousands of times per second to once every ~5 seconds, serializes it with other driver operations, and eliminates the NAPI-context WTBL access that triggers the race.
Vendor driver analysis (mt_wifi.ko from MT7981 firmware) confirms the vendor's TX-free handler (red_tx_free_handle) performs no WTBL reads or station polling.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -2
@@ -864,8 +864,6 @@ mt7915_mac_tx_free_done(struct mt7915_dev *dev, {struct sk_buff *skb, *tmp; -mt7915_mac_sta_poll (dev); -if (wake)mt76_set_tx_blocked (&dev->mt76, false);
@@ -2012,6 +2010,7 @@ void mt7915_mac_work(struct work_struct *work)if (++mphy->mac_work_count ==5 ) { mphy->mac_work_count =0 ; +mt7915_mac_sta_poll (phy->dev);mt7915_mac_update_stats (phy);mt7915_mac_severe_check (phy);
Signature · 1 line
2.43.0
Quoted 8 lines · Joshua Klinesmith
mt7915_mac_sta_poll()performs direct MMIO reads of WTBL entries for airtime accounting, GI reporting, and RSSI. It is called frommt7915_mac_tx_free_done(), which runs in NAPI context on every TX-Free-Done event. The high-frequency WTBL access races with firmware WTBL operations, causing kernel warnings and panics atmt7915_mac_wtbl_lmac_addr, followed by MCU message timeouts and firmware communication breakdown.
Quoted 5 lines
Move
mt7915_mac_sta_poll()intomt7915_mac_work()at the periodic 5th tick, under the device mutex. This reduces the access frequency from thousands of times per second to once every ~5 seconds, serializes it with other driver operations, and eliminates the NAPI-context WTBL access that triggers the race.
I applied this patch on an AP mode MT7621 + MT7915 router for weeks and did not notice any strange regression. It can also save some CPU resources.
Quoted 36 lines
Vendor driver analysis (mt_wifi.ko from MT7981 firmware) confirms the vendor's TX-free handler (
red_tx_free_handle) performs no WTBL reads or station polling.Fixes e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets")Signed-off-by Joshua Klinesmith <[email protected]>--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1
-2@@ -864,8 +864,6 @@ mt7915_mac_tx_free_done(struct mt7915_dev *dev, {struct sk_buff *skb, *tmp; -mt7915_mac_sta_poll (dev); -if (wake)mt76_set_tx_blocked (&dev->mt76, false);@@ -2012,6 +2010,7 @@ void mt7915_mac_work(struct work_struct *work)if (++mphy->mac_work_count ==5 ) { mphy->mac_work_count =0 ; +mt7915_mac_sta_poll (phy->dev);mt7915_mac_update_stats (phy);mt7915_mac_severe_check (phy);Signature · 1 line
2.43.0
Regards,
Shiji Yang