forked from Openwrt-EcoNet/openwrt
Renamed 046..051 pending patches with the merged tag/hash. Two patches were skipped, they make use of WQ_BH present since v6.14:13221be720
3e3aa566dd
Manually refreshed 062-v6.14-wifi-rtw88-Add-support-for-LED-blinking.patch Manually refreshed 063-v6.14-wifi-rtw88-add-RTW88_LEDS-depends-on-LEDS_CLASS-to-K.patch Manually backported 090-v6.15-wifi-rtw88-Enable-the-new-RTL8814AE-RTL8814AU-driver.patch git log --no-merges --pretty=oneline --abbrev-commit 4c2c372de...0daa521a drivers/net/wireless/realtek/rtw88: 4c2c372de2e1 wifi: rtw88: fix the 'para' buffer size to avoid reading out of bounds f24d0d8c3cd7 wifi: rtw88: Fix the random "error beacon valid" messages for USB 80fe0bc1659c wifi: rtw88: usb: Upload the firmware in bigger chunks 490340faddea wifi: rtw88: usb: Reduce control message timeout to 500 ms b7f0cc647e52 wifi: rtw88: rtw8822bu VID/PID for BUFFALO WI-U2-866DM 2c17afde9ff6 wifi: rtw88: Handle RTL8723D(S) with blank efuse 0ffa1ba81b35 wifi: rtw88: Fix RX aggregation settings for RTL8723DS 20d3c19bd8f9 wifi: rtw88: do not ignore hardware read error during DPK fc5f5a0ec463 wifi: rtw88: sdio: call rtw_sdio_indicate_tx_status unconditionally b2effcdc2379 wifi: rtw88: sdio: map mgmt frames to queue TX_DESC_QSEL_MGMT 581cf3a9cb61 wifi: rtw88: Fix the module names printed in dmesg b8d49bb8d16a wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU 0d2a88690e58 wifi: rtw88: Set AMPDU factor to hardware for RTL8814A dcbb7bb3a364 wifi: rtw88: usb: Enable RX aggregation for RTL8814AU bf1103654df9 wifi: rtw88: usb: Enable switching the RTL8814AU to USB 3 625fbc16524a wifi: rtw88: usb: Remove redundant 'flush_workqueue()' calls 5c4cf36c538b wifi: rtw88: sdio: Remove redundant 'flush_workqueue()' calls d58ad77d5cc2 wifi: rtw88: Add __nonstring annotations for unterminated strings deb3ddeb1865 wifi: rtw88: Enable the new RTL8814AE/RTL8814AU drivers bad060e8a425 wifi: rtw88: Add rtw8814au.c dad8e8793102 wifi: rtw88: Add rtw8814ae.c 1a7545784642 wifi: rtw88: Add rtw8814a.{c,h} e38246889cc9 wifi: rtw88: Add rtw8814a_table.c (part 2/2) f4debfcb1b3c wifi: rtw88: Add rtw8814a_table.c (part 1/2) 679ec431477c wifi: rtw88: Add some definitions for RTL8814AU c374281f8285 wifi: rtw88: Extend rtw_debugfs_get_tx_pwr_tbl() for RTL8814AU cfebabdd351e wifi: rtw88: Extend rtw_debugfs_get_phy_info() for RTL8814AU 8b42c46cf665 wifi: rtw88: Extend rtw_phy_config_swing_table() for RTL8814AU 053a7aace020 wifi: rtw88: Fix rtw_rx_phy_stat() for RTL8814AU 6be7544d19fc wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU c7eea1ba05ca wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU 86d04f8f991a wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 e66bca16638e wifi: rtw88: Fix rtw_mac_power_switch() for RTL8814AU 80c4668d024f wifi: rtw88: Add support for Mercusys MA30N and D-Link DWA-T185 rev. A1 9f00e2218e15 wifi: rtw88: Fix rtw_update_sta_info() for RTL8814AU 0f98a5959657 wifi: rtw88: Extend TX power stuff for 3-4 spatial streams ad815f392003 wifi: rtw88: Rename RTW_RATE_SECTION_MAX to RTW_RATE_SECTION_NUM e66f3b5c7535 wifi: rtw88: Constify some more structs and arrays 8f0076726b66 wifi: rtw88: Extend rtw_fw_send_ra_info() for RTL8814AU d80e7d9b6ba3 wifi: rtw88: Extend rf_base_addr and rf_sipi_addr for RTL8814AU 62f726848da4 wifi: rtw88: Extend struct rtw_pwr_track_tbl for RTL8814AU 9e8243025cc0 wifi: rtw88: Fix download_firmware_validate() for RTL8814AU 8425f5c8f04d wifi: rtw88: Fix __rtw_download_firmware() for RTL8814AU 105dc94233e4 wifi: rtw88: Fix a typo of debug message in rtw8723d_iqk_check_tx_failed() 0d1d165eff9d wifi: rtw88: Don't use static local variable in rtw8821c_set_tx_power_index_by_rate 00451eb3bec7 wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate b4bfbc50b1b9 wifi: rtw88: add RTW88_LEDS depends on LEDS_CLASS to Kconfig 4b6652bc6d8d wifi: rtw88: Add support for LED blinking fb2fcfbe5eef wifi: rtw88: sdio: Fix disconnection after beacon loss a806a8160a0f wifi: rtw88: 8703b: Fix RX/TX issues 5ad483955acc wifi: rtw88: Delete rf_type member of struct rtw_sta_info 5b1b9545262b wifi: rtw88: Add USB PHY configuration not backported (3e3aa566dd18 wifi: rtw88: usb: Preallocate and reuse the RX skbs) not backported (13221be72034 wifi: rtw88: Handle C2H_ADAPTIVITY in rtw_fw_c2h_cmd_handle() ) e9048e2935f7 wifi: rtw88: usb: Copy instead of cloning the RX skb 74a72c367573 wifi: rtw88: 8821a/8812a: Set ptct_efuse_size to 0 59ab27a9f20f wifi: rtw88: 8812a: Support RFE type 2 Signed-off-by: Marty Jones <mj8263788@gmail.com> Link: https://github.com/openwrt/openwrt/pull/19052 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
131 lines
3.9 KiB
Diff
131 lines
3.9 KiB
Diff
From e9048e2935f7d797c2ba047c15b705b57c2fa99a Mon Sep 17 00:00:00 2001
|
|
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
|
Date: Thu, 19 Dec 2024 00:33:20 +0200
|
|
Subject: [PATCH] wifi: rtw88: usb: Copy instead of cloning the RX skb
|
|
|
|
"iperf3 -c 192.168.0.1 -R --udp -b 0" shows about 40% of datagrams
|
|
are lost. Many torrents don't download faster than 3 MiB/s, probably
|
|
because the Bittorrent protocol uses UDP. This is somehow related to
|
|
the use of skb_clone() in the RX path.
|
|
|
|
Don't use skb_clone(). Instead allocate a new skb for each 802.11 frame
|
|
received and copy the data from the big (32768 byte) skb.
|
|
|
|
With this patch, "iperf3 -c 192.168.0.1 -R --udp -b 0" shows only 1-2%
|
|
of datagrams are lost, and torrents can reach download speeds of 36
|
|
MiB/s.
|
|
|
|
Tested with RTL8812AU and RTL8822CU.
|
|
|
|
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
|
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Link: https://patch.msgid.link/8c9d4f9d-ebd8-4dc0-a0c4-9ebe430521dd@gmail.com
|
|
---
|
|
drivers/net/wireless/realtek/rtw88/usb.c | 52 ++++++++++++++----------
|
|
1 file changed, 31 insertions(+), 21 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/realtek/rtw88/usb.c
|
|
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
|
|
@@ -7,6 +7,7 @@
|
|
#include <linux/mutex.h>
|
|
#include "main.h"
|
|
#include "debug.h"
|
|
+#include "mac.h"
|
|
#include "reg.h"
|
|
#include "tx.h"
|
|
#include "rx.h"
|
|
@@ -547,49 +548,58 @@ static void rtw_usb_rx_handler(struct wo
|
|
{
|
|
struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, rx_work);
|
|
struct rtw_dev *rtwdev = rtwusb->rtwdev;
|
|
- const struct rtw_chip_info *chip = rtwdev->chip;
|
|
- u32 pkt_desc_sz = chip->rx_pkt_desc_sz;
|
|
struct ieee80211_rx_status rx_status;
|
|
- u32 pkt_offset, next_pkt, urb_len;
|
|
struct rtw_rx_pkt_stat pkt_stat;
|
|
- struct sk_buff *next_skb;
|
|
+ struct sk_buff *rx_skb;
|
|
struct sk_buff *skb;
|
|
+ u32 pkt_desc_sz = rtwdev->chip->rx_pkt_desc_sz;
|
|
+ u32 max_skb_len = pkt_desc_sz + PHY_STATUS_SIZE * 8 +
|
|
+ IEEE80211_MAX_MPDU_LEN_VHT_11454;
|
|
+ u32 pkt_offset, next_pkt, skb_len;
|
|
u8 *rx_desc;
|
|
int limit;
|
|
|
|
for (limit = 0; limit < 200; limit++) {
|
|
- skb = skb_dequeue(&rtwusb->rx_queue);
|
|
- if (!skb)
|
|
+ rx_skb = skb_dequeue(&rtwusb->rx_queue);
|
|
+ if (!rx_skb)
|
|
break;
|
|
|
|
if (skb_queue_len(&rtwusb->rx_queue) >= RTW_USB_MAX_RXQ_LEN) {
|
|
dev_dbg_ratelimited(rtwdev->dev, "failed to get rx_queue, overflow\n");
|
|
- dev_kfree_skb_any(skb);
|
|
+ dev_kfree_skb_any(rx_skb);
|
|
continue;
|
|
}
|
|
|
|
- urb_len = skb->len;
|
|
+ rx_desc = rx_skb->data;
|
|
|
|
do {
|
|
- rx_desc = skb->data;
|
|
rtw_rx_query_rx_desc(rtwdev, rx_desc, &pkt_stat,
|
|
&rx_status);
|
|
pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
|
|
pkt_stat.shift;
|
|
|
|
- next_pkt = round_up(pkt_stat.pkt_len + pkt_offset, 8);
|
|
+ skb_len = pkt_stat.pkt_len + pkt_offset;
|
|
+ if (skb_len > max_skb_len) {
|
|
+ rtw_dbg(rtwdev, RTW_DBG_USB,
|
|
+ "skipping too big packet: %u\n",
|
|
+ skb_len);
|
|
+ goto skip_packet;
|
|
+ }
|
|
+
|
|
+ skb = alloc_skb(skb_len, GFP_KERNEL);
|
|
+ if (!skb) {
|
|
+ rtw_dbg(rtwdev, RTW_DBG_USB,
|
|
+ "failed to allocate RX skb of size %u\n",
|
|
+ skb_len);
|
|
+ goto skip_packet;
|
|
+ }
|
|
|
|
- if (urb_len >= next_pkt + pkt_desc_sz)
|
|
- next_skb = skb_clone(skb, GFP_KERNEL);
|
|
- else
|
|
- next_skb = NULL;
|
|
+ skb_put_data(skb, rx_desc, skb_len);
|
|
|
|
if (pkt_stat.is_c2h) {
|
|
- skb_trim(skb, pkt_stat.pkt_len + pkt_offset);
|
|
rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb);
|
|
} else {
|
|
skb_pull(skb, pkt_offset);
|
|
- skb_trim(skb, pkt_stat.pkt_len);
|
|
rtw_update_rx_freq_for_invalid(rtwdev, skb,
|
|
&rx_status,
|
|
&pkt_stat);
|
|
@@ -598,12 +608,12 @@ static void rtw_usb_rx_handler(struct wo
|
|
ieee80211_rx_irqsafe(rtwdev->hw, skb);
|
|
}
|
|
|
|
- skb = next_skb;
|
|
- if (skb)
|
|
- skb_pull(skb, next_pkt);
|
|
+skip_packet:
|
|
+ next_pkt = round_up(skb_len, 8);
|
|
+ rx_desc += next_pkt;
|
|
+ } while (rx_desc + pkt_desc_sz < rx_skb->data + rx_skb->len);
|
|
|
|
- urb_len -= next_pkt;
|
|
- } while (skb);
|
|
+ dev_kfree_skb_any(rx_skb);
|
|
}
|
|
}
|
|
|