From nobody Thu Mar 13 00:14:21 2025 X-Original-To: dev-commits-src-main@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 4ZCnzy1Qq2z5qj4v; Thu, 13 Mar 2025 00:14:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCnzy03qyz3jrg; Thu, 13 Mar 2025 00:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741824862; 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=YLLPKYdG7LtMb9yT07uszyrSyKH1mT2cIUHD9ApzmDM=; b=Vm0YigbOJluS+f/VcDr9MtmjEb5VjURZdmUnzJNYiJYTvRX54ql15gNmUgkI7o1LxY/7j2 9UVMS2lNTfsKR61ghFCPrxINCndzXxZKV96eFAgenRRgSi+5zdDsUDjCsnWoVZVOVrj1G2 PvdfI3MigQ43YKztCJJxkMRci4py3YYT84BgDo+BBEhcKBIQdLrLplr7HovlgVOeS8JKCV jN789VgHvvQ3I5HvhmGIiNzr38NXb7h0FXGymCiWZIsi2+BTNpbdNX8DX0S0yefic1PKXY K0CuKUtfbVNShK/mvitfdRiqCCTQwFYtcRKOZijl4dOhic4z2cu2pjPVB7PASw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741824862; a=rsa-sha256; cv=none; b=pFxYH6cWyEOTLSVRaRBrkc3CYsmH0A78TOaR8UKH6Aw7ExB/QoqkPEHRq30C1BgEq0OXGy EOmQvZywuu+RM8QvGGkIsiKSOlgdV89Z0k6c+QvRcvZ4qbwgfL5mWxVZb86mB9LpdVNhtb RYUo6mruauMc9WAldUT7bZ/vuVig/VVXn/7gMxxp/uv85txxx9jK+uNzF+BlitHgrS9f3X I3tRU1W4sGFIGvSFMnn+slpzFhJvwZsDEArQ2WQDMp6ldCm+yd/0x/M49oyyjxtYxEePy7 MGE7p4hadP/UlO+oEd06m8uKmGOI8JWymeOuYwEEe7I5mJWItQB3RUYoHbArxg== 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=1741824862; 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=YLLPKYdG7LtMb9yT07uszyrSyKH1mT2cIUHD9ApzmDM=; b=eaT4Gb/oA8d2nixq4PRmMuYq31WEU3GNrYSqP3r9GjWkeyWAMRgn+GA53XIzx6sD3yDn0L bNX8+yEZoe08wPzrMKG5ZNBX/bIqx16nCynKnE+vEP0uhRCgM2dAEL3QF6FOcORUIrUVHJ nAWAjGMO0nk/lF0x2sOqQEwWS5Lpp15cDiKrN8OtS8REDncXIh8lZ5i/tjyo50ZsD7JD09 bbBcoU0yzzC2DGOjgqltBfp1om9CKPyMDnWBN/pI699FcdYXBP5pZZucd6x9eMiGx7ndxY /nbCz+jnFmV1/3xM4GMeW2N+6TZLiqLIl1Mov266AjU2scOBdzCItw+/ZxPfMg== 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 4ZCnzx63z8zbNv; Thu, 13 Mar 2025 00:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52D0ELsf064062; Thu, 13 Mar 2025 00:14:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52D0ELA7064059; Thu, 13 Mar 2025 00:14:21 GMT (envelope-from git) Date: Thu, 13 Mar 2025 00:14:21 GMT Message-Id: <202503130014.52D0ELA7064059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 00ad581c7e3f - main - wlanstats: add GCMP crypto counters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00ad581c7e3f6d6a793bafdbe83c53d48155be58 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=00ad581c7e3f6d6a793bafdbe83c53d48155be58 commit 00ad581c7e3f6d6a793bafdbe83c53d48155be58 Author: Adrian Chadd AuthorDate: 2025-02-28 03:24:28 +0000 Commit: Adrian Chadd CommitDate: 2025-03-13 00:02:36 +0000 wlanstats: add GCMP crypto counters Add GCMP crypto counters to wlanstats. Differential Revision: https://reviews.freebsd.org/D49162 --- usr.sbin/wlanstats/wlanstats.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/usr.sbin/wlanstats/wlanstats.c b/usr.sbin/wlanstats/wlanstats.c index 8795333ccb17..588b67ddd417 100644 --- a/usr.sbin/wlanstats/wlanstats.c +++ b/usr.sbin/wlanstats/wlanstats.c @@ -382,6 +382,18 @@ static const struct fmt wlanstats[] = { { 9, "ampdu_bartxfail", "bartx_fail", "BAR frames failed to send" }, #define S_AMPDU_BARTX_RETRY AFTER(S_AMPDU_BARTX_FAIL) { 10, "ampdu_bartxretry", "bartx_retry", "BAR frames retried" }, +#define S_CRYPTO_GCMP AFTER(S_AMPDU_BARTX_RETRY) + { 11, "crypto_gcmp", "crypto_gcmp", "gcmp crypto done in s/w" }, +#define S_RX_GCMPREPLAY AFTER(S_CRYPTO_GCMP) + { 10, "rx_gcmpreplay", "gcmpreplay", "rx seq# violation (GCMP)" }, +#define S_RX_GCMPFORMAT AFTER(S_RX_GCMPREPLAY) + { 10, "rx_gcmpformat", "gcmpformat", "rx format bad (GCMP)" }, +#define S_RX_GCMPMIC AFTER(S_RX_GCMPFORMAT) + { 7, "rx_gcmpmic", "gcmpmic", "rx MIC check failed (GCMP)" }, +#define S_RX_GCMPNOMEM AFTER(S_RX_GCMPMIC) + { 9, "gcmp_nomem", "gcmpnomem", "No memory available (GCMP)" }, +#define S_RX_GCMPNOSPC AFTER(S_RX_GCMPNOMEM) + { 9, "gcmp_nospc", "gcmpnospc", "No mbuf space available (GCMP)" }, }; struct wlanstatfoo_p { @@ -830,6 +842,12 @@ wlan_get_curstat(struct bsdstat *sf, int s, char b[], size_t bs) case S_AMPDU_BARTX: STAT(ampdu_bar_tx); case S_AMPDU_BARTX_RETRY: STAT(ampdu_bar_tx_retry); case S_AMPDU_BARTX_FAIL: STAT(ampdu_bar_tx_fail); + case S_CRYPTO_GCMP: STAT(crypto_gcmp); + case S_RX_GCMPREPLAY: STAT(rx_gcmpreplay); + case S_RX_GCMPFORMAT: STAT(rx_gcmpformat); + case S_RX_GCMPMIC: STAT(rx_gcmpmic); + case S_RX_GCMPNOMEM: STAT(crypto_gcmp_nomem); + case S_RX_GCMPNOSPC: STAT(crypto_gcmp_nospc); } return wlan_getinfo(wf, s, b, bs); #undef NSTAT @@ -995,6 +1013,12 @@ wlan_get_totstat(struct bsdstat *sf, int s, char b[], size_t bs) case S_AMPDU_BARTX: STAT(ampdu_bar_tx); case S_AMPDU_BARTX_RETRY: STAT(ampdu_bar_tx_retry); case S_AMPDU_BARTX_FAIL: STAT(ampdu_bar_tx_fail); + case S_CRYPTO_GCMP: STAT(crypto_gcmp); + case S_RX_GCMPREPLAY: STAT(rx_gcmpreplay); + case S_RX_GCMPFORMAT: STAT(rx_gcmpformat); + case S_RX_GCMPMIC: STAT(rx_gcmpmic); + case S_RX_GCMPNOMEM: STAT(crypto_gcmp_nomem); + case S_RX_GCMPNOSPC: STAT(crypto_gcmp_nospc); } return wlan_getinfo(wf, s, b, bs); #undef NSTAT