wifi: ath10k: support flush_sta method
RFC PATCH 1/1 wifi: ath10k: support flush_sta method
When a STA is marked as no longer authorized, if the driver doesn't implement flush_sta(), mac80211 calls ieee80211_flush_queues() to flush hardware queues to avoid sending unencrypted frames.
This has became a problem for ath10k because ieee80211_flush_queues() will stop all traffic and call ath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.
Fix this by implementing flush_sta method using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.
ops->flush_sta will be set to NULL if htt.disable_tx_comp is set to true.
Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
--- drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +18 -0
@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mutex_unlock (&ar->conf_mutex); } +static void ath10k_mac_op_flush_sta (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +struct ieee80211_sta *sta) +{ +struct ath10k_vif *arvif = (void *)vif->drv_priv; +struct ath10k *ar = hw->priv; +u32 bitmap =0xFFFFFFFF ; +int ret =0 ; + + ret =ath10k_wmi_peer_flush (ar, arvif->vdev_id, sta->addr, bitmap); +if (ret) +ath10k_warn (ar,"failed to flush sta (sta %pM)\n" , + sta->addr); +} +/* TODO: Implement this function properly * For now it is needed to reply to Probe Requests in IBSS mode. * Probably we need this information from FW.
@@ -9487,6 +9501,7 @@ static const struct ieee80211_ops ath10k_ops = { .set_rts_threshold = ath10k_set_rts_threshold, .set_frag_threshold = ath10k_mac_op_set_frag_threshold, .flush = ath10k_flush, + .flush_sta = ath10k_mac_op_flush_sta, .tx_last_beacon = ath10k_tx_last_beacon, .set_antenna = ath10k_set_antenna, .get_antenna = ath10k_get_antenna,
@@ -10294,6 +10309,9 @@ int ath10k_mac_register(struct ath10k *ar)if (!ar->hw_params.hw_ops->set_coverage_class) ar->ops->set_coverage_class =NULL ; +if (ar->htt.disable_tx_comp) + ar->ops->flush_sta =NULL ; + ret =ath_regd_init (&ar->ath_common.regulatory, ar->hw->wiphy, ath10k_reg_notifier);if (ret) {
Signature · 1 line
2.50.1
Quoted 13 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.
Quoted 7 lines
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>---
There is already a patch from Remi pending for this, see:
https://msgid.link/[email protected]
Please see if that series addresses your needs.
First Kalle, and then I, held this back due to lack of internal validation across supported platforms, but it is actually still on my TODO list:
https://patchwork.kernel.org/project/linux-wireless/list/?series=911851
Let me make one more validation request internally since I know there is at least one ath10k-based project with active development.
/jeff
Quoted 28 lines · Jeff Johnson
Quoted 13 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.Quoted 7 lines
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>---
There is already a patch from Remi pending for this, see:
https://msgid.link/[email protected]Please see if that series addresses your needs.
Quoted 8 lines
First Kalle, and then I, held this back due to lack of internal validation across supported platforms, but it is actually still on my TODO list:
https://patchwork.kernel.org/project/linux-wireless/list/?series=911851Let me make one more validation request internally since I know there is at least one ath10k-based project with active development.
/jeff
Hi Jeff,
I am aware of the series and glad to know it's still on the list. I did test with it but the warning can still be triggered easily with the instructions in Remi's series.
And according to other people's reports it can still block sometimes. [0]
drv_flush_sta() is called before clearing the keys and Remi's approach still waits for the frames to be sent which imo isn't enough in this situation.
[0]: https://github.com/openwrt/openwrt/pull/19427#issuecomment-3102794793
Best regards,
Zhi-Jun You
Quoted 37 lines · Zhi-Jun You
Quoted 35 lines · Jeff Johnson
Quoted 13 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.Quoted 7 lines
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>---
There is already a patch from Remi pending for this, see:
https://msgid.link/[email protected]Please see if that series addresses your needs.
First Kalle, and then I, held this back due to lack of internal validation across supported platforms, but it is actually still on my TODO list:
https://patchwork.kernel.org/project/linux-wireless/list/?series=911851Let me make one more validation request internally since I know there is at least one ath10k-based project with active development.
Quoted 8 lines
Quoted 1 line
/jeff
Hi Jeff,
I am aware of the series and glad to know it's still on the list. I did test with it but the warning can still be triggered easily with the instructions in Remi's series.
And according to other people's reports it can still block sometimes. [0]
Well that's to be expected with this implementation and the use case described by remi. You have a station that is out of range or powered down without telling the ap, and you wait for the firmware to tell you that it did managed to transmit to the sta or that it has given up transmitting. So clearly you will have the warning.
The goal was to not block trafic pending for other STA when that happens.
What I recall, and sorry if this is vague it was quite a few years ago, is that when issuing the WMI command to the firmware to drop all frames for the STA it just did not, and it was still trying to transmit them (checked with ota capture at that time). But I do not recall if the firmware tried to send frames encrypted or not (as we would remove the key right after the wmi command and before the firmware had given up on transmitting the frames) which was one of the reason .flush_sta() was added in the first place I believe.
Quoted 9 lines
drv_flush_sta()is called before clearing the keys and Remi's approach still waits for the frames to be sent which imo isn't enough in this situation.[0]: https://github.com/openwrt/openwrt/pull/19427#issuecomment-3102794793
Best regards,
Zhi-Jun You
Quoted 33 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>--- drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/net/wireless/ath/ath10k/mac.c +2
-0@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mutex_unlock (&ar->conf_mutex); } +static void ath10k_mac_op_flush_sta (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +struct ieee80211_sta *sta)
drivers/net/wireless/ath/ath10k/mac.c static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, · line 8149
Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +10
-0+{ +struct ath10k_vif *arvif = (void *)vif->drv_priv; +struct ath10k *ar = hw->priv; +u32 bitmap =0xFFFFFFFF ; +int ret =0 ; + + ret =ath10k_wmi_peer_flush (ar, arvif->vdev_id, sta->addr, bitmap); +if (ret) +ath10k_warn (ar,"failed to flush sta (sta %pM)\n" , + sta->addr);
Hello,
Just to be sure, you have seen real improvements from this ? Because I remember trying this exact WMI command two years ago and I couldn't be sure it was actually doing something. That's one of the reasons why we ended up doing the per peer frame accounting as posted by remi here
https://lore.kernel.org/linux-wireless/17d26d6a3e80ff03939ee7935fdc07f979b61a4f.1732293922.git.repk@triplefau.lt/
Thanks
Hi Nicolas,
AFAIK there's no easy way to tell if it works. According to another commit [0] after sending the command it still needs to go through tx completion->ath10k_txrx_tx_unref.
Best you can do is the debug message.(ATH10K_DBG_WMI, ATH10K_DBG_HTT)
[0]: https://lore.kernel.org/linux-wireless/[email protected]/
Best regards,
Zhi-Jun You
Quoted 55 lines · Nicolas Escande
Quoted 33 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>--- drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/net/wireless/ath/ath10k/mac.c +2
-0@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mutex_unlock (&ar->conf_mutex); } +static void ath10k_mac_op_flush_sta (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +struct ieee80211_sta *sta)drivers/net/wireless/ath/ath10k/mac.c static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, · line 8149
Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +10
-0+{ +struct ath10k_vif *arvif = (void *)vif->drv_priv; +struct ath10k *ar = hw->priv; +u32 bitmap =0xFFFFFFFF ; +int ret =0 ; + + ret =ath10k_wmi_peer_flush (ar, arvif->vdev_id, sta->addr, bitmap); +if (ret) +ath10k_warn (ar,"failed to flush sta (sta %pM)\n" , + sta->addr);Hello,
Just to be sure, you have seen real improvements from this ? Because I remember trying this exact WMI command two years ago and I couldn't be sure it was actually doing something. That's one of the reasons why we ended up doing the per peer frame accounting as posted by remi here
https://lore.kernel.org/linux-wireless/17d26d6a3e80ff03939ee7935fdc07f979b61a4f.1732293922.git.repk@triplefau.lt/Thanks
Hi everyone,
we tested this patch at Freifunk Aachen using Gluon/OpenWrt.
We had the issue that the Extreme Networks WS-AP3825i did have a high load in a busy environment, making the node unresponsive. This issue is resolved with this patch, improving the wifi stability noticeably, similar to
https://patchwork.kernel.org/project/linux-wireless/list/?series=911851
Restarting Wifi (using wifi) still logs
kern.warn kernel: [98526.968626] ath10k_warn: 617 callbacks suppressed kern.warn kernel: [98526.968651] ath10k_pci a000:03:00.0: could not get mac80211 beacon
kern.warn kernel: [98527.071045] ath10k_pci a000:03:00.0: could not get mac80211 beacon
kern.warn kernel: [98532.104123] ath10k_pci a000:03:00.0: failed to flush transmit queue (skip 0 ar-state 1): 0
Just like it was with the other patch.
We did also not see any "failed to flush sta" message in dmesg.
Thanks,
Florian Maurer
Quoted 66 lines · Zhi-Jun You
When a STA is marked as no longer authorized, if the driver doesn't implement
flush_sta(), mac80211 callsieee80211_flush_queues()to flush hardware queues to avoid sending unencrypted frames.This has became a problem for ath10k because
ieee80211_flush_queues()will stop all traffic and callath10k_flush, which waits until the whole HW queue is empty. In a busy environment this will trigger a timeout warning and stalls other STAs.Fix this by implementing
flush_stamethod using WMI command to flush frames of a specific STA.
Flushed frames will be marked as discard in tx complete indication.
ops->flush_stawill be set to NULL if htt.disable_tx_comp is set to true.Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
Signed-off-by Zhi-Jun You <[email protected]>--- drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/net/wireless/ath/ath10k/mac.c +18
-0@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,mutex_unlock (&ar->conf_mutex); } +static void ath10k_mac_op_flush_sta (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +struct ieee80211_sta *sta) +{ +struct ath10k_vif *arvif = (void *)vif->drv_priv; +struct ath10k *ar = hw->priv; +u32 bitmap =0xFFFFFFFF ; +int ret =0 ; + + ret =ath10k_wmi_peer_flush (ar, arvif->vdev_id, sta->addr, bitmap); +if (ret) +ath10k_warn (ar,"failed to flush sta (sta %pM)\n" , + sta->addr); +} +/* TODO: Implement this function properly * For now it is needed to reply to Probe Requests in IBSS mode. * Probably we need this information from FW. @@ -9487,6 +9501,7 @@ static const struct ieee80211_ops ath10k_ops = { .set_rts_threshold = ath10k_set_rts_threshold, .set_frag_threshold = ath10k_mac_op_set_frag_threshold, .flush = ath10k_flush, + .flush_sta = ath10k_mac_op_flush_sta, .tx_last_beacon = ath10k_tx_last_beacon, .set_antenna = ath10k_set_antenna, .get_antenna = ath10k_get_antenna,@@ -10294,6 +10309,9 @@ int ath10k_mac_register(struct ath10k *ar)if (!ar->hw_params.hw_ops->set_coverage_class) ar->ops->set_coverage_class =NULL ; +if (ar->htt.disable_tx_comp) + ar->ops->flush_sta =NULL ; + ret =ath_regd_init (&ar->ath_common.regulatory, ar->hw->wiphy, ath10k_reg_notifier);if (ret) {