From patchwork Tue May 8 11:22:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 10385981 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 57AC860353 for ; Tue, 8 May 2018 11:22:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46D2328D3E for ; Tue, 8 May 2018 11:22:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ACD528D67; Tue, 8 May 2018 11:22:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 875EC28D3E for ; Tue, 8 May 2018 11:22:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753152AbeEHLWQ (ORCPT ); Tue, 8 May 2018 07:22:16 -0400 Received: from mail.toke.dk ([52.28.52.200]:37373 "EHLO mail.toke.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbeEHLWP (ORCPT ); Tue, 8 May 2018 07:22:15 -0400 Subject: [PATCH v2 1/2] iw: Print TXQ statistics for stations and interfaces DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1525778532; bh=KK4T36wJSr06vtXhV2EHnO7AOOAlVLANcHdFMg3pv64=; h=Subject:From:To:Cc:Date:From; b=UtCLzHbbUdixEIwf4NXFctVRUUeoD6txKHLYmu+k8rcC99SyW9pLipY4NrFyBuc3+ gPUELqSbbplk+6ssms2PBhdp+PnAASQ8oLrPfcTOQWnN91PHyA3gkHdQ0HnZcqIZ2w 0+YJGc3ecN6g0YhM/7Z6qyWG8MkSMMBsc6TtjCytExZOrpFhIIO63FcDmMRaHPrRA2 bdhV2qkPVlHBjv5y9kM55kVs41jWdQaC8bSzGROjl+NSK5rHjdVgqFhbAALJOlI0Ly vlnydXukUmmtojv8NSrYCzbq7n1DGKVCixPG/8/ch751t9/9AjcUQMn0rUvW5hIYzB SVgw7yBO9dNew== From: Toke =?utf-8?q?H=C3=B8iland-J=C3=B8rgensen?= To: linux-wireless@vger.kernel.org Cc: make-wifi-fast@lists.bufferbloat.net Date: Tue, 08 May 2018 13:22:11 +0200 X-Clacks-Overhead: GNU Terry Pratchett Message-ID: <152577853186.32130.16532617444736581736.stgit@alrua-kau> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds printing of TXQ statistics for stations and interfaces when supplied by the kernel. For stations, another section is added when verbose mode is enabled; for interfaces, the multicast queue information is always printed when available. This is the information also available through debugfs in /sys/kernel/debug/ieee80211/phyX/netdev:Y/aqm and /sys/kernel/debug/ieee80211/phyX/netdev:Y/stations/*/aqm. Sample output: $ iw dev wlp2s0 station dump -v Station xx:xx:xx:xx:xx:xx (on wlp2s0) [...] TXQs: TID qsz-byt qsz-pkt flows drops marks overlmt hashcol tx-bytes tx-packets 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 11 0 0 0 0 0 0 0 0 0 12 0 0 0 0 0 0 0 0 0 13 0 0 0 0 0 0 0 0 0 14 0 0 0 0 0 0 0 0 0 15 0 0 0 0 0 0 0 0 0 [...] $ iw dev wlp2s0 info Interface wlp2s0 ifindex 9 wdev 0x1 addr xx:xx:xx:xx:xx:xx type AP wiphy 0 channel 165 (5825 MHz), width: 20 MHz, center1: 5825 MHz txpower 24.00 dBm multicast TXQ: qsz-byt qsz-pkt flows drops marks overlmt hashcol tx-bytes tx-packets 0 0 72 0 0 0 0 7380 72 Signed-off-by: Toke Høiland-Jørgensen --- interface.c | 6 +++++ iw.h | 2 ++ station.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/interface.c b/interface.c index a19c83f..712bbdc 100644 --- a/interface.c +++ b/interface.c @@ -441,6 +441,12 @@ static int print_iface_handler(struct nl_msg *msg, void *arg) indent, txp / 100, txp % 100); } + if (tb_msg[NL80211_ATTR_TXQ_STATS]) { + char buf[150]; + parse_txq_stats(buf, sizeof(buf), tb_msg[NL80211_ATTR_TXQ_STATS], 1, -1, indent); + printf("%s\tmulticast TXQ:%s\n", indent, buf); + } + return NL_SKIP; } diff --git a/iw.h b/iw.h index ee7ca20..47aa27d 100644 --- a/iw.h +++ b/iw.h @@ -183,6 +183,8 @@ unsigned char *parse_hex(char *hex, size_t *outlen); int parse_keys(struct nl_msg *msg, char **argv, int argc); int parse_freqchan(struct chandef *chandef, bool chan, int argc, char **argv, int *parsed); enum nl80211_chan_width str_to_bw(const char *str); +int parse_txq_stats(char *buf, int buflen, struct nlattr *tid_stats_attr, int header, + int tid, const char *indent); int put_chandef(struct nl_msg *msg, struct chandef *chandef); void print_ht_mcs(const __u8 *mcs); diff --git a/station.c b/station.c index 4885dc0..38c5f91 100644 --- a/station.c +++ b/station.c @@ -43,6 +43,62 @@ static void print_power_mode(struct nlattr *a) } } +int parse_txq_stats(char *buf, int buflen, struct nlattr *tid_stats_attr, int header, + int tid, const char *indent) +{ + struct nlattr *txqstats_info[NL80211_TXQ_STATS_MAX + 1], *txqinfo; + static struct nla_policy txqstats_policy[NL80211_TXQ_STATS_MAX + 1] = { + [NL80211_TXQ_STATS_BACKLOG_BYTES] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_BACKLOG_PACKETS] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_FLOWS] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_DROPS] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_ECN_MARKS] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_OVERLIMIT] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_COLLISIONS] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_TX_BYTES] = { .type = NLA_U32 }, + [NL80211_TXQ_STATS_TX_PACKETS] = { .type = NLA_U32 }, + }; + char *pos = buf; + if (nla_parse_nested(txqstats_info, NL80211_TXQ_STATS_MAX, tid_stats_attr, + txqstats_policy)) { + printf("failed to parse nested TXQ stats attributes!"); + return 0; + } + + if (header) + pos += snprintf(buf, buflen, "\n%s\t%s\tqsz-byt\t" + "qsz-pkt\tflows\tdrops\tmarks\toverlmt\t" + "hashcol\ttx-bytes\ttx-packets", indent, + tid >= 0 ? "TID" : ""); + + pos += snprintf(pos, buflen - (pos - buf), "\n%s\t", indent); + if (tid >= 0) + pos += snprintf(pos, buflen - (pos - buf), "%d", tid); + +#define PRINT_STAT(key, spacer) do { \ + txqinfo = txqstats_info[NL80211_TXQ_STATS_ ## key]; \ + pos += snprintf(pos, buflen - (pos - buf), spacer); \ + if (txqinfo) \ + pos += snprintf(pos, buflen - (pos - buf), "%u", \ + nla_get_u32(txqinfo)); \ + } while (0) + + + PRINT_STAT(BACKLOG_BYTES, "\t"); + PRINT_STAT(BACKLOG_PACKETS, "\t"); + PRINT_STAT(FLOWS, "\t"); + PRINT_STAT(DROPS, "\t"); + PRINT_STAT(ECN_MARKS, "\t"); + PRINT_STAT(OVERLIMIT, "\t"); + PRINT_STAT(COLLISIONS, "\t"); + PRINT_STAT(TX_BYTES, "\t"); + PRINT_STAT(TX_PACKETS, "\t\t"); + +#undef PRINT_STAT + + return pos - buf; + +} void parse_tid_stats(struct nlattr *tid_stats_attr) { struct nlattr *stats_info[NL80211_TID_STATS_MAX + 1], *tidattr, *info; @@ -51,8 +107,11 @@ void parse_tid_stats(struct nlattr *tid_stats_attr) [NL80211_TID_STATS_TX_MSDU] = { .type = NLA_U64 }, [NL80211_TID_STATS_TX_MSDU_RETRIES] = { .type = NLA_U64 }, [NL80211_TID_STATS_TX_MSDU_FAILED] = { .type = NLA_U64 }, + [NL80211_TID_STATS_TXQ_STATS] = { .type = NLA_NESTED }, }; int rem, i = 0; + char txqbuf[2000] = {}, *pos = txqbuf; + int buflen = sizeof(txqbuf), foundtxq = 0; printf("\n\tMSDU:\n\t\tTID\trx\ttx\ttx retries\ttx failed"); nla_for_each_nested(tidattr, tid_stats_attr, rem) { @@ -61,7 +120,7 @@ void parse_tid_stats(struct nlattr *tid_stats_attr) printf("failed to parse nested stats attributes!"); return; } - printf("\n\t\t%d", i++); + printf("\n\t\t%d", i); info = stats_info[NL80211_TID_STATS_RX_MSDU]; if (info) printf("\t%llu", (unsigned long long)nla_get_u64(info)); @@ -74,7 +133,17 @@ void parse_tid_stats(struct nlattr *tid_stats_attr) info = stats_info[NL80211_TID_STATS_TX_MSDU_FAILED]; if (info) printf("\t\t%llu", (unsigned long long)nla_get_u64(info)); + info = stats_info[NL80211_TID_STATS_TXQ_STATS]; + if (info) { + pos += parse_txq_stats(pos, buflen - (pos - txqbuf), info, !foundtxq, i, "\t"); + foundtxq = 1; + } + + i++; } + + if (foundtxq) + printf("\n\tTXQs:%s", txqbuf); } void parse_bss_param(struct nlattr *bss_param_attr)