From nobody Wed Sep 21 14:01:08 2022 X-Original-To: dev-commits-src-all@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 4MXg793blrz4cY6S; Wed, 21 Sep 2022 14:01:09 +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 4MXg7915Npz47tR; Wed, 21 Sep 2022 14:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768869; 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=AmOR0zzwZzUYhsguL2PU1YdqVvOn/whC3V7RQZXxsdQ=; b=HgKGfa6wt04peukJISkY16YmQW6y7CNY+5XfoWCVFVWsEtPrOHic1If9A6iXkBgd5JpnVM 8Ef7JZSOHiSDDs04DU7r19t8+lk9q+isW0blql74AuAq6pOMVdifHrq76qNgedJepyT4mv hoGyBi4WLe9GgVFHJ3Uv+4z8AZF2w1Ak1sMvrERi+wHrAgRr/q14hQz0DCRqsna33uce3H KdkpkgUx94wDLDXAQxmyF/BRtl9Ns5ChN7jUKcL1ky+v6HkXywjgoeBxQNbIFnKSHXn8j+ H9b3aQFOuwlaUrAgNSARgbWpVgMvtjuMs93Sl3hlIJR4cakzgRl5+JwWagXjPw== 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 4MXg785wylz14vL; Wed, 21 Sep 2022 14:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28LE18Im099654; Wed, 21 Sep 2022 14:01:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LE18Jh099653; Wed, 21 Sep 2022 14:01:08 GMT (envelope-from git) Date: Wed, 21 Sep 2022 14:01:08 GMT Message-Id: <202209211401.28LE18Jh099653@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: ac1f3df4f708 - stable/13 - net80211: improve DDB output. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: ac1f3df4f7081a8db4efebd5a0b6e8e061c625a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768869; 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=AmOR0zzwZzUYhsguL2PU1YdqVvOn/whC3V7RQZXxsdQ=; b=Gk2AUjc3iQxmaUMXFU5c8am4k8pvGIM0IlYg129NitBzseIiNCg+ldVgF25S4W8wVHybv6 bd6npcbuxDudEGyHHBY6G9ywQ5/eCN9QRFzgbGsozViyeHhJbUS+G0RbC4qcOsFnf7Ay/6 pGihdgs30OZuAmql5Iy0ZowB5hzjixVEqtN/T4dLqH6Nx1OdbSkZnJ0uskchPoxM0zoU4F gR4C6tRVDm3Zebia5Q6r+OTxp/9iRZsHOP1GY/Ji/PKLLZ7zVEgMQS6i9mv7IVpcWKstNw lYGOSCTGzKLORwcBEV1G/shvhozJccEm6uivV+5kA/wnKGa8EHwPEbRC/jMMVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663768869; a=rsa-sha256; cv=none; b=AGVCVs2VwfjorWkQ3dFENXVtYnmGmPqc/QD7vOdJHNoRngxrCYsdzSH9FSMMdT60rhrNaX 07rzuy8rT5dVqqzOLrylTUu0xmKN/VIq82VGrJXzTTGUQiZZ3A1r9mFkj9PRS4d497Stgp vg3G1LST6vnyABqmvelhLZarxjt5YZnf2UdFNCCSTD4U8Zr7fixC4HIjO9uYcOEhQAoUg/ 5s3rMwdJ8+qJLfrQZ4fpl2QZAw8Jkw5G6jMLcJjy1EEEL4sMoTux1CAsPmRSIpQaSzlLdR gicMMW38TH6/AsLuUQcM8sG0/LKE2G3fBaNZ98cNel5b3kzFcvS5HHTpdVqneg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1f3df4f7081a8db4efebd5a0b6e8e061c625a6 commit ac1f3df4f7081a8db4efebd5a0b6e8e061c625a6 Author: Bjoern A. Zeeb AuthorDate: 2022-07-29 00:05:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 11:39:46 +0000 net80211: improve DDB output. Start adding more fields to DDB output related to VHT (11ac) and mark COM, VAP, and STA more explicitly to make show all vaps /.. more readable. Sponsored by: The FreeBSD Foundaton Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35977 (cherry picked from commit 5c9f992919eee6771dd15da278228e5f3bcee7b6) --- sys/net80211/ieee80211_ddb.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index e649b3c86fda..af4f8ea74799 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -236,7 +236,7 @@ _db_show_sta(const struct ieee80211_node *ni) { int i; - db_printf("%p: mac %s refcnt %d\n", ni, + db_printf("STA: %p: mac %s refcnt %d\n", ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); db_printf("\tvap %p wdsvap %p ic %p table %p\n", ni->ni_vap, ni->ni_wdsvap, ni->ni_ic, ni->ni_table); @@ -254,6 +254,9 @@ _db_show_sta(const struct ieee80211_node *ni) ni->ni_ies.ath_ie); db_printf("\t htcap_ie %p htinfo_ie %p]\n", ni->ni_ies.htcap_ie, ni->ni_ies.htinfo_ie); + db_printf("\t vhtcap_ie %p vhtopmode_ie %p vhtpwrenv_ie %p]\n", + ni->ni_ies.vhtcap_ie, ni->ni_ies.vhtopmode_ie, + ni->ni_ies.vhtpwrenv_ie); if (ni->ni_flags & IEEE80211_NODE_QOS) { for (i = 0; i < WME_NUM_TID; i++) { if (ni->ni_txseqs[i] || ni->ni_rxseqs[i]) @@ -263,6 +266,7 @@ _db_show_sta(const struct ieee80211_node *ni) ni->ni_rxseqs[i] & IEEE80211_SEQ_FRAG_MASK); } } + db_printf("\ttxseq %u rxseq %u fragno %u rxfragstamp %u\n", ni->ni_txseqs[IEEE80211_NONQOS_TID], ni->ni_rxseqs[IEEE80211_NONQOS_TID] >> IEEE80211_SEQ_SEQ_SHIFT, @@ -307,6 +311,21 @@ _db_show_sta(const struct ieee80211_node *ni) ni->ni_mlstate, IEEE80211_MESH_MLSTATE_BITS, ni->ni_mllid, ni->ni_mlpid, ni->ni_mlrcnt, ni->ni_mltval); #endif + + /* VHT state */ + db_printf("\tvhtcap %b vht_basicmcs %#06x vht_pad2 %#06x\n", + ni->ni_vhtcap, IEEE80211_VHTCAP_BITS, + ni->ni_vht_basicmcs, ni->ni_vht_pad2); + db_printf("\tvht_mcsinfo: { rx_mcs_map %#06x rx_highest %#06x " + "tx_mcs_map %#06x tx_highest %#06x }\n", + ni->ni_vht_mcsinfo.rx_mcs_map, ni->ni_vht_mcsinfo.rx_highest, + ni->ni_vht_mcsinfo.tx_mcs_map, ni->ni_vht_mcsinfo.tx_highest); + db_printf("\tvht_chan1/chan2 %u/%u vht_chanwidth %#04x\n", + ni->ni_vht_chan1, ni->ni_vht_chan2, ni->ni_vht_chanwidth); + db_printf("\tvht_pad1 %#04x vht_spare { %#x %#x %#x %#x %#x %#x %#x %#x }\n", + 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]); } #ifdef IEEE80211_SUPPORT_TDMA @@ -334,7 +353,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) const struct ieee80211com *ic = vap->iv_ic; int i; - db_printf("%p:", vap); + db_printf("VAP %p:", vap); db_printf(" bss %p", vap->iv_bss); db_printf(" myaddr %s", ether_sprintf(vap->iv_myaddr)); db_printf("\n"); @@ -364,6 +383,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); + db_printf("\tvhtcaps=%b\n", vap->iv_vhtcaps, IEEE80211_VHTCAP_BITS); _db_show_stats(&vap->iv_stats); @@ -518,7 +538,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, { struct ieee80211vap *vap; - db_printf("%p:", ic); + db_printf("COM: %p:", ic); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) db_printf(" %s(%p)", vap->iv_ifp->if_xname, vap); db_printf("\n"); @@ -543,6 +563,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf("\tcryptocaps=%b\n", ic->ic_cryptocaps, IEEE80211_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); + db_printf("\tvhtcaps=%b\n", ic->ic_vhtcaps, IEEE80211_VHTCAP_BITS); #if 0 uint8_t ic_modecaps[2]; /* set of mode capabilities */