mac80211: Turn AQL into an NL80211_EXT_FEATURE
PATCH v2 1/1 mac80211: Turn AQL into an NL80211_EXT_FEATURE
Instead of just having an airtime flag in debugfs, turn AQL into a proper NL80211_EXT_FEATURE, so drivers can turn it on when they are ready, and so we also expose the presence of the feature to userspace.
This also has the effect of flipping the default, so drivers have to opt in to using AQL instead of getting it by default with TXQs. To keep functionality the same as pre-patch, we set this feature for ath10k (which is where it is needed the most).
While we're at it, split out the debugfs interface so AQL gets its own per-station debugfs file instead of using the 'airtime' file.
---
v2:
- Squash into a single patch
- Add kernel doc for NL80211_EXT_FEATURE_AQL
drivers/net/wireless/ath/ath10k/mac.c | 1 + include/uapi/linux/nl80211.h | 5 ++ net/mac80211/debugfs_sta.c | 76 ++++++++++++++++++++------- net/mac80211/main.c | 4 +- net/mac80211/sta_info.c | 3 ++ net/mac80211/sta_info.h | 1 - net/mac80211/tx.c | 4 +- 7 files changed, 70 insertions(+), 24 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +1 -0
@@ -8958,6 +8958,7 @@ int ath10k_mac_register(struct ath10k *ar)wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_VHT_IBSS );wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_SET_SCAN_DWELL ); +wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_AQL );if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map) ||test_bit (WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS , ar->wmi.svc_map))
include/uapi/linux/nl80211.h +5 -0
@@ -5517,6 +5517,10 @@ enum nl80211_feature_flags {* with VLAN tagged frames and separate VLAN-specific netdevs added using * vconfig similarly to the Ethernet case. * +* @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL) +* feature, which prevents bufferbloat by using the expected transmission +* time to limit the amount of data buffered in the hardware. +* * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index. */
@@ -5563,6 +5567,7 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_STA_TX_PWR ,NL80211_EXT_FEATURE_SAE_OFFLOAD ,NL80211_EXT_FEATURE_VLAN_OFFLOAD , +NL80211_EXT_FEATURE_AQL ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/mac80211/debugfs_sta.c +58 -18
125 lines not on this page · raw message
net/mac80211/main.c +1 -3
@@ -672,9 +672,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H ; } - local->airtime_flags =AIRTIME_USE_TX | -AIRTIME_USE_RX | -AIRTIME_USE_AQL ; + local->airtime_flags =AIRTIME_USE_TX |AIRTIME_USE_RX ; local->aql_threshold =IEEE80211_AQL_THRESHOLD ;atomic_set (&local->aql_total_pending_airtime,0 );
net/mac80211/sta_info.c +3 -0
@@ -1916,6 +1916,9 @@ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, {int tx_pending; +if (!wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AQL )) +return ; +if (!tx_completed) {if (sta) atomic_add(tx_airtime,
net/mac80211/sta_info.h +0 -1
@@ -127,7 +127,6 @@ enum ieee80211_agg_stop_reason {/* Debugfs flags to enable/disable use of RX/TX airtime in scheduler */ #define AIRTIME_USE_TX BIT(0)#define AIRTIME_USE_RX BIT(1) -#define AIRTIME_USE_AQL BIT(2)struct airtime_info {u64 rx_airtime;
net/mac80211/tx.c +2 -2
@@ -3668,7 +3668,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,IEEE80211_SKB_CB (skb)->control.vif = vif; -if (local->airtime_flags &AIRTIME_USE_AQL ) { +if (wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AQL )) {u32 airtime; airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta,
@@ -3790,7 +3790,7 @@ bool ieee80211_txq_airtime_check(struct ieee80211_hw *hw,struct sta_info *sta;struct ieee80211_local *local =hw_to_local (hw); -if (!(local->airtime_flags &AIRTIME_USE_AQL )) +if (!wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AQL ))return true;if (!txq->sta)
Signature · 1 line
2.24.0
Quoted 12 lines · Toke Høiland-Jørgensen
Instead of just having an airtime flag in debugfs, turn AQL into a proper
NL80211_EXT_FEATURE, so drivers can turn it on when they are ready, and so we also expose the presence of the feature to userspace.This also has the effect of flipping the default, so drivers have to opt in to using AQL instead of getting it by default with TXQs. To keep functionality the same as pre-patch, we set this feature for ath10k (which is where it is needed the most).
While we're at it, split out the debugfs interface so AQL gets its own per-station debugfs file instead of using the 'airtime' file.
Quoted 7 lines
Signed-off-by Toke Høiland-Jørgensen <[email protected]>---
v2:
- Squash into a single patch
- Add kernel doc forNL80211_EXT_FEATURE_AQLdrivers/net/wireless/ath/ath10k/mac.c | 1 +
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches