forked from openwrt/openwrt
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ath10k: backport encapsulation offload support
This backports encap offload support from upstream. On some ath10k devices there can be about 10% improvement on tx throughput. Users can turn it on by setting frame_mode=2. Signed-off-by: Zhijun You <hujy652@gmail.com>
- Loading branch information
1 parent
949e8ba
commit 00f64ed
Showing
11 changed files
with
520 additions
and
20 deletions.
There are no files selected for viewing
69 changes: 69 additions & 0 deletions
69
package/kernel/mac80211/patches/ath10k/081-01-ath10k-improve-tx-status-reporting.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
From 2587d5198aa5adcbd8896aae4a2404dc13d48637 Mon Sep 17 00:00:00 2001 | ||
From: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Date: Wed, 18 May 2022 10:27:26 +0300 | ||
Subject: ath10k: improve tx status reporting | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
We use ieee80211_tx_status() to report each completed tx frame. | ||
Internally, this function calls sta_info_get_by_addrs(), what has a | ||
couple of drawbacks: | ||
1. additional station lookup causes a performance degradation; | ||
2. mac80211 can not properly account Ethernet encapsulated frames due | ||
to the inability to properly determine the destination (station) MAC | ||
address since ieee80211_tx_status() assumes the frame has a 802.11 | ||
header. | ||
|
||
The latter is especially destructive if we want to use hardware frames | ||
encapsulation. | ||
|
||
To fix both of these issues, replace ieee80211_tx_status() with | ||
ieee80211_tx_status_ext() call and feed it station pointer from the tx | ||
queue associated with the transmitted frame. | ||
|
||
Tested-on: QCA9888 hw2.0 PCI 10.4-3.9.0.2-00131 | ||
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00157-QCARMSWPZ-1 | ||
|
||
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Tested-by: Oldřich Jedlička <oldium.pro@gmail.com> # TP-Link Archer C7 v4 & v5 (QCA9563 + QCA9880) | ||
Tested-by: Edward Matijevic <motolav@gmail.com> # TP-Link Archer C2600 (IPQ8064 + QCA9980 10.4.1.00030-1) | ||
Tested-by: Edward Matijevic <motolav@gmail.com> # QCA9377 PCI in Sta mode | ||
Tested-by: Zhijun You <hujy652@gmail.com> # NETGEAR R7800 (QCA9984 10.4-3.9.0.2-00159) | ||
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> | ||
Link: https://lore.kernel.org/r/20220516032519.29831-2-ryazanov.s.a@gmail.com | ||
--- | ||
drivers/net/wireless/ath/ath10k/txrx.c | 15 ++++++++++++++- | ||
1 file changed, 14 insertions(+), 1 deletion(-) | ||
|
||
--- a/drivers/net/wireless/ath/ath10k/txrx.c | ||
+++ b/drivers/net/wireless/ath/ath10k/txrx.c | ||
@@ -43,6 +43,7 @@ out: | ||
int ath10k_txrx_tx_unref(struct ath10k_htt *htt, | ||
const struct htt_tx_done *tx_done) | ||
{ | ||
+ struct ieee80211_tx_status status; | ||
struct ath10k *ar = htt->ar; | ||
struct device *dev = ar->dev; | ||
struct ieee80211_tx_info *info; | ||
@@ -128,7 +129,19 @@ int ath10k_txrx_tx_unref(struct ath10k_h | ||
info->status.is_valid_ack_signal = true; | ||
} | ||
|
||
- ieee80211_tx_status(htt->ar->hw, msdu); | ||
+ memset(&status, 0, sizeof(status)); | ||
+ status.skb = msdu; | ||
+ status.info = info; | ||
+ | ||
+ rcu_read_lock(); | ||
+ | ||
+ if (txq) | ||
+ status.sta = txq->sta; | ||
+ | ||
+ ieee80211_tx_status_ext(htt->ar->hw, &status); | ||
+ | ||
+ rcu_read_unlock(); | ||
+ | ||
/* we do not own the msdu anymore */ | ||
|
||
return 0; |
74 changes: 74 additions & 0 deletions
74
package/kernel/mac80211/patches/ath10k/081-02-ath10k-turn-rawmode-into-frame-mode.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
From a09740548275a74b897654b3aca5af589289b57a Mon Sep 17 00:00:00 2001 | ||
From: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Date: Mon, 16 May 2022 13:26:00 +0300 | ||
Subject: ath10k: turn rawmode into frame_mode | ||
|
||
Turn boolean rawmode module param into integer frame_mode param that | ||
contains value from ath10k_hw_txrx_mode enum. As earlier the default | ||
param value is non-RAW (native Wi-Fi) encapsulation. The param name | ||
is selected to be consistent with the similar ath11k param. | ||
|
||
This is a preparation step for upcoming encapsulation offloading | ||
support. | ||
|
||
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> | ||
Link: https://lore.kernel.org/r/20220516032519.29831-4-ryazanov.s.a@gmail.com | ||
--- | ||
drivers/net/wireless/ath/ath10k/core.c | 11 +++++++---- | ||
drivers/net/wireless/ath/ath10k/core.h | 1 + | ||
2 files changed, 8 insertions(+), 4 deletions(-) | ||
|
||
--- a/drivers/net/wireless/ath/ath10k/core.c | ||
+++ b/drivers/net/wireless/ath/ath10k/core.c | ||
@@ -32,9 +32,11 @@ EXPORT_SYMBOL(ath10k_debug_mask); | ||
static unsigned int ath10k_cryptmode_param; | ||
static bool uart_print; | ||
static bool skip_otp; | ||
-static bool rawmode; | ||
static bool fw_diag_log; | ||
|
||
+/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */ | ||
+unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI; | ||
+ | ||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) | | ||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA); | ||
|
||
@@ -43,15 +45,16 @@ module_param_named(debug_mask, ath10k_de | ||
module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); | ||
module_param(uart_print, bool, 0644); | ||
module_param(skip_otp, bool, 0644); | ||
-module_param(rawmode, bool, 0644); | ||
module_param(fw_diag_log, bool, 0644); | ||
+module_param_named(frame_mode, ath10k_frame_mode, uint, 0644); | ||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444); | ||
|
||
MODULE_PARM_DESC(debug_mask, "Debugging mask"); | ||
MODULE_PARM_DESC(uart_print, "Uart target debugging"); | ||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode"); | ||
MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software"); | ||
-MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath"); | ||
+MODULE_PARM_DESC(frame_mode, | ||
+ "Datapath frame mode (0: raw, 1: native wifi (default))"); | ||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file"); | ||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging"); | ||
|
||
@@ -2487,7 +2490,7 @@ static int ath10k_core_init_firmware_fea | ||
ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT; | ||
ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT; | ||
|
||
- if (rawmode) { | ||
+ if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) { | ||
if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT, | ||
fw_file->fw_features)) { | ||
ath10k_err(ar, "rawmode = 1 requires support from firmware"); | ||
--- a/drivers/net/wireless/ath/ath10k/core.h | ||
+++ b/drivers/net/wireless/ath/ath10k/core.h | ||
@@ -1311,6 +1311,7 @@ static inline bool ath10k_peer_stats_ena | ||
return false; | ||
} | ||
|
||
+extern unsigned int ath10k_frame_mode; | ||
extern unsigned long ath10k_coredump_mask; | ||
|
||
void ath10k_core_napi_sync_disable(struct ath10k *ar); |
163 changes: 163 additions & 0 deletions
163
...el/mac80211/patches/ath10k/081-03-ath10k-htt-tx-do-not-interpret-Eth-frames-as-WiFi.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,163 @@ | ||
From 70f119fb82af7f7417dc659faf02c91e1f853739 Mon Sep 17 00:00:00 2001 | ||
From: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Date: Mon, 16 May 2022 13:26:00 +0300 | ||
Subject: ath10k: htt_tx: do not interpret Eth frames as WiFi | ||
|
||
The xmit path for the Ethernet encapsulated frames become more or less | ||
usable since d740d8fd2439 ("ath10k: unify tx mode and dispatch"). This | ||
change reorganize the xmit path in a manageable way to properly support | ||
various tx modes, but misses that the Ethernet encapsulated frame is a | ||
special case. We do not have an IEEE 802.11 header at the begining of | ||
them. But the HTT Tx handler still interprets first bytes of each frame | ||
as an IEEE 802.11 Frame Control field. | ||
|
||
Than this code was copied by e62ee5c381c5 ("ath10k: Add support for | ||
htt_data_tx_desc_64 descriptor") and a2097d6444c3 ("ath10k: htt: High | ||
latency TX support") to another handlers. In fact the issue in the high | ||
latency (HL) handler was introduced by 83ac260151e7 ("ath10k: add mic | ||
bytes for pmf management packet"). | ||
|
||
Ethernet encapsulated frame tx mode stay unused until 75d85fd9993c | ||
("ath10k: introduce basic tdls functionality") started using it for TDLS | ||
frames to avoid key selection issue in some firmwares. | ||
|
||
Trying to interpret the begining of an Ethernet encapsulated frame as an | ||
IEEE 802.11 header was not hurt us noticeably since we need to meet two | ||
conditions: (1) xmit should be performed towards a TDLS peer, and (2) | ||
the TDLS peer should have a specific OUI part of its MAC address. Looks | ||
like that the rareness in TDLS communications of OUIs that can be | ||
interpreted as an 802.11 management frame saves users from facing this | ||
issue earlier. | ||
|
||
Improve Ethernet tx mode support in the HTT Tx handler by avoiding | ||
interpreting its first bytes as an IEEE 802.11 header. While at it, make | ||
the ieee80211_hdr variable local to the code block that is guarded by | ||
!is_eth check. In this way, we clarify in which cases a frame can be | ||
interpreted as IEEE 802.11, and saves us from similar issues in the | ||
future. | ||
|
||
Credits: this change as part of xmit encapsulation offloading support | ||
was originally made by QCA and then submitted for inclusion by John | ||
Crispin [1]. But the whole work was not accepted due to the lack of a | ||
part for 64-bits descriptors [2]. Zhijun You then pointed this out to me | ||
in a reply to my initial RFC patch series. And I made this slightly | ||
reworked version that covered all the HTT Tx handler variants. | ||
|
||
1. https://lore.kernel.org/all/20191216092207.31032-1-john@phrozen.org/ | ||
2. https://patchwork.kernel.org/project/linux-wireless/patch/20191216092207.31032-1-john@phrozen.org/ | ||
|
||
Reported-by: Zhijun You <hujy652@gmail.com> | ||
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> | ||
Signed-off-by: John Crispin <john@phrozen.org> | ||
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> | ||
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> | ||
Link: https://lore.kernel.org/r/20220516032519.29831-3-ryazanov.s.a@gmail.com | ||
--- | ||
drivers/net/wireless/ath/ath10k/htt_tx.c | 61 ++++++++++++++++++-------------- | ||
1 file changed, 35 insertions(+), 26 deletions(-) | ||
|
||
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c | ||
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c | ||
@@ -1295,7 +1295,6 @@ static int ath10k_htt_tx_hl(struct ath10 | ||
struct ath10k *ar = htt->ar; | ||
int res, data_len; | ||
struct htt_cmd_hdr *cmd_hdr; | ||
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
struct htt_data_tx_desc *tx_desc; | ||
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); | ||
struct sk_buff *tmp_skb; | ||
@@ -1306,11 +1305,15 @@ static int ath10k_htt_tx_hl(struct ath10 | ||
u16 flags1 = 0; | ||
u16 msdu_id = 0; | ||
|
||
- if ((ieee80211_is_action(hdr->frame_control) || | ||
- ieee80211_is_deauth(hdr->frame_control) || | ||
- ieee80211_is_disassoc(hdr->frame_control)) && | ||
- ieee80211_has_protected(hdr->frame_control)) { | ||
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ if (!is_eth) { | ||
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
+ | ||
+ if ((ieee80211_is_action(hdr->frame_control) || | ||
+ ieee80211_is_deauth(hdr->frame_control) || | ||
+ ieee80211_is_disassoc(hdr->frame_control)) && | ||
+ ieee80211_has_protected(hdr->frame_control)) { | ||
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ } | ||
} | ||
|
||
data_len = msdu->len; | ||
@@ -1407,7 +1410,6 @@ static int ath10k_htt_tx_32(struct ath10 | ||
{ | ||
struct ath10k *ar = htt->ar; | ||
struct device *dev = ar->dev; | ||
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu); | ||
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); | ||
struct ath10k_hif_sg_item sg_items[2]; | ||
@@ -1439,15 +1441,19 @@ static int ath10k_htt_tx_32(struct ath10 | ||
txbuf_paddr = htt->txbuf.paddr + | ||
(sizeof(struct ath10k_htt_txbuf_32) * msdu_id); | ||
|
||
- if ((ieee80211_is_action(hdr->frame_control) || | ||
- ieee80211_is_deauth(hdr->frame_control) || | ||
- ieee80211_is_disassoc(hdr->frame_control)) && | ||
- ieee80211_has_protected(hdr->frame_control)) { | ||
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
- } else if (!(skb_cb->flags & ATH10K_SKB_F_NO_HWCRYPT) && | ||
- txmode == ATH10K_HW_TXRX_RAW && | ||
- ieee80211_has_protected(hdr->frame_control)) { | ||
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ if (!is_eth) { | ||
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
+ | ||
+ if ((ieee80211_is_action(hdr->frame_control) || | ||
+ ieee80211_is_deauth(hdr->frame_control) || | ||
+ ieee80211_is_disassoc(hdr->frame_control)) && | ||
+ ieee80211_has_protected(hdr->frame_control)) { | ||
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ } else if (!(skb_cb->flags & ATH10K_SKB_F_NO_HWCRYPT) && | ||
+ txmode == ATH10K_HW_TXRX_RAW && | ||
+ ieee80211_has_protected(hdr->frame_control)) { | ||
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ } | ||
} | ||
|
||
skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, | ||
@@ -1609,7 +1615,6 @@ static int ath10k_htt_tx_64(struct ath10 | ||
{ | ||
struct ath10k *ar = htt->ar; | ||
struct device *dev = ar->dev; | ||
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu); | ||
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); | ||
struct ath10k_hif_sg_item sg_items[2]; | ||
@@ -1641,15 +1646,19 @@ static int ath10k_htt_tx_64(struct ath10 | ||
txbuf_paddr = htt->txbuf.paddr + | ||
(sizeof(struct ath10k_htt_txbuf_64) * msdu_id); | ||
|
||
- if ((ieee80211_is_action(hdr->frame_control) || | ||
- ieee80211_is_deauth(hdr->frame_control) || | ||
- ieee80211_is_disassoc(hdr->frame_control)) && | ||
- ieee80211_has_protected(hdr->frame_control)) { | ||
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
- } else if (!(skb_cb->flags & ATH10K_SKB_F_NO_HWCRYPT) && | ||
- txmode == ATH10K_HW_TXRX_RAW && | ||
- ieee80211_has_protected(hdr->frame_control)) { | ||
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ if (!is_eth) { | ||
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; | ||
+ | ||
+ if ((ieee80211_is_action(hdr->frame_control) || | ||
+ ieee80211_is_deauth(hdr->frame_control) || | ||
+ ieee80211_is_disassoc(hdr->frame_control)) && | ||
+ ieee80211_has_protected(hdr->frame_control)) { | ||
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ } else if (!(skb_cb->flags & ATH10K_SKB_F_NO_HWCRYPT) && | ||
+ txmode == ATH10K_HW_TXRX_RAW && | ||
+ ieee80211_has_protected(hdr->frame_control)) { | ||
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN); | ||
+ } | ||
} | ||
|
||
skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, |
Oops, something went wrong.