From nobody Wed Oct 04 15:23:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S0z3y109Pz4w6dl; Wed, 4 Oct 2023 15:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S0z3x6R1Lz4Mrt; Wed, 4 Oct 2023 15:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdrQ8ZHkKO6Q39UEELiNEeDLpndMoh0zeRR7jwcD6eE=; b=rITh1tMNKURlIkf6p6zY0Qrppr0JoCDlb713sKpsxX/do9W6qUbc/NBEICeAQqc+tJux83 zi5YIDmLxZRcDWp4UqjVpKjPtQGFDCZh6TFqU5WQ1lw8/8NrRoHGM26JugajoBRWKz/oGR qbplxpyFnUMTcIYqZeXYbgWGPdYd+oeOcV6ismlNhFXwPqgKYiyxd3C0JfLWGNAp8CQCkX MNs/nGePNh7jKiwsd1X0QRDLUKyAxYjAxKm62hm7X3zzgOkmcTgPZjJEFhx8w60ByHgu4w adw4lPTYgs4E9TgjMZ2DUc0+1D3mDGtl/fc5KqS8Dkv1GPS8uamlyOBjAb2JmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696433021; a=rsa-sha256; cv=none; b=aelkf0b3LEivcyp8yLNIllGUs/9WA/cULtmUueNSuP1sjVdeu93vqzw1yaBba1AlnNXZtw xKozvWa/ucTr4KqqoEQX7+891bd+fTtgEaPMlj/mioxSOKd3CBT0jiwvFMaeYm7aJH7r2z 4BwxcqTiJDBfe1kilPbhFQCqWwDXrgzqmvr7JaO1DyzMHNcFANC+m/J1kuAGeqcL1dL4ss FjuCXoMk+2TTn4u3E/4YeMqJYZX3YbmfzivdyHTDeLCzInmf6UKaZpAwjTBW0Oxv5GvL94 yZzHxEgO6FxKV0XnWpkh2xoKzuPa3Z3+W8zTAlFHLIfUjV0NjeV9nS648Ukl2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdrQ8ZHkKO6Q39UEELiNEeDLpndMoh0zeRR7jwcD6eE=; b=AjcY7UbrzJx0Ms1W16CcLjdBqFrbfzNNGbJv/Yys8kPpRw798IOziQOh86VlzlEoUCjc7m jNK31/hL00KJTmve3UCB6uS7Flp87WM8yc74GmCipLcYQNePcVncaed+182ooLb+BLaLyf JVkYfQWTl5r3gRstL7TQ4OrX2RA8thXJhV6nqw1Ez258cmmwVUlOTaA8QYfPIyeUENHTJf faw+qU+pMAeEpizT8rV+CGS6wCKQ+6jBc08QXBxGVQVKfCSZBtxbDpzIE6Z9Bx7yCH/4Jm GzAP1Q57RzPy/cwSxsFco4ZRQ9DBw9GOoC0HN2EV0AALF6hNT0AQs/yrgn3Y3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S0z3x5XSnzjBJ; Wed, 4 Oct 2023 15:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394FNfin086810; Wed, 4 Oct 2023 15:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394FNfr9086807; Wed, 4 Oct 2023 15:23:41 GMT (envelope-from git) Date: Wed, 4 Oct 2023 15:23:41 GMT Message-Id: <202310041523.394FNfr9086807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b011575ecd8b - stable/14 - net80211: improve ddb output for sta and rate List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b011575ecd8b442d5f9d697ef88fed84f3c651ef Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b011575ecd8b442d5f9d697ef88fed84f3c651ef commit b011575ecd8b442d5f9d697ef88fed84f3c651ef Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 13:53:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-04 15:19:17 +0000 net80211: improve ddb output for sta and rate Add more missing fields to the ddb output of sta (including spares so people will notice if they use them to adjust ddb as well). There are still more missing fields (some left as reminder in an uncompiled __notyet__ block). Add _db_show_rate() to print iv_rate as well optionally including function pointers. Sponsored by: The FreeBSD Foundation (cherry picked from commit 4ed35b7d1eb5dddfd04f574ac122651d532d2df9) --- sys/net80211/ieee80211_ddb.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index 525814d202b1..e4a09a58049b 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -48,6 +48,7 @@ #include #include +#include #ifdef IEEE80211_SUPPORT_TDMA #include #endif @@ -327,6 +328,31 @@ _db_show_sta(const struct ieee80211_node *ni) ni->ni_vht_pad1, ni->ni_vht_spare[0], ni->ni_vht_spare[1], ni->ni_vht_spare[2], ni->ni_vht_spare[3], ni->ni_vht_spare[4], ni->ni_vht_spare[5], ni->ni_vht_spare[6], ni->ni_vht_spare[7]); + + db_printf("\tni_tx_superg[] = {"); + for (i = 0; i < WME_NUM_TID; i++) + db_printf(" %p%s", ni->ni_tx_superg[i], (i == 0) ? "" : ","); + db_printf(" }\n"); + + db_printf("\tni_rctls = %p", ni->ni_rctls); + db_printf("\tni_drv_data = %p", ni->ni_drv_data); + db_printf("\n"); + + db_printf("\tni_spare[3] = { %#jx %#jx %#jx }", + ni->ni_spare[0], ni->ni_spare[1], ni->ni_spare[2]); + db_printf("\n"); + +#ifdef __notyet__ + struct ieee80211_psq ni_psq; /* power save queue */ + struct ieee80211_nodestats ni_stats; /* per-node statistics */ + + /* quiet time IE state for the given node */ + uint32_t ni_quiet_ie_set; /* Quiet time IE was seen */ + struct ieee80211_quiet_ie ni_quiet_ie; /* last seen quiet IE */ + + /* U-APSD */ + uint8_t ni_uapsd; /* U-APSD per-node flags matching WMM STA QoS Info field */ +#endif } #ifdef IEEE80211_SUPPORT_TDMA @@ -403,6 +429,31 @@ _db_show_scan(const struct ieee80211_scan_state *ss, int showprocs) db_printf("\n"); } +static void +_db_show_rate(const struct ieee80211_ratectl *rate, const void *rs, + const int showprocs) +{ + + db_printf("\tiv_rate %p", rate); + db_printf(" iv_rs %p", rs); + db_printf("\n"); + if (showprocs) { + db_printf("\t ir_name %s", rate->ir_name); + db_printf("\n"); + DB_PRINTSYM("\t ", "ir_attach", rate->ir_attach); + DB_PRINTSYM("\t ", "ir_detach", rate->ir_detach); + DB_PRINTSYM("\t ", "ir_init", rate->ir_init); + DB_PRINTSYM("\t ", "ir_deinit", rate->ir_deinit); + DB_PRINTSYM("\t ", "ir_node_init", rate->ir_node_init); + DB_PRINTSYM("\t ", "ir_node_deinit", rate->ir_node_deinit); + DB_PRINTSYM("\t ", "ir_rate", rate->ir_rate); + DB_PRINTSYM("\t ", "ir_tx_complete", rate->ir_tx_complete); + DB_PRINTSYM("\t ", "ir_tx_update", rate->ir_tx_update); + DB_PRINTSYM("\t ", "ir_setinterval", rate->ir_setinterval); + DB_PRINTSYM("\t ", "ir_node_stats", rate->ir_node_stats); + } +} + static void _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) { @@ -569,6 +620,8 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf(" lastnonerp %d", vap->iv_lastnonerp); db_printf(" lastnonht %d", vap->iv_lastnonht); db_printf("\n"); + if (vap->iv_rate != NULL) + _db_show_rate(vap->iv_rate, vap->iv_rs, showprocs); if (showprocs) { DB_PRINTSYM("\t", "iv_key_alloc", vap->iv_key_alloc);