From patchwork Fri Mar 19 23:38:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 12152107 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 127E6C433DB for ; Fri, 19 Mar 2021 23:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE3496192F for ; Fri, 19 Mar 2021 23:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229787AbhCSXjZ (ORCPT ); Fri, 19 Mar 2021 19:39:25 -0400 Received: from mail2.candelatech.com ([208.74.158.173]:32860 "EHLO mail3.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229770AbhCSXiz (ORCPT ); Fri, 19 Mar 2021 19:38:55 -0400 Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 2B6DC13C2B4; Fri, 19 Mar 2021 16:38:54 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 2B6DC13C2B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1616197134; bh=7xYNXoy1X5a0IYrGYAkYDEcWlSesYUujs0cRAS2jiyI=; h=From:To:Cc:Subject:Date:From; b=kWfIXJwz8pSNym2fkW/+MGURKf5/8+Rho3uima6Pjuj7v1w3NiWgFlFruf8nJFSAI 0WA3CiIxFuC9Y55AGNs26G+NScT/bBuEp/7I9/Dr5jysUG8HKLClhTbbZ2UOYU6cD0 QDgFAbFOSeIyItAh+ps3u0NhlqpHDq8BdItBAK+c= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 1/3] mac80211: Fix station rx-packets counters. Date: Fri, 19 Mar 2021 16:38:48 -0700 Message-Id: <20210319233850.2238-1-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear I noticed 'iw dev wlan6 station dump' showed almost no rx-packets one one of my radios. The rx-amsdu path did not appear to gather any stats, and after code inspection, neither did the rx-data handler. Add common method to deal with these stats. Verified in AX and /a mode, stats look at least generally correct now. Signed-off-by: Ben Greear --- net/mac80211/rx.c | 54 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index eb8225209005..4a64c2183a27 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1713,6 +1713,27 @@ ieee80211_rx_h_uapsd_and_pspoll(struct ieee80211_rx_data *rx) return RX_CONTINUE; } +static void ieee80211_update_data_rx_stats(struct ieee80211_rx_data *rx, + struct ieee80211_sta_rx_stats *stats, + struct ieee80211_rx_status *status, + int skb_len) +{ + stats->fragments++; + stats->packets++; + stats->last_rx = jiffies; + stats->last_rate = sta_stats_encode_rate(status); + + /* The seqno index has the same property as needed + * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS + * for non-QoS-data frames. Here we know it's a data + * frame, so count MSDUs. + */ + u64_stats_update_begin(&stats->syncp); + stats->msdu[rx->seqno_idx]++; + stats->bytes += skb_len; + u64_stats_update_end(&stats->syncp); +} + static ieee80211_rx_result debug_noinline ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) { @@ -2706,6 +2727,8 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; __le16 fc = hdr->frame_control; + ieee80211_rx_result rv; + int orig_len = skb->len; if (!(status->rx_flags & IEEE80211_RX_AMSDU)) return RX_CONTINUE; @@ -2734,7 +2757,12 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) if (is_multicast_ether_addr(hdr->addr1)) return RX_DROP_UNUSABLE; - return __ieee80211_rx_h_amsdu(rx, 0); + rv = __ieee80211_rx_h_amsdu(rx, 0); + if ((rv == RX_QUEUED) && (rx->sta)) { + struct ieee80211_sta_rx_stats *stats = &rx->sta->rx_stats; + ieee80211_update_data_rx_stats(rx, stats, status, orig_len); + } + return rv; } #ifdef CONFIG_MAC80211_MESH @@ -2958,6 +2986,13 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx) mod_timer(&local->dynamic_ps_timer, jiffies + msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); + + if (rx->sta) { + struct ieee80211_sta_rx_stats *stats = &rx->sta->rx_stats; + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb); + ieee80211_update_data_rx_stats(rx, stats, status, rx->skb->len); + } + ieee80211_deliver_skb(rx); return RX_QUEUED; @@ -4400,12 +4435,6 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, return true; } - stats->last_rx = jiffies; - stats->last_rate = sta_stats_encode_rate(status); - - stats->fragments++; - stats->packets++; - /* do the header conversion - first grab the addresses */ ether_addr_copy(addrs.da, skb->data + fast_rx->da_offs); ether_addr_copy(addrs.sa, skb->data + fast_rx->sa_offs); @@ -4416,18 +4445,9 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, skb->dev = fast_rx->dev; + ieee80211_update_data_rx_stats(rx, stats, status, orig_len); dev_sw_netstats_rx_add(fast_rx->dev, skb->len); - /* The seqno index has the same property as needed - * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS - * for non-QoS-data frames. Here we know it's a data - * frame, so count MSDUs. - */ - u64_stats_update_begin(&stats->syncp); - stats->msdu[rx->seqno_idx]++; - stats->bytes += orig_len; - u64_stats_update_end(&stats->syncp); - if (fast_rx->internal_forward) { struct sk_buff *xmit_skb = NULL; if (is_multicast_ether_addr(addrs.da)) { From patchwork Fri Mar 19 23:38:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 12152109 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CCA5C433E0 for ; Fri, 19 Mar 2021 23:39:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7C436196D for ; Fri, 19 Mar 2021 23:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbhCSXj0 (ORCPT ); Fri, 19 Mar 2021 19:39:26 -0400 Received: from mail2.candelatech.com ([208.74.158.173]:32868 "EHLO mail3.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbhCSXi6 (ORCPT ); Fri, 19 Mar 2021 19:38:58 -0400 Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id ACE5A13C2B6; Fri, 19 Mar 2021 16:38:55 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com ACE5A13C2B6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1616197135; bh=H9/92mFXqYzGrgud6h8bpb3j19l3NYziPihWMRS93C0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIy9BMk6zQECh4bfanUwVqZ0fKIfrGaoT6W1oP7ROO/LYLzILBfiWFbKEeCcLhjQI 1zgIKZSa16VeK6244SwA30+5tUNOCy5soTErCACH08cwjeO2GZv2ymse5Kn8ldKUW7 hixWVvjeLX38R4opjTiB7X37iAeVpGcEyzq+thns= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 2/3] mac80211: Provide per-station stats in debugfs Date: Fri, 19 Mar 2021 16:38:49 -0700 Message-Id: <20210319233850.2238-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210319233850.2238-1-greearb@candelatech.com> References: <20210319233850.2238-1-greearb@candelatech.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear Including per tid and per acs stats. Nice for those who like to peer deep into the guts of a system. Signed-off-by: Ben Greear --- net/mac80211/debugfs_sta.c | 88 ++++++++++++++++++++++++++++++++++++++ net/mac80211/sta_info.c | 33 ++++++++++++++ net/mac80211/sta_info.h | 4 ++ 3 files changed, 125 insertions(+) diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 1deacce85177..374db61527a9 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -102,6 +102,93 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, } STA_OPS(flags); +static ssize_t sta_stats_read(struct file *file, char __user *userbuf, + size_t count, loff_t *ppos) +{ + struct sta_info *sta = file->private_data; + unsigned int len = 0; + const int buf_len = 8000; + char *buf = kzalloc(buf_len, GFP_KERNEL); + unsigned long sum; + char tmp[60]; + int i; + struct ieee80211_sta_rx_stats rx_stats = {0}; + + if (!buf) + return -ENOMEM; + + sta_accum_rx_stats(sta, &rx_stats); + +#define PRINT_MY_STATS(a, b) do { \ + len += scnprintf(buf + len, buf_len - len, "%30s %18lu\n", a, (unsigned long)(b)); \ + if (len >= buf_len) { \ + goto done; \ + } \ + } while (0) + +#define PRINT_MY_STATS_S(a, b) do { \ + len += scnprintf(buf + len, buf_len - len, "%30s %18ld\n", a, (long)(b)); \ + if (len >= buf_len) { \ + goto done; \ + } \ + } while (0) + + PRINT_MY_STATS("rx-packets", rx_stats.packets); + PRINT_MY_STATS("rx-bytes", rx_stats.bytes); + PRINT_MY_STATS("rx-dup", rx_stats.num_duplicates); + PRINT_MY_STATS("rx-fragments", rx_stats.fragments); + PRINT_MY_STATS("rx-dropped", rx_stats.dropped); + PRINT_MY_STATS_S("rx-last-signal", rx_stats.last_signal); + + for (i = 0; itx_stats.packets[0] + sta->tx_stats.packets[1] + + sta->tx_stats.packets[2] + sta->tx_stats.packets[3]; + PRINT_MY_STATS("tx-packets", sum); + + sum = sta->tx_stats.bytes[0] + sta->tx_stats.bytes[1] + + sta->tx_stats.bytes[2] + sta->tx_stats.bytes[3]; + PRINT_MY_STATS("tx-bytes", sum); + + /* per txq stats */ + PRINT_MY_STATS("tx-packets-acs[VO]", sta->tx_stats.packets[IEEE80211_AC_VO]); + PRINT_MY_STATS("tx-packets-acs[VI]", sta->tx_stats.packets[IEEE80211_AC_VI]); + PRINT_MY_STATS("tx-packets-acs[BE]", sta->tx_stats.packets[IEEE80211_AC_BE]); + PRINT_MY_STATS("tx-packets-acs[BK]", sta->tx_stats.packets[IEEE80211_AC_BK]); + + PRINT_MY_STATS("tx-bytes-acs[VO]", sta->tx_stats.bytes[IEEE80211_AC_VO]); + PRINT_MY_STATS("tx-bytes-acs[VI]", sta->tx_stats.bytes[IEEE80211_AC_VI]); + PRINT_MY_STATS("tx-bytes-acs[BE]", sta->tx_stats.bytes[IEEE80211_AC_BE]); + PRINT_MY_STATS("tx-bytes-acs[BK]", sta->tx_stats.bytes[IEEE80211_AC_BK]); + + len += scnprintf(buf + len, buf_len - len, "\n"); + for (i = 0; i<=IEEE80211_NUM_TIDS; i++) { + sprintf(tmp, "tx-msdu-tid[%2i]", i); + PRINT_MY_STATS(tmp, sta->tx_stats.msdu[i]); + } + + len += scnprintf(buf + len, buf_len - len, "\n"); + for (i = 0; i<=IEEE80211_NUM_TIDS; i++) { + sprintf(tmp, "rx-msdu-tid[%2i]", i); + PRINT_MY_STATS(tmp, rx_stats.msdu[i]); + } + +#undef PRINT_MY_STATS +done: + i = simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf)); + kfree(buf); + return i; +} +STA_OPS(stats); + static ssize_t sta_num_ps_buf_frames_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) @@ -1073,6 +1160,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) sta->debugfs_dir = debugfs_create_dir(mac, stations_dir); DEBUGFS_ADD(flags); + DEBUGFS_ADD(stats); DEBUGFS_ADD(aid); DEBUGFS_ADD(num_ps_buf_frames); DEBUGFS_ADD(last_seq_ctrl); diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index b096370b45b1..aa95db547465 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2650,6 +2650,39 @@ static void sta_update_codel_params(struct sta_info *sta, u32 thr) } } +void sta_accum_rx_stats(struct sta_info *sta, + struct ieee80211_sta_rx_stats *rx_stats) +{ + int cpu; + int i; + + memcpy(rx_stats, &sta->rx_stats, sizeof(*rx_stats)); + + if (!sta->pcpu_rx_stats) + return; + + for_each_possible_cpu(cpu) { + struct ieee80211_sta_rx_stats *cpurxs; + + cpurxs = per_cpu_ptr(sta->pcpu_rx_stats, cpu); + rx_stats->packets += cpurxs->packets; + if (time_after(cpurxs->last_rx, rx_stats->last_rx)) { + rx_stats->last_rx = cpurxs->last_rx; + rx_stats->last_signal = cpurxs->last_signal; + for (i = 0; ichain_signal_last[i] = cpurxs->chain_signal_last[i]; + rx_stats->last_rate = cpurxs->last_rate; + } + rx_stats->num_duplicates += cpurxs->num_duplicates; + rx_stats->fragments += cpurxs->fragments; + rx_stats->dropped += cpurxs->dropped; + rx_stats->bytes += sta_get_stats_bytes(cpurxs); + for (i = 0; i<=IEEE80211_NUM_TIDS; i++) { + rx_stats->msdu[i] += sta_get_tidstats_msdu(cpurxs, i); + } + } +} + void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta, u32 thr) { diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 897b4d12103e..a6b13d749ffa 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -422,6 +422,7 @@ struct mesh_sta { DECLARE_EWMA(signal, 10, 8) +/* Update sta_accum_rx_stats if you change this structure. */ struct ieee80211_sta_rx_stats { unsigned long packets; unsigned long last_rx; @@ -907,4 +908,7 @@ static inline u32 sta_stats_encode_rate(struct ieee80211_rx_status *s) return r; } +void sta_accum_rx_stats(struct sta_info *sta, + struct ieee80211_sta_rx_stats *rx_stats); + #endif /* STA_INFO_H */ From patchwork Fri Mar 19 23:38:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 12152105 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D49CC433C1 for ; Fri, 19 Mar 2021 23:39:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D67D16192F for ; Fri, 19 Mar 2021 23:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229791AbhCSXj0 (ORCPT ); Fri, 19 Mar 2021 19:39:26 -0400 Received: from mail2.candelatech.com ([208.74.158.173]:32874 "EHLO mail3.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229805AbhCSXjB (ORCPT ); Fri, 19 Mar 2021 19:39:01 -0400 Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id C156213C2B4; Fri, 19 Mar 2021 16:38:59 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com C156213C2B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1616197139; bh=W06k0Qa1pqRTvusUWkWmeXNgVbbmIJt8L6siWOzPPOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E6dZUf1q5UXnS68R0EUUbDIApMU/Oxhs4WCU5TSnCZFy6gKM3mNSh+s3oIQGFTIq6 lfMR9HCSw3VBpiM9P5G2PS8aPUaWymP1sUGFcnm82+IRcvf6gP923jsGjDKesXtGrC D6uLHCcKiCngf+/hvtJVmi7zqqkclZGH08IRJyZM= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 3/3] mac80211: Provide detailed station rx stats. Date: Fri, 19 Mar 2021 16:38:50 -0700 Message-Id: <20210319233850.2238-3-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210319233850.2238-1-greearb@candelatech.com> References: <20210319233850.2238-1-greearb@candelatech.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear This provides histograms of different encoding types, nss, rate-idx, and some ofdma related stats. The goal is general visibility into what is going on with rate control, ofdma, etc. Signed-off-by: Ben Greear --- include/uapi/linux/nl80211.h | 1 + net/mac80211/Kconfig | 11 +++++++++ net/mac80211/debugfs_sta.c | 31 ++++++++++++++++++++++++ net/mac80211/rx.c | 46 ++++++++++++++++++++++++++++++++++++ net/mac80211/sta_info.c | 17 +++++++++++++ net/mac80211/sta_info.h | 18 ++++++++++++++ 6 files changed, 124 insertions(+) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 55e7be30a930..8f548a599134 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -3269,6 +3269,7 @@ enum nl80211_he_ru_alloc { NL80211_RATE_INFO_HE_RU_ALLOC_484, NL80211_RATE_INFO_HE_RU_ALLOC_996, NL80211_RATE_INFO_HE_RU_ALLOC_2x996, + NL80211_RATE_INFO_HE_RU_ALLOC_LAST /* new entries before this */ }; /** diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 51ec8256b7fa..b0ebb64b3950 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -295,6 +295,17 @@ config MAC80211_DEBUG_COUNTERS If unsure, say N. +config MAC80211_DEBUG_STA_COUNTERS + bool "Extra Station TX/RX statistics" + depends on MAC80211_DEBUG_MENU + depends on MAC80211_DEBUGFS + help + Selecting this option causes mac80211 to keep additional + and very verbose station-specific TX and RX statistics + These will be exposed in debugfs. + + If unsure, say N. + config MAC80211_STA_HASH_MAX_SIZE int "Station hash table maximum size" if MAC80211_DEBUG_MENU default 0 diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 374db61527a9..b9f8670c2a28 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -181,6 +181,37 @@ static ssize_t sta_stats_read(struct file *file, char __user *userbuf, PRINT_MY_STATS(tmp, rx_stats.msdu[i]); } +#ifdef CONFIG_MAC80211_DEBUG_STA_COUNTERS + PRINT_MY_STATS("rx-bw-20", rx_stats.msdu_20); + PRINT_MY_STATS("rx-bw-40", rx_stats.msdu_40); + PRINT_MY_STATS("rx-bw-80", rx_stats.msdu_80); + PRINT_MY_STATS("rx-bw-160", rx_stats.msdu_160); + + PRINT_MY_STATS("rx-he-total", rx_stats.msdu_he_tot); + PRINT_MY_STATS("rx-he-mu", rx_stats.msdu_he_mu); + PRINT_MY_STATS("rx-vht", rx_stats.msdu_vht); + PRINT_MY_STATS("rx-ht", rx_stats.msdu_ht); + PRINT_MY_STATS("rx-legacy", rx_stats.msdu_legacy); + + PRINT_MY_STATS("rx-he-ru-alloc[ 26]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_26]); + PRINT_MY_STATS("rx-he-ru-alloc[ 52]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_52]); + PRINT_MY_STATS("rx-he-ru-alloc[ 106]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_106]); + PRINT_MY_STATS("rx-he-ru-alloc[ 242]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_242]); + PRINT_MY_STATS("rx-he-ru-alloc[ 484]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_484]); + PRINT_MY_STATS("rx-he-ru-alloc[ 996]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_996]); + PRINT_MY_STATS("rx-he-ru-alloc[2x996]", rx_stats.msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_2x996]); + + for (i = 0; i<8; i++) { + sprintf(tmp, "rx-msdu-nss[%i]", i); + PRINT_MY_STATS(tmp, rx_stats.msdu_nss[i]); + } + + for (i = 0; i<32; i++) { + sprintf(tmp, "rx-rate-idx[%3i]", i); + PRINT_MY_STATS(tmp, rx_stats.msdu_rate_idx[i]); + } +#endif + #undef PRINT_MY_STATS done: i = simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf)); diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 4a64c2183a27..c3bed954e5f6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1732,6 +1732,52 @@ static void ieee80211_update_data_rx_stats(struct ieee80211_rx_data *rx, stats->msdu[rx->seqno_idx]++; stats->bytes += skb_len; u64_stats_update_end(&stats->syncp); + +#ifdef CONFIG_MAC80211_DEBUG_STA_COUNTERS + /* This code has a lot in common with ieee80211_add_rx_radiotap_header */ + switch (status->bw) { + case RATE_INFO_BW_20: + stats->msdu_20++; + break; + case RATE_INFO_BW_40: + stats->msdu_40++; + break; + case RATE_INFO_BW_80: + stats->msdu_80++; + break; + case RATE_INFO_BW_160: + stats->msdu_160++; + break; + case RATE_INFO_BW_HE_RU: + stats->msdu_he_ru_alloc[status->he_ru]++; + break; + }; + + if (status->encoding == RX_ENC_HE) { + stats->msdu_he_tot++; + if (status->flag & RX_FLAG_RADIOTAP_HE_MU) + stats->msdu_he_mu++; + } + else if (status->encoding == RX_ENC_VHT) { + stats->msdu_vht++; + } + else if (status->encoding == RX_ENC_HT) { + stats->msdu_ht++; + } + else { + stats->msdu_legacy++; + } + + if (status->nss >= 7) + stats->msdu_nss[7]++; + else + stats->msdu_nss[status->nss]++; + + if (status->rate_idx >= 31) + stats->msdu_rate_idx[31]++; + else + stats->msdu_rate_idx[status->rate_idx]++; +#endif } static ieee80211_rx_result debug_noinline diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index aa95db547465..cc2bbdcf2b6a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2680,6 +2680,23 @@ void sta_accum_rx_stats(struct sta_info *sta, for (i = 0; i<=IEEE80211_NUM_TIDS; i++) { rx_stats->msdu[i] += sta_get_tidstats_msdu(cpurxs, i); } +#ifdef CONFIG_MAC80211_DEBUG_STA_COUNTERS + rx_stats->msdu_20 += cpurxs->msdu_20; + rx_stats->msdu_40 += cpurxs->msdu_40; + rx_stats->msdu_80 += cpurxs->msdu_80; + rx_stats->msdu_160 += cpurxs->msdu_160; + for (i = 0; imsdu_he_ru_alloc[i] += cpurxs->msdu_he_ru_alloc[i]; + rx_stats->msdu_he_tot += cpurxs->msdu_he_tot; + rx_stats->msdu_he_mu += cpurxs->msdu_he_mu; + rx_stats->msdu_vht += cpurxs->msdu_vht; + rx_stats->msdu_ht += cpurxs->msdu_ht; + rx_stats->msdu_legacy += cpurxs->msdu_legacy; + for (i = 0; i<8; i++) + rx_stats->msdu_nss[i] += cpurxs->msdu_nss[i]; + for (i = 0; i<32; i++) + rx_stats->msdu_rate_idx[i] += cpurxs->msdu_rate_idx[i]; +#endif } } diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index a6b13d749ffa..8c9866528a4c 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -436,6 +436,24 @@ struct ieee80211_sta_rx_stats { struct u64_stats_sync syncp; u64 bytes; u64 msdu[IEEE80211_NUM_TIDS + 1]; + +#ifdef CONFIG_MAC80211_DEBUG_STA_COUNTERS + /* these take liberty with how things are defined, and are + * designed to give a rough idea of how things are going. + */ + u32 msdu_20; + u32 msdu_40; + u32 msdu_80; + u32 msdu_160; + u32 msdu_he_ru_alloc[NL80211_RATE_INFO_HE_RU_ALLOC_LAST]; + u32 msdu_he_tot; + u32 msdu_he_mu; + u32 msdu_vht; + u32 msdu_ht; + u32 msdu_legacy; + u32 msdu_nss[8]; + u32 msdu_rate_idx[32]; +#endif }; /*