
* mac80211: merge the virtual time based airtime scheduler Improves airtime fairness, especially for devices with larger firmware buffers Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: merge a 4-addr client mode fix Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: backport SAR power limit support Needed for an upcoming mt76 update Signed-off-by: Felix Fietkau <nbd@nbd.name> * mt76: update to the latest version 624c681ef0c6 mt76: mt7921: enable VHT BFee capability a27dfcb63ccf mt76: connac: fix UC entry is being overwritten 6b691e62470e mt76: connac: add mt76_connac_power_save_sched in mt76_connac_pm_unref b14365bea586 mt76: mt7921: wake the device before dumping power table 82af16bddfc0 mt76: mt7921: make mt7921_set_channel static b24598b1c1a9 mt76: connac: add mt76_connac_mcu_get_nic_capability utility routine 5954e3381ff9 mt76: testmode: move chip-specific stats dump before common stats fd5b612f9aa4 mt76: mt7915: fix rx fcs error count in testmode d9d26a294f7b mt76: connac: fix the maximum interval schedule scan can support ed39c882f388 mt76: reduce rx buffer size to 2048 60f3d3adbba6 mt76: move mt76_get_next_pkt_id in mt76.h 67ed4d902c84 mt76: connac: check band caps in mt76_connac_mcu_set_rate_txpower 23c6ec49c000 mt76: make mt76_update_survey() per phy 5ca602fb9455 mt76: mt7915: introduce mt7915_mcu_set_txbf() c13df42282e9 mt76: mt7915: improve MU stability dee7dcddcaa0 mt76: use SPDX header file comment style 6fbd47153b3d mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode 1b97dd1762ca mt76: mt7921: fix sta_state incorrect implementation 1b89053b5a6f mt76: mt7921: improve code readability for mt7921_update_txs 126649816785 mt76: mt7921: limit txpower according to userlevel power a5163ac09be2 mt76: mt7921: introduce dedicated control for deep_sleep e47c04db4d7e mt76: mt7921: fix kernel warning when reset on vif is not sta 063d3611662c mt76: mt7921: fix the coredump is being truncated 12bf28feba7c mt76: fix iv and CCMP header insertion 949327e76ee4 mt76: disable TWT capabilities for the moment 3530254c1bc9 mt76: mt7921: enable HE BFee capability 599e35f5d9b8 mt76: sdio: do not run mt76_txq_schedule directly 3b6d30c28946 mt76: mt7663s: rely on pm reference counting 529d55a79088 mt76: mt7663s: rely on mt76_connac_pm_ref/mt76_connac_pm_unref in tx path ef44ff116ee2 mt76: mt7663s: enable runtime-pm 3a71e71a555e mt76: mt7615: set macwork timeout according to runtime-pm 925d96e443a4 mt76: mt7921: allow chip reset during device restart 63b114d84361 mt76: mt76x0e: fix device hang during suspend/resume 7f5ea5e2fd10 mt7915: check return code of sysfs_create_link ca64a36908b7 mt76: fix mt76_rates for the multiple devices f517116bf14c mt76: add mt76_default_basic_rate more devices can rely on 6c70b0100513 mt76: mt7921: fix mgmt frame using unexpected bitrate c00a9a6b52af mt76: mt7915: fix mgmt frame using unexpected bitrate 0e4089949565 mt76: mt7921: fix endianness in mt7921_mcu_tx_done_event 55f314120ef2 mt76: mt7921: avoid unnecessary spin_lock/spin_unlock in mt7921_mcu_tx_done_event 541cd3276488 mt76: mt7915: fix endianness warning in mt7915_mac_add_txs_skb 817761e87c4f mt76: mt7921: fix endianness warning in mt7921_update_txs b8eca74bbd7b mt76: mt7615: fix endianness warning in mt7615_mac_write_txwi 5e5e07f0def3 mt76: mt7915: fix potential overflow of eeprom page index abda4cded420 mt76: mt7915: fix info leak in mt7915_mcu_set_pre_cal() 535899f81a46 mt76: mt7915: fix calling mt76_wcid_alloc with incorrect parameter adfa1b9a3ca0 mt76: connac: fix mt76_connac_gtk_rekey_tlv usage 2a65b105ea4a mt76: mt7921: enable aspm by default c57158c82804 mt76: fix build error implicit enumeration conversion 41f607cab83c mt76: mt7921: fix survey-dump reporting 25b4f885a937 mt76: mt76x02: fix endianness warnings in mt76x02_mac.c e63fadb87fe1 mt76: mt7915: report HE MU radiotap 135ef3e9827a mt76: mt7915: adapt new firmware to update BA winsize for Rx session 7118eacb7ce4 mt76: mt7921: add .set_sar_specs support f1f6569da408 mt76: mt7915: fix an off-by-one bound check f7da39467965 mt76 mt7915: take RCU read lock when calling ieee80211_bss_get_elem() 87af8e5c72b1 mt76: mt7915: cleanup -Wunused-but-set-variable 8e2d383fbd92 mt76: mt7915: report tx rate directly from tx status ddce30977591 mt76: mt7915: remove mt7915_sta_stats 4ccd42029519 mt76: mt7921: introduce testmode support Signed-off-by: Felix Fietkau <nbd@nbd.name> Co-authored-by: Felix Fietkau <nbd@nbd.name>
112 lines
2.9 KiB
Diff
112 lines
2.9 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 9 Jan 2021 18:57:51 +0100
|
|
Subject: [PATCH] mac80211: introduce aql_enable node in debugfs
|
|
|
|
Introduce aql_enable node in debugfs in order to enable/disable aql.
|
|
This is useful for debugging purpose.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/e7a934d5d84e4796c4f97ea5de4e66c824296b07.1610214851.git.lorenzo@kernel.org
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
|
|
--- a/net/mac80211/debugfs.c
|
|
+++ b/net/mac80211/debugfs.c
|
|
@@ -281,6 +281,56 @@ static const struct file_operations aql_
|
|
.llseek = default_llseek,
|
|
};
|
|
|
|
+static ssize_t aql_enable_read(struct file *file, char __user *user_buf,
|
|
+ size_t count, loff_t *ppos)
|
|
+{
|
|
+ char buf[3];
|
|
+ int len;
|
|
+
|
|
+ len = scnprintf(buf, sizeof(buf), "%d\n",
|
|
+ !static_key_false(&aql_disable.key));
|
|
+
|
|
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
+}
|
|
+
|
|
+static ssize_t aql_enable_write(struct file *file, const char __user *user_buf,
|
|
+ size_t count, loff_t *ppos)
|
|
+{
|
|
+ bool aql_disabled = static_key_false(&aql_disable.key);
|
|
+ char buf[3];
|
|
+ size_t len;
|
|
+
|
|
+ if (count > sizeof(buf))
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (copy_from_user(buf, user_buf, count))
|
|
+ return -EFAULT;
|
|
+
|
|
+ buf[sizeof(buf) - 1] = '\0';
|
|
+ len = strlen(buf);
|
|
+ if (len > 0 && buf[len - 1] == '\n')
|
|
+ buf[len - 1] = 0;
|
|
+
|
|
+ if (buf[0] == '0' && buf[1] == '\0') {
|
|
+ if (!aql_disabled)
|
|
+ static_branch_inc(&aql_disable);
|
|
+ } else if (buf[0] == '1' && buf[1] == '\0') {
|
|
+ if (aql_disabled)
|
|
+ static_branch_dec(&aql_disable);
|
|
+ } else {
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return count;
|
|
+}
|
|
+
|
|
+static const struct file_operations aql_enable_ops = {
|
|
+ .write = aql_enable_write,
|
|
+ .read = aql_enable_read,
|
|
+ .open = simple_open,
|
|
+ .llseek = default_llseek,
|
|
+};
|
|
+
|
|
static ssize_t force_tx_status_read(struct file *file,
|
|
char __user *user_buf,
|
|
size_t count,
|
|
@@ -569,6 +619,7 @@ void debugfs_hw_add(struct ieee80211_loc
|
|
DEBUGFS_ADD(power);
|
|
DEBUGFS_ADD(hw_conf);
|
|
DEBUGFS_ADD_MODE(force_tx_status, 0600);
|
|
+ DEBUGFS_ADD_MODE(aql_enable, 0600);
|
|
|
|
if (local->ops->wake_tx_queue)
|
|
DEBUGFS_ADD_MODE(aqm, 0600);
|
|
--- a/net/mac80211/ieee80211_i.h
|
|
+++ b/net/mac80211/ieee80211_i.h
|
|
@@ -1140,6 +1140,8 @@ enum mac80211_scan_state {
|
|
SCAN_ABORT,
|
|
};
|
|
|
|
+DECLARE_STATIC_KEY_FALSE(aql_disable);
|
|
+
|
|
struct ieee80211_local {
|
|
/* embed the driver visible part.
|
|
* don't cast (use the static inlines below), but we keep
|
|
--- a/net/mac80211/tx.c
|
|
+++ b/net/mac80211/tx.c
|
|
@@ -3887,6 +3887,8 @@ void __ieee80211_schedule_txq(struct iee
|
|
}
|
|
EXPORT_SYMBOL(__ieee80211_schedule_txq);
|
|
|
|
+DEFINE_STATIC_KEY_FALSE(aql_disable);
|
|
+
|
|
bool ieee80211_txq_airtime_check(struct ieee80211_hw *hw,
|
|
struct ieee80211_txq *txq)
|
|
{
|
|
@@ -3896,6 +3898,9 @@ bool ieee80211_txq_airtime_check(struct
|
|
if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL))
|
|
return true;
|
|
|
|
+ if (static_branch_unlikely(&aql_disable))
|
|
+ return true;
|
|
+
|
|
if (!txq->sta)
|
|
return true;
|
|
|