mac80211: allow non-standard VHT MCS-10/11
Subsystems (2)
Ping-Ke Shih
maintainerPATCH v2 1/3 mac80211: allow non-standard VHT MCS-10/11
Some AP can possibly try non-standard VHT rate and mac80211 warns and drops packets, and leads low TCP throughput.
Rate marked as a VHT rate but data is invalid: MCS: 10, NSS: 2
WARNING: CPU: 1 PID: 7817 at net/mac80211/rx.c:4856 ieee80211_rx_list+0x223/0x2f0 [mac8021
Since commit c27aa56a72b8 ("cfg80211: add VHT rate entries for MCS-10 and MCS-11") has added, mac80211 adds this support as well.
After this patch, throughput is good and iw can get the bitrate:
rx bitrate: 975.1 MBit/s VHT-MCS 10 80MHz short GI VHT-NSS 2
or
rx bitrate: 1083.3 MBit/s VHT-MCS 11 80MHz short GI VHT-NSS 2
---
v2: allow VHT MCS-10/11 in mac80211. v1 doesn't have this.
--- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rx.c +1 -1
@@ -4924,7 +4924,7 @@ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, goto drop;break ;case RX_ENC_VHT : - if (WARN_ONCE(status->rate_idx > 9 || + if (WARN_ONCE(status->rate_idx > 11 || !status->nss || status->nss > 8, "Rate marked as a VHT rate but data is invalid: MCS: %d, NSS: %d\n",
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 2/3 rtw89: Add RX counters of VHT MCS-10/11 to debugfs
8852AE can receive packets with VHT MCS10/11, and we want to know we have received this kind of packets, so show the counter of VHT MCS10/11 in debugfs, like:
TP TX: 1 [1] Mbps (lv: 1), RX: 420 [422] Mbps (lv: 4)
Beacon: 19
Avg packet length: TX=102, RX=3081
RX count:
Legacy: [0, 0, 0, 0]
OFDM: [0, 0, 0, 0, 0, 0, 0, 0]
HT 0: [0, 0, 0, 0, 0, 0, 0, 0]
HT 1: [0, 0, 0, 0, 0, 0, 0, 0] VHT 1SS: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0][0, 0] VHT 2SS: [0, 0, 0, 0, 0, 0, 0, 4, 624, 4818][29913, 556]
HE 1SS: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] HE 2ss: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
TX rate [0]: VHT 2SS MCS-9 SGI (hw_rate=0x119) ==> agg_wait=1 (3500)
RX rate [0]: VHT 2SS MCS-10 SGI (hw_rate=0x11a)
RSSI: -30 dBm (raw=161, prev=165)
---
v2: remove VHT MCS-10/11 limit from driver, and change subject.
--- drivers/net/wireless/realtek/rtw89/debug.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +14 -8
@@ -2322,16 +2322,17 @@ rtw89_debug_append_rx_rate(struct seq_file *m, struct rtw89_pkt_stat *pkt_stat,static const struct rtw89_rx_rate_cnt_info {enum rtw89_hw_rate first_rate;int len; +int ext;const char *rate_mode; } rtw89_rx_rate_cnt_infos[] = { - {RTW89_HW_RATE_CCK1 ,4 ,"Legacy:" }, - {RTW89_HW_RATE_OFDM6 ,8 ,"OFDM:" }, - {RTW89_HW_RATE_MCS0 ,8 ,"HT 0:" }, - {RTW89_HW_RATE_MCS8 ,8 ,"HT 1:" }, - {RTW89_HW_RATE_VHT_NSS1_MCS0 ,10 ,"VHT 1SS:" }, - {RTW89_HW_RATE_VHT_NSS2_MCS0 ,10 ,"VHT 2SS:" }, - {RTW89_HW_RATE_HE_NSS1_MCS0 ,12 ,"HE 1SS:" }, - {RTW89_HW_RATE_HE_NSS2_MCS0 ,12 ,"HE 2ss:" }, + {RTW89_HW_RATE_CCK1 ,4 ,0 ,"Legacy:" }, + {RTW89_HW_RATE_OFDM6 ,8 ,0 ,"OFDM:" }, + {RTW89_HW_RATE_MCS0 ,8 ,0 ,"HT 0:" }, + {RTW89_HW_RATE_MCS8 ,8 ,0 ,"HT 1:" }, + {RTW89_HW_RATE_VHT_NSS1_MCS0 ,10 ,2 ,"VHT 1SS:" }, + {RTW89_HW_RATE_VHT_NSS2_MCS0 ,10 ,2 ,"VHT 2SS:" }, + {RTW89_HW_RATE_HE_NSS1_MCS0 ,12 ,0 ,"HE 1SS:" }, + {RTW89_HW_RATE_HE_NSS2_MCS0 ,12 ,0 ,"HE 2ss:" }, };static int rtw89_debug_priv_phy_info_get (struct seq_file *m,void *v)
@@ -2356,6 +2357,11 @@ static int rtw89_debug_priv_phy_info_get(struct seq_file *m, void *v)seq_printf (m,"%10s [" , info->rate_mode);rtw89_debug_append_rx_rate (m, pkt_stat, info->first_rate, info->len); +if (info->ext) { +seq_puts (m,"][" ); +rtw89_debug_append_rx_rate (m, pkt_stat, + info->first_rate + info->len, info->ext); + }seq_puts (m,"]\n" ); }
Signature · 1 line
2.25.1
Re: [PATCH v2 2/3] rtw89: Add RX counters of VHT MCS-10/11 to debugfs
Quoted 20 lines · Ping-Ke Shih
8852AE can receive packets with VHT MCS10/11, and we want to know we have received this kind of packets, so show the counter of VHT MCS10/11 in debugfs, like:
TP TX: 1 [1] Mbps (lv: 1), RX: 420 [422] Mbps (lv: 4)
Beacon: 19
Avg packet length: TX=102, RX=3081
RX count:Legacy: [0, 0, 0, 0] OFDM: [0, 0, 0, 0, 0, 0, 0, 0] HT 0: [0, 0, 0, 0, 0, 0, 0, 0] HT 1: [0, 0, 0, 0, 0, 0, 0, 0]VHT 1SS: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0][0, 0] VHT 2SS: [0, 0, 0, 0, 0, 0, 0, 4, 624, 4818][29913, 556]
HE 1SS: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] HE 2ss: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
TX rate [0]: VHT 2SS MCS-9 SGI (hw_rate=0x119) ==> agg_wait=1 (3500)
RX rate [0]: VHT 2SS MCS-10 SGI (hw_rate=0x11a)
RSSI: -30 dBm (raw=161, prev=165)
Quoted 1 line
Signed-off-by Ping-Ke Shih <[email protected]>
2 patches applied to wireless-next.git, thanks.
e56f3420106e rtw89: Add RX counters of VHT MCS-10/11 to debugfs c1ea345deda8 rtw89: encapsulate RX handlers to single function
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH v2 3/3 rtw89: encapsulate RX handlers to single function
In reply to Ping-Ke ShihWe have three points to receive packets to mac80211 with three different kinds of status. Many handlers are common and can be shared, so I move them together, and I don't change the logic at all.
--- drivers/net/wireless/realtek/rtw89/core.c | 32 ++++++++++++----------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +17 -15
@@ -1085,6 +1085,18 @@ static void rtw89_core_hw_to_sband_rate(struct ieee80211_rx_status *rx_status) rx_status->rate_idx -=4 ; } +static void rtw89_core_rx_to_mac80211 (struct rtw89_dev *rtwdev, +struct rtw89_rx_phy_ppdu *phy_ppdu, +struct rtw89_rx_desc_info *desc_info, +struct sk_buff *skb_ppdu, +struct ieee80211_rx_status *rx_status) +{ +rtw89_core_hw_to_sband_rate (rx_status); +rtw89_core_rx_stats (rtwdev, phy_ppdu, desc_info, skb_ppdu); +ieee80211_rx_napi (rtwdev->hw,NULL , skb_ppdu, &rtwdev->napi); + rtwdev->napi_budget_countdown--; +} + static void rtw89_core_rx_pending_skb(struct rtw89_dev *rtwdev, struct rtw89_rx_phy_ppdu *phy_ppdu, struct rtw89_rx_desc_info *desc_info,
@@ -1104,10 +1116,7 @@ static void rtw89_core_rx_pending_skb(struct rtw89_dev *rtwdev,if (rtw89_core_rx_ppdu_match (rtwdev, desc_info, rx_status))rtw89_chip_query_ppdu (rtwdev, phy_ppdu, rx_status);rtw89_correct_cck_chan (rtwdev, rx_status); -rtw89_core_hw_to_sband_rate (rx_status); -rtw89_core_rx_stats (rtwdev, phy_ppdu, desc_info, skb_ppdu); -ieee80211_rx_napi (rtwdev->hw,NULL , skb_ppdu, &rtwdev->napi); - rtwdev->napi_budget_countdown--; +rtw89_core_rx_to_mac80211 (rtwdev, phy_ppdu, desc_info, skb_ppdu, rx_status); } }
@@ -1332,10 +1341,7 @@ static void rtw89_core_flush_ppdu_rx_queue(struct rtw89_dev *rtwdev, skb_queue_walk_safe(&ppdu_sts->rx_queue[band], skb_ppdu, tmp) {skb_unlink (skb_ppdu, &ppdu_sts->rx_queue[band]); rx_status =IEEE80211_SKB_RXCB (skb_ppdu); -rtw89_core_hw_to_sband_rate (rx_status); -rtw89_core_rx_stats (rtwdev,NULL , desc_info, skb_ppdu); -ieee80211_rx_napi (rtwdev->hw,NULL , skb_ppdu, &rtwdev->napi); - rtwdev->napi_budget_countdown--; +rtw89_core_rx_to_mac80211 (rtwdev,NULL , desc_info, skb_ppdu, rx_status); } }
@@ -1362,14 +1368,10 @@ void rtw89_core_rx(struct rtw89_dev *rtwdev,memset (rx_status,0 ,sizeof (*rx_status));rtw89_core_update_rx_status (rtwdev, desc_info, rx_status);if (desc_info->long_rxdesc && -BIT (desc_info->frame_type) &PPDU_FILTER_BITMAP ) { +BIT (desc_info->frame_type) &PPDU_FILTER_BITMAP )skb_queue_tail (&ppdu_sts->rx_queue[band], skb); - }else { -rtw89_core_hw_to_sband_rate (rx_status); -rtw89_core_rx_stats (rtwdev,NULL , desc_info, skb); -ieee80211_rx_napi (rtwdev->hw,NULL , skb, &rtwdev->napi); - rtwdev->napi_budget_countdown--; - } +else +rtw89_core_rx_to_mac80211 (rtwdev,NULL , desc_info, skb, rx_status); }EXPORT_SYMBOL (rtw89_core_rx);
Signature · 1 line
2.25.1