* [PATCH] wifi: ath11k: read a station's TX rate under base_lock
@ 2026-11-14 14:34 Christopher Griffin via B4 Relay
2026-11-16 3:03 ` Baochen Qiang
2026-11-16 9:10 ` Rameshkumar Sundaram
0 siblings, 2 replies; 4+ messages in thread
From: Christopher Griffin via B4 Relay @ 2026-11-14 14:34 UTC (permalink / raw)
To: Jeff Johnson
Cc: Baochen Qiang, linux-wireless, ath11k, linux-kernel,
Jeff Johnson, Christopher Griffin
From: Christopher Griffin <christophergriffin05@gmail.com>
ath11k_update_per_peer_tx_stats() and ath11k_dp_tx_update_txcompl()
rewrite arsta->txrate under ab->base_lock: they clear it, then fill in
its fields one by one. ath11k_mac_op_sta_statistics() copies it into the
station info without that lock, so a station dump that runs while a TX
status updates the rate can copy the HE flag with an nss of 0, and
cfg80211 warns:
WARNING: CPU: 3 PID: 30429 at net/wireless/util.c:1581 ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211]
Call trace:
ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211] (P)
cfg80211_calculate_bitrate+0x1e0/0x4f4 [cfg80211]
nl80211_put_sta_rate+0x50/0x1230 [cfg80211]
nl80211_put_sta_rate+0xa30/0x1230 [cfg80211]
nl80211_dump_station+0x4b8/0x7e0 [cfg80211]
(the line is the nss check in the inlined
cfg80211_calculate_bitrate_he()). It was seen once in about a day on an
IPQ8074 AP whose stations are dumped periodically by a monitoring agent.
Copy the rate under base_lock and report from the copy, as ath12k reads
its peer rate info under its DP lock.
The change and this message were written with Claude, an AI coding
assistant.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.r4-00683-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-03982-QCAHKSWPL_SILICONZ-3
Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: Christopher Griffin <christophergriffin05@gmail.com>
---
Found on an Arista C-360 (IPQ8074 + QCN9074) running OpenWrt, from a
warning in its kernel log; the cause was found by reading the code.
ath12k already reads its peer rate info under its DP lock.
---
drivers/net/wireless/ath/ath11k/mac.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 1a237adaa37d1..d76eeb1ca0019 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -9425,6 +9425,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
{
struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
struct ath11k *ar = arsta->arvif->ar;
+ struct rate_info txrate;
s8 signal;
bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,
ar->ab->wmi_ab.svc_map);
@@ -9435,18 +9436,23 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
sinfo->tx_duration = arsta->tx_duration;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);
- if (arsta->txrate.legacy || arsta->txrate.nss) {
- if (arsta->txrate.legacy) {
- sinfo->txrate.legacy = arsta->txrate.legacy;
+ /* The TX status paths clear and refill txrate under base_lock */
+ spin_lock_bh(&ar->ab->base_lock);
+ txrate = arsta->txrate;
+ spin_unlock_bh(&ar->ab->base_lock);
+
+ if (txrate.legacy || txrate.nss) {
+ if (txrate.legacy) {
+ sinfo->txrate.legacy = txrate.legacy;
} else {
- sinfo->txrate.mcs = arsta->txrate.mcs;
- sinfo->txrate.nss = arsta->txrate.nss;
- sinfo->txrate.bw = arsta->txrate.bw;
- sinfo->txrate.he_gi = arsta->txrate.he_gi;
- sinfo->txrate.he_dcm = arsta->txrate.he_dcm;
- sinfo->txrate.he_ru_alloc = arsta->txrate.he_ru_alloc;
+ sinfo->txrate.mcs = txrate.mcs;
+ sinfo->txrate.nss = txrate.nss;
+ sinfo->txrate.bw = txrate.bw;
+ sinfo->txrate.he_gi = txrate.he_gi;
+ sinfo->txrate.he_dcm = txrate.he_dcm;
+ sinfo->txrate.he_ru_alloc = txrate.he_ru_alloc;
}
- sinfo->txrate.flags = arsta->txrate.flags;
+ sinfo->txrate.flags = txrate.flags;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
}
---
base-commit: ff4c7359e310744a7abe53cf66d921fa2969eb19
change-id: 20261111-ath11k-sta-txrate-lock-50b530be39c2
Best regards,
--
Christopher Griffin <christophergriffin05@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wifi: ath11k: read a station's TX rate under base_lock
2026-11-14 14:34 [PATCH] wifi: ath11k: read a station's TX rate under base_lock Christopher Griffin via B4 Relay
@ 2026-11-16 3:03 ` Baochen Qiang
2026-11-16 15:00 ` Jeff Johnson
2026-11-16 9:10 ` Rameshkumar Sundaram
1 sibling, 1 reply; 4+ messages in thread
From: Baochen Qiang @ 2026-11-16 3:03 UTC (permalink / raw)
To: christophergriffin05, Jeff Johnson
Cc: linux-wireless, ath11k, linux-kernel, Jeff Johnson
On 11/14/2026 10:34 PM, Christopher Griffin via B4 Relay wrote:
> From: Christopher Griffin <christophergriffin05@gmail.com>
>
> ath11k_update_per_peer_tx_stats() and ath11k_dp_tx_update_txcompl()
> rewrite arsta->txrate under ab->base_lock: they clear it, then fill in
> its fields one by one. ath11k_mac_op_sta_statistics() copies it into the
> station info without that lock, so a station dump that runs while a TX
> status updates the rate can copy the HE flag with an nss of 0, and
> cfg80211 warns:
>
> WARNING: CPU: 3 PID: 30429 at net/wireless/util.c:1581 ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211]
> Call trace:
> ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211] (P)
> cfg80211_calculate_bitrate+0x1e0/0x4f4 [cfg80211]
> nl80211_put_sta_rate+0x50/0x1230 [cfg80211]
> nl80211_put_sta_rate+0xa30/0x1230 [cfg80211]
> nl80211_dump_station+0x4b8/0x7e0 [cfg80211]
>
> (the line is the nss check in the inlined
> cfg80211_calculate_bitrate_he()). It was seen once in about a day on an
> IPQ8074 AP whose stations are dumped periodically by a monitoring agent.
>
> Copy the rate under base_lock and report from the copy, as ath12k reads
> its peer rate info under its DP lock.
>
> The change and this message were written with Claude, an AI coding
> assistant.
>
> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.r4-00683-QCAHKSWPL_SILICONZ-1
> Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-03982-QCAHKSWPL_SILICONZ-3
>
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Christopher Griffin <christophergriffin05@gmail.com>
> ---
> Found on an Arista C-360 (IPQ8074 + QCN9074) running OpenWrt, from a
> warning in its kernel log; the cause was found by reading the code.
> ath12k already reads its peer rate info under its DP lock.
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index 1a237adaa37d1..d76eeb1ca0019 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -9425,6 +9425,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
> {
> struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
> struct ath11k *ar = arsta->arvif->ar;
> + struct rate_info txrate;
> s8 signal;
> bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,
> ar->ab->wmi_ab.svc_map);
> @@ -9435,18 +9436,23 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
> sinfo->tx_duration = arsta->tx_duration;
arsta->rx_duration and arsta->tx_duration are u64 and are also only updated under
ab->base_lock, so on 32-bit they can tear the same way. Since the lock is taken here
anyway, moving those two reads into the same critical section would cost nothing, and is what
ath12k_mac_op_link_sta_statistics() does under dp_lock.
Not a blocker, fine to leave it for a separate patch.
> sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);
>
> - if (arsta->txrate.legacy || arsta->txrate.nss) {
> - if (arsta->txrate.legacy) {
> - sinfo->txrate.legacy = arsta->txrate.legacy;
> + /* The TX status paths clear and refill txrate under base_lock */
> + spin_lock_bh(&ar->ab->base_lock);
> + txrate = arsta->txrate;
> + spin_unlock_bh(&ar->ab->base_lock);
> +
> + if (txrate.legacy || txrate.nss) {
> + if (txrate.legacy) {
> + sinfo->txrate.legacy = txrate.legacy;
> } else {
> - sinfo->txrate.mcs = arsta->txrate.mcs;
> - sinfo->txrate.nss = arsta->txrate.nss;
> - sinfo->txrate.bw = arsta->txrate.bw;
> - sinfo->txrate.he_gi = arsta->txrate.he_gi;
> - sinfo->txrate.he_dcm = arsta->txrate.he_dcm;
> - sinfo->txrate.he_ru_alloc = arsta->txrate.he_ru_alloc;
> + sinfo->txrate.mcs = txrate.mcs;
> + sinfo->txrate.nss = txrate.nss;
> + sinfo->txrate.bw = txrate.bw;
> + sinfo->txrate.he_gi = txrate.he_gi;
> + sinfo->txrate.he_dcm = txrate.he_dcm;
> + sinfo->txrate.he_ru_alloc = txrate.he_ru_alloc;
> }
> - sinfo->txrate.flags = arsta->txrate.flags;
> + sinfo->txrate.flags = txrate.flags;
> sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
> }
>
>
> ---
> base-commit: ff4c7359e310744a7abe53cf66d921fa2969eb19
> change-id: 20261111-ath11k-sta-txrate-lock-50b530be39c2
>
> Best regards,
> --
> Christopher Griffin <christophergriffin05@gmail.com>
>
>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wifi: ath11k: read a station's TX rate under base_lock
2026-11-14 14:34 [PATCH] wifi: ath11k: read a station's TX rate under base_lock Christopher Griffin via B4 Relay
2026-11-16 3:03 ` Baochen Qiang
@ 2026-11-16 9:10 ` Rameshkumar Sundaram
1 sibling, 0 replies; 4+ messages in thread
From: Rameshkumar Sundaram @ 2026-11-16 9:10 UTC (permalink / raw)
To: christophergriffin05, Jeff Johnson
Cc: Baochen Qiang, linux-wireless, ath11k, linux-kernel, Jeff Johnson
On 11/14/2026 8:04 PM, Christopher Griffin via B4 Relay wrote:
> From: Christopher Griffin <christophergriffin05@gmail.com>
>
> ath11k_update_per_peer_tx_stats() and ath11k_dp_tx_update_txcompl()
> rewrite arsta->txrate under ab->base_lock: they clear it, then fill in
> its fields one by one. ath11k_mac_op_sta_statistics() copies it into the
> station info without that lock, so a station dump that runs while a TX
> status updates the rate can copy the HE flag with an nss of 0, and
> cfg80211 warns:
>
> WARNING: CPU: 3 PID: 30429 at net/wireless/util.c:1581 ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211]
> Call trace:
> ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211] (P)
> cfg80211_calculate_bitrate+0x1e0/0x4f4 [cfg80211]
> nl80211_put_sta_rate+0x50/0x1230 [cfg80211]
> nl80211_put_sta_rate+0xa30/0x1230 [cfg80211]
> nl80211_dump_station+0x4b8/0x7e0 [cfg80211]
>
> (the line is the nss check in the inlined
> cfg80211_calculate_bitrate_he()). It was seen once in about a day on an
> IPQ8074 AP whose stations are dumped periodically by a monitoring agent.
>
> Copy the rate under base_lock and report from the copy, as ath12k reads
> its peer rate info under its DP lock.
>
> The change and this message were written with Claude, an AI coding
> assistant.
>
> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.r4-00683-QCAHKSWPL_SILICONZ-1
> Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-03982-QCAHKSWPL_SILICONZ-3
>
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Christopher Griffin <christophergriffin05@gmail.com>
> ---
> Found on an Arista C-360 (IPQ8074 + QCN9074) running OpenWrt, from a
> warning in its kernel log; the cause was found by reading the code.
> ath12k already reads its peer rate info under its DP lock.
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index 1a237adaa37d1..d76eeb1ca0019 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -9425,6 +9425,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
> {
> struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
> struct ath11k *ar = arsta->arvif->ar;
> + struct rate_info txrate;
> s8 signal;
> bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,
> ar->ab->wmi_ab.svc_map);
> @@ -9435,18 +9436,23 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
> sinfo->tx_duration = arsta->tx_duration;
> sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION);
>
> - if (arsta->txrate.legacy || arsta->txrate.nss) {
> - if (arsta->txrate.legacy) {
> - sinfo->txrate.legacy = arsta->txrate.legacy;
> + /* The TX status paths clear and refill txrate under base_lock */
> + spin_lock_bh(&ar->ab->base_lock);
> + txrate = arsta->txrate;
> + spin_unlock_bh(&ar->ab->base_lock);
> +
> + if (txrate.legacy || txrate.nss) {
> + if (txrate.legacy) {
> + sinfo->txrate.legacy = txrate.legacy;
> } else {
> - sinfo->txrate.mcs = arsta->txrate.mcs;
> - sinfo->txrate.nss = arsta->txrate.nss;
> - sinfo->txrate.bw = arsta->txrate.bw;
> - sinfo->txrate.he_gi = arsta->txrate.he_gi;
> - sinfo->txrate.he_dcm = arsta->txrate.he_dcm;
> - sinfo->txrate.he_ru_alloc = arsta->txrate.he_ru_alloc;
> + sinfo->txrate.mcs = txrate.mcs;
> + sinfo->txrate.nss = txrate.nss;
> + sinfo->txrate.bw = txrate.bw;
> + sinfo->txrate.he_gi = txrate.he_gi;
> + sinfo->txrate.he_dcm = txrate.he_dcm;
> + sinfo->txrate.he_ru_alloc = txrate.he_ru_alloc;
> }
> - sinfo->txrate.flags = arsta->txrate.flags;
> + sinfo->txrate.flags = txrate.flags;
> sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
> }
>
>
> ---
> base-commit: ff4c7359e310744a7abe53cf66d921fa2969eb19
> change-id: 20261111-ath11k-sta-txrate-lock-50b530be39c2
>
Reviewed-by: Rameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wifi: ath11k: read a station's TX rate under base_lock
2026-11-16 3:03 ` Baochen Qiang
@ 2026-11-16 15:00 ` Jeff Johnson
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Johnson @ 2026-11-16 15:00 UTC (permalink / raw)
To: Baochen Qiang, christophergriffin05, Jeff Johnson
Cc: linux-wireless, ath11k, linux-kernel
On 11/15/2026 7:03 PM, Baochen Qiang wrote:
>
>
> On 11/14/2026 10:34 PM, Christopher Griffin via B4 Relay wrote:
>> From: Christopher Griffin <christophergriffin05@gmail.com>
>>
>> ath11k_update_per_peer_tx_stats() and ath11k_dp_tx_update_txcompl()
>> rewrite arsta->txrate under ab->base_lock: they clear it, then fill in
>> its fields one by one. ath11k_mac_op_sta_statistics() copies it into the
>> station info without that lock, so a station dump that runs while a TX
>> status updates the rate can copy the HE flag with an nss of 0, and
>> cfg80211 warns:
>>
>> WARNING: CPU: 3 PID: 30429 at net/wireless/util.c:1581 ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211]
>> Call trace:
>> ieee80211_get_vht_max_nss+0x474/0x868 [cfg80211] (P)
>> cfg80211_calculate_bitrate+0x1e0/0x4f4 [cfg80211]
>> nl80211_put_sta_rate+0x50/0x1230 [cfg80211]
>> nl80211_put_sta_rate+0xa30/0x1230 [cfg80211]
>> nl80211_dump_station+0x4b8/0x7e0 [cfg80211]
>>
>> (the line is the nss check in the inlined
>> cfg80211_calculate_bitrate_he()). It was seen once in about a day on an
>> IPQ8074 AP whose stations are dumped periodically by a monitoring agent.
>>
>> Copy the rate under base_lock and report from the copy, as ath12k reads
>> its peer rate info under its DP lock.
>>
>> The change and this message were written with Claude, an AI coding
>> assistant.
>>
>> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
>> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.r4-00683-QCAHKSWPL_SILICONZ-1
>> Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-03982-QCAHKSWPL_SILICONZ-3
>>
>> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
>> Signed-off-by: Christopher Griffin <christophergriffin05@gmail.com>
>> ---
>> Found on an Arista C-360 (IPQ8074 + QCN9074) running OpenWrt, from a
>> warning in its kernel log; the cause was found by reading the code.
>> ath12k already reads its peer rate info under its DP lock.
>> ---
>> drivers/net/wireless/ath/ath11k/mac.c | 26 ++++++++++++++++----------
>> 1 file changed, 16 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
>> index 1a237adaa37d1..d76eeb1ca0019 100644
>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>> @@ -9425,6 +9425,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
>> {
>> struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
>> struct ath11k *ar = arsta->arvif->ar;
>> + struct rate_info txrate;
>> s8 signal;
>> bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT,
>> ar->ab->wmi_ab.svc_map);
>> @@ -9435,18 +9436,23 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
>> sinfo->tx_duration = arsta->tx_duration;
>
> arsta->rx_duration and arsta->tx_duration are u64 and are also only updated under
> ab->base_lock, so on 32-bit they can tear the same way. Since the lock is taken here
> anyway, moving those two reads into the same critical section would cost nothing, and is what
> ath12k_mac_op_link_sta_statistics() does under dp_lock.
>
> Not a blocker, fine to leave it for a separate patch.
I'll incorporate this suggestion into the patch in my pending branch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-16 15:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-14 14:34 [PATCH] wifi: ath11k: read a station's TX rate under base_lock Christopher Griffin via B4 Relay
2026-11-16 3:03 ` Baochen Qiang
2026-11-16 15:00 ` Jeff Johnson
2026-11-16 9:10 ` Rameshkumar Sundaram
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®