scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 01:52:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity
Files
a6a28f5aab1cfc4bd4531af022b861823fae1014
wlan-ap/patches-20.x/0022-mac80211-add-TIP-tweaks.patch
John Crispin a6a28f5aab openwrt-20.x: add support for latest 20.x 
This is opt-in and we continue to use the 19.07 tree as the default.

Signed-off-by: John Crispin <john@phrozen.org>
2020-12-02 12:14:16 +01:00

443 lines
14 KiB
Diff
Raw Blame History

From fa286423687750affca29cb7f9233272105262e1 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 24 Oct 2020 17:00:54 +0200
Subject: [PATCH 22/25] mac80211: add TIP tweaks
Signed-off-by: John Crispin <john@phrozen.org>
---
.../files/lib/netifd/wireless/mac80211.sh | 194 +++++++++++++++++-
.../mac80211/files/lib/wifi/mac80211.sh | 6 -
.../patches/subsys/130-disable-fils.patch | 32 ---
.../mac80211/patches/subsys/800-oom.patch | 71 +++++++
4 files changed, 255 insertions(+), 48 deletions(-)
delete mode 100644 package/kernel/mac80211/patches/subsys/130-disable-fils.patch
create mode 100644 package/kernel/mac80211/patches/subsys/800-oom.patch
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 6ca12084cf..bdf9fcb395 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -56,6 +56,13 @@ drv_mac80211_init_device_config() {
short_gi_40 \
max_amsdu \
dsss_cck_40
+ config_add_int \
+ he_su_beamformer \
+ he_su_beamformee \
+ he_mu_beamformer \
+ he_bss_color \
+ he_spr_sr_control \
+ he_spr_non_srg_obss_pd_max_offset
}
drv_mac80211_init_iface_config() {
@@ -69,6 +76,7 @@ drv_mac80211_init_iface_config() {
config_add_int max_listen_int
config_add_int dtim_period
config_add_int start_disabled
+ config_add_int he_twt_required he_spr_sr_control
# mesh
config_add_string mesh_id
@@ -96,6 +104,77 @@ mac80211_add_capabilities() {
export -n -- "$__var=$__out"
}
+mac80211_add_he_capabilities() {
+ local __out= oifs
+
+ oifs="$IFS"
+ IFS=:
+ for capab in "$@"; do
+ set -- $capab
+ [ "$(($4))" -gt 0 ] || continue
+ [ "$(((0x$2) & $3))" -gt 0 ] || continue
+ append base_cfg "$1=1" "$N"
+ done
+ IFS="$oifs"
+}
+
+mac80211_get_seg0() {
+ local ht_mode="$1"
+ local seg0=0
+
+ case "$ht_mode" in
+ 40)
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ case "$(( ($channel / 4) % 2 ))" in
+ 1) seg0=$(($channel - 2));;
+ 0) seg0=$(($channel + 2));;
+ esac
+ elif [ $freq != 5935 ]; then
+ case "$(( ($channel / 4) % 2 ))" in
+ 1) seg0=$(($channel + 2));;
+ 0) seg0=$(($channel - 2));;
+ esac
+ fi
+ ;;
+ 80)
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ case "$(( ($channel / 4) % 4 ))" in
+ 0) seg0=$(($channel + 6));;
+ 1) seg0=$(($channel + 2));;
+ 2) seg0=$(($channel - 2));;
+ 3) seg0=$(($channel - 6));;
+ esac
+ elif [ $freq != 5935 ]; then
+ case "$(( ($channel / 4) % 4 ))" in
+ 1) seg0=$(($channel + 6));;
+ 2) seg0=$(($channel + 2));;
+ 3) seg0=$(($channel - 2));;
+ 0) seg0=$(($channel - 6));;
+ esac
+ fi
+ ;;
+ 160)
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ case "$channel" in
+ 1|5|9|13|17|21|25|29) seg0=15;;
+ 33|37|41|45|49|53|57|61) seg0=47;;
+ 65|69|73|77|81|85|89|93) seg0=79;;
+ 97|101|105|109|113|117|121|125) seg0=111;;
+ 129|133|137|141|145|149|153|157) seg0=143;;
+ 161|165|169|173|177|181|185|189) seg0=175;;
+ 193|197|201|205|209|213|217|221) seg0=207;;
+ esac
+ elif [ $freq != 5935 ]; then
+ case "$channel" in
+ 36|40|44|48|52|56|60|64) seg0=50;;
+ 100|104|108|112|116|120|124|128) seg0=114;;
+ esac
+ fi
+ ;;
+ esac
+ printf "$seg0"
+}
+
mac80211_hostapd_setup_base() {
local phy="$1"
@@ -333,20 +412,106 @@ mac80211_hostapd_setup_base() {
# 802.11ax
enable_ax=0
case "$htmode" in
- HE*) enable_ax=1 ;;
+ HE20) enable_ax=1
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ append base_cfg "op_class=131" "$N"
+ fi
+ ;;
+ HE40)
+ enable_ax=1
+ idx="$(mac80211_get_seg0 "40")"
+ if [ $freq -ge 5180 ] && [ $freq != 5935 ]; then
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ append base_cfg "op_class=132" "$N"
+ fi
+ append base_cfg "he_oper_chwidth=0" "$N"
+ append base_cfg "he_oper_centr_freq_seg0_idx=$idx" "$N"
+ fi
+ ;;
+ HE80)
+ enable_ax=1
+ idx="$(mac80211_get_seg0 "80")"
+ if [ $freq != 5935 ]; then
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ append base_cfg "op_class=133" "$N"
+ fi
+ append base_cfg "he_oper_chwidth=1" "$N"
+ append base_cfg "he_oper_centr_freq_seg0_idx=$idx" "$N"
+ fi
+ ;;
+ HE160)
+ enable_ax=1
+ idx="$(mac80211_get_seg0 "160")"
+ if [ $freq != 5935 ]; then
+ if [ $freq -gt 5950 ] && [ $freq -le 7115 ]; then
+ append base_cfg "op_class=134" "$N"
+ fi
+ append base_cfg "he_oper_chwidth=2" "$N"
+ append base_cfg "he_oper_centr_freq_seg0_idx=$idx" "$N"
+ fi
+ ;;
esac
if [ "$enable_ax" != "0" ]; then
+ json_get_vars \
+ he_su_beamformer:1 \
+ he_su_beamformee:0 \
+ he_mu_beamformer:1 \
+ he_twt_required:0 \
+ he_spr_sr_control:0 \
+ he_spr_non_srg_obss_pd_max_offset:1 \
+ he_bss_color:64
+
+
append base_cfg "ieee80211ax=1" "$N"
+ append base_cfg "he_bss_color=$he_bss_color" "$N"
[ "$hwmode" = "a" ] && {
append base_cfg "he_oper_chwidth=$vht_oper_chwidth" "$N"
append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
}
+ he_phy_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1)
+ he_phy_cap=${he_phy_cap:2}
+ he_mac_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1)
+ he_mac_cap=${he_mac_cap:2}
+
+ mac80211_add_he_capabilities \
+ he_su_beamformer:${he_phy_cap:6:2}:0x80:$he_su_beamformer \
+ he_su_beamformee:${he_phy_cap:8:2}:0x1:$he_su_beamformee \
+ he_mu_beamformer:${he_phy_cap:8:2}:0x2:$he_mu_beamformer \
+ he_spr_sr_control:${he_phy_cap:14:2}:0x1:$he_spr_sr_control \
+ he_twt_required:${he_mac_cap:0:2}:0x6:$he_twt_required
+
+ [ "$he_spr_sr_control" != "0" ] && {
+ append base_cfg "he_spr_sr_control=$he_spr_sr_control" "$N"
+ append base_cfg "he_spr_non_srg_obss_pd_max_offset=$he_spr_non_srg_obss_pd_max_offset" "$N"
+ }
+
append base_cfg "he_default_pe_duration=4" "$N"
append base_cfg "he_rts_threshold=1023" "$N"
- append base_cfg "he_su_beamformer=1" "$N"
- append base_cfg "he_su_beamformee=1" "$N"
- append base_cfg "he_mu_beamformer=1023" "$N"
+ append base_cfg "he_mu_edca_qos_info_param_count=0" "$N"
+ append base_cfg "he_mu_edca_qos_info_q_ack=0" "$N"
+ append base_cfg "he_mu_edca_qos_info_queue_request=0" "$N"
+ append base_cfg "he_mu_edca_qos_info_txop_request=0" "$N"
+ append base_cfg "he_mu_edca_ac_be_aifsn=8" "$N"
+ append base_cfg "he_mu_edca_ac_be_aci=0" "$N"
+ append base_cfg "he_mu_edca_ac_be_ecwmin=9" "$N"
+ append base_cfg "he_mu_edca_ac_be_ecwmax=10" "$N"
+ append base_cfg "he_mu_edca_ac_be_timer=255" "$N"
+ append base_cfg "he_mu_edca_ac_bk_aifsn=15" "$N"
+ append base_cfg "he_mu_edca_ac_bk_aci=1" "$N"
+ append base_cfg "he_mu_edca_ac_bk_ecwmin=9" "$N"
+ append base_cfg "he_mu_edca_ac_bk_ecwmax=10" "$N"
+ append base_cfg "he_mu_edca_ac_bk_timer=255" "$N"
+ append base_cfg "he_mu_edca_ac_vi_ecwmin=5" "$N"
+ append base_cfg "he_mu_edca_ac_vi_ecwmax=7" "$N"
+ append base_cfg "he_mu_edca_ac_vi_aifsn=5" "$N"
+ append base_cfg "he_mu_edca_ac_vi_aci=2" "$N"
+ append base_cfg "he_mu_edca_ac_vi_timer=255" "$N"
+ append base_cfg "he_mu_edca_ac_vo_aifsn=5" "$N"
+ append base_cfg "he_mu_edca_ac_vo_aci=3" "$N"
+ append base_cfg "he_mu_edca_ac_vo_ecwmin=5" "$N"
+ append base_cfg "he_mu_edca_ac_vo_ecwmax=7" "$N"
+ append base_cfg "he_mu_edca_ac_vo_timer=255" "$N"
fi
hostapd_prepare_device_config "$hostapd_conf_file" nl80211
@@ -401,6 +566,7 @@ mac80211_get_addr() {
mac80211_generate_mac() {
local phy="$1"
+ local multiple_bssid="$2"
local id="${macidx:-0}"
local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
@@ -425,6 +591,11 @@ mac80211_generate_mac() {
local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+ [ "$multiple_bssid" -eq 1 ] && {
+ printf "02:%s:%s:%s:%s:%02x" $b1 $2 $3 $4 $5 $macidx
+ return
+ }
+
macidx=$(($id + 1))
[ "$((0x$mask1))" -gt 0 ] && {
b1="0x$1"
@@ -533,6 +704,7 @@ mac80211_iw_interface_add() {
}
mac80211_prepare_vif() {
+ local multiple_bssid=$1
json_select config
json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
@@ -546,7 +718,7 @@ mac80211_prepare_vif() {
json_select ..
[ -n "$macaddr" ] || {
- macaddr="$(mac80211_generate_mac $phy)"
+ macaddr="$(mac80211_generate_mac $phy $multiple_bssid)"
macidx="$(($macidx + 1))"
}
@@ -687,8 +859,9 @@ mac80211_setup_supplicant_noctl() {
mac80211_prepare_iw_htmode() {
case "$htmode" in
- VHT20|HT20) iw_htmode=HT20;;
- HT40*|VHT40|VHT160)
+ VHT20|HT20|HE20) iw_htmode=HT20;;
+ HT40*|VHT40|VHT160|\
+ HE40|HE40|HE160)
case "$hwmode" in
a)
case "$(( ($channel / 4) % 2 ))" in
@@ -712,7 +885,7 @@ mac80211_prepare_iw_htmode() {
esac
[ "$auto_channel" -gt 0 ] && iw_htmode="HT40+"
;;
- VHT80)
+ VHT80|HE80)
iw_htmode="80MHZ"
;;
NONE|NOHT)
@@ -896,7 +1069,8 @@ drv_mac80211_setup() {
country chanbw distance \
txpower antenna_gain \
rxantenna txantenna \
- frag rts beacon_int:100 htmode
+ frag rts beacon_int:100 htmode \
+ multiple_bssid:0
json_get_values basic_rate_list basic_rate
json_get_values scan_list scan_list
json_select ..
@@ -991,7 +1165,7 @@ drv_mac80211_setup() {
mac80211_prepare_iw_htmode
for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
NEWAPLIST=
- for_each_interface "ap" mac80211_prepare_vif
+ for_each_interface "ap" mac80211_prepare_vif ${multiple_bssid}
NEW_MD5=$(test -e "${hostapd_conf_file}" && md5sum ${hostapd_conf_file})
OLD_MD5=$(uci -q -P /var/state get wireless._${phy}.md5)
if [ "${NEWAPLIST}" != "${OLDAPLIST}" ]; then
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index c0fbfbe5a8..453ac7d847 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -106,12 +106,6 @@ detect_mac80211() {
${ht_capab}
set wireless.radio${devidx}.disabled=1
- set wireless.default_radio${devidx}=wifi-iface
- set wireless.default_radio${devidx}.device=radio${devidx}
- set wireless.default_radio${devidx}.network=lan
- set wireless.default_radio${devidx}.mode=ap
- set wireless.default_radio${devidx}.ssid=OpenWrt
- set wireless.default_radio${devidx}.encryption=none
EOF
uci -q commit wireless
diff --git a/package/kernel/mac80211/patches/subsys/130-disable-fils.patch b/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
deleted file mode 100644
index 9c6e971f9d..0000000000
--- a/package/kernel/mac80211/patches/subsys/130-disable-fils.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Disable FILS support, since it pulls in crypto hash support
-
---- a/net/mac80211/fils_aead.h
-+++ b/net/mac80211/fils_aead.h
-@@ -7,7 +7,7 @@
- #ifndef FILS_AEAD_H
- #define FILS_AEAD_H
-
--#if LINUX_VERSION_IS_GEQ(4,3,0)
-+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
- int fils_encrypt_assoc_req(struct sk_buff *skb,
- struct ieee80211_mgd_assoc_data *assoc_data);
- int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata,
---- a/net/mac80211/fils_aead.c
-+++ b/net/mac80211/fils_aead.c
-@@ -1,4 +1,4 @@
--#if LINUX_VERSION_IS_GEQ(4,3,0)
-+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
- // SPDX-License-Identifier: GPL-2.0-only
- /*
- * FILS AEAD for (Re)Association Request/Response frames
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -591,7 +591,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
- NL80211_FEATURE_MAC_ON_CREATE |
- NL80211_FEATURE_USERSPACE_MPM |
- NL80211_FEATURE_FULL_AP_CLIENT_STATE;
--#if LINUX_VERSION_IS_GEQ(4,3,0)
-+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
- wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);
- #endif
- wiphy_ext_feature_set(wiphy,
diff --git a/package/kernel/mac80211/patches/subsys/800-oom.patch b/package/kernel/mac80211/patches/subsys/800-oom.patch
new file mode 100644
index 0000000000..401a8bf324
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/800-oom.patch
@@ -0,0 +1,71 @@
+From a8295e2c06e1aa313b4624df9dedf599df382eef Mon Sep 17 00:00:00 2001
+From: Ben Greear <greearb@candelatech.com>
+Date: Thu, 9 May 2013 11:56:22 -0700
+Subject: mac80211: Limit number of pending skbs.
+
+Current code will allow any number of pending skbs, and
+this can OOM the system when used with something like
+the pktgen tool (which may not back off properly if
+queue is stopped).
+
+Possibly this is just a bug in our version of pktgen,
+but either way, it seems reasonable to add a limit
+so that it is not possible to go OOM in this manner.
+
+Signed-off-by: Ben Greear <greearb@candelatech.com>
+
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 3529d1368068..5eb60a50641e 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -35,6 +35,17 @@
+ #include "wpa.h"
+ #include "wme.h"
+ #include "rate.h"
++#include <linux/moduleparam.h>
++
++/*
++ * Maximum number of skbs that may be queued in a pending
++ * queue. After that, packets will just be dropped.
++ */
++static int max_pending_qsize = 1000;
++module_param(max_pending_qsize, int, 0644);
++MODULE_PARM_DESC(max_pending_qsize,
++ "Maximum number of skbs that may be queued in a pending queue.");
++
+
+ /* misc utils */
+
+@@ -1671,15 +1682,28 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
+ * later transmission from the tx-pending
+ * tasklet when the queue is woken again.
+ */
+- if (txpending)
++ bool do_free = false;
++ if (txpending) {
+ skb_queue_splice_init(skbs,
+ &local->pending[q]);
+- else
+- skb_queue_splice_tail_init(skbs,
+- &local->pending[q]);
++ } else {
++ u32 len = skb_queue_len(&local->pending[q]);
++ if (len >= max_pending_qsize) {
++ __skb_unlink(skb, skbs);
++ do_free = true;
++ } else {
++ skb_queue_splice_tail_init(skbs,
++ &local->pending[q]);
++ }
++ }
+
+ spin_unlock_irqrestore(&local->queue_stop_reason_lock,
+ flags);
++ if (do_free) {
++ dev_kfree_skb_any(skb);
++ /* TODO: Add counter for this */
++ }
++
+ return false;
+ }
+ }
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink