From nobody Fri Aug 29 13:19:04 2025 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 4cCzPP2XV9z65Vsb; Fri, 29 Aug 2025 13:19:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCzPN69nvz3VMs; Fri, 29 Aug 2025 13:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473544; 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=ogOOJSS6YZ3RZqKBt+dpPIlKM/pjsZgvV2nNN19mBug=; b=V/BnzGeQI/02cINUCLv9a3I0aRhkoU0K954H/qha+wth4YecwxfKQAAmV4Hoo1WMDHJ4pO yHr+3GR1xCQ8x1qklp5aqnOqXysoqJabEW/VRHDlxacx2Iz/nEDfxVAvp5ChJ++eG1Bjm+ VcdhCM44AHu8zSH9KruqV8n9LvJfLgDPROU7XIKKBARMuY2JwS6YAKQ278yItiuONxswFC Rpk4m21IDhQ4G0QE5zISqzAU/tQnIbPlRyVaHZlgydjI7sfb+fyq7EsaHQuZghzhedKYP3 4x6zNYduQSZhWVX7M4dDLWQGqmjji9Wt9mvbKlRRt/zvZ5k+e6+e5HlQbLfBCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473544; 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=ogOOJSS6YZ3RZqKBt+dpPIlKM/pjsZgvV2nNN19mBug=; b=uMQCJHStMTFzp91unN4O0Bs3E1gLoMiYVkeEuZdhNZOyXNrawVPM9K+E4kmif2UbRgZ37s +QCI0esh+sU8myBjYnAcjOJd2r/kdmLszJT0uH19JMtbwRB+xo/2gDKZt/U253XMcKd2vZ H/nAb/6FvhieNPcpI4LBvlOF45SytFV0yYY85Q/InEuyAIDpKH10nM7zD1IEtUq3GydQwu JSsGdO5Zz9HMbdHTxSVCqBHuJFIrhwomU/r1yLj8YimyXTEc2qDd/fdmjIbv/6cmO9Gc+i ymTmC3unQx708EQalWrb34vLfvuewx9F+sdKfNy4ZfYaNkjWd5TvmJhkNsrFTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756473544; a=rsa-sha256; cv=none; b=tNDT6RdH8nGpLlyPaB2CDROvA3puTe2vZL9kwjkIR7ZstwkHYtPPw+Ls4+hTn2zOsl27gS ontQCmCBffd6/CKjwCz3D4Cj+sSzywQylXY4ew16xsAlQM9J09PIch3cky5dYMfWCTjKdl 4od6HEWeLDDOW02n4935rAuhkiocMPMruVCfNa+Gn/28svwOtjNEwkgxMBGDNO7JGKfFvH fgawg7whVcwCfa357sjVQiKwHgiU4a5x0o9VzKtahWdm/lysmoziu/P0rGfIlgsQUOdPA2 rfyur90zO3/K0aXZGS8rnqxpFmCaAUhvCnAHYnr1YntUOd8J59Vj+fm5m4IQyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cCzPN5mXqzhnl; Fri, 29 Aug 2025 13:19:04 +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 57TDJ4k6072397; Fri, 29 Aug 2025 13:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TDJ4aN072394; Fri, 29 Aug 2025 13:19:04 GMT (envelope-from git) Date: Fri, 29 Aug 2025 13:19:04 GMT Message-Id: <202508291319.57TDJ4aN072394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a4c17ecf962d - main - LinuxKPI: 802.11: introduce a debug flag for scan/beacon logging 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: a4c17ecf962d573b339a3c1e963ed0d041716720 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a4c17ecf962d573b339a3c1e963ed0d041716720 commit a4c17ecf962d573b339a3c1e963ed0d041716720 Author: Bjoern A. Zeeb AuthorDate: 2025-08-28 21:41:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-29 13:18:43 +0000 LinuxKPI: 802.11: introduce a debug flag for scan/beacon logging Split the scan logging up into scan and scan/beacon in order to not log every beacon if we are trying to debug the scan machinery but not the actual results. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++---- sys/compat/linuxkpi/common/src/linux_80211.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ad3e6c043c94..cf0aca4493aa 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7348,7 +7348,7 @@ lkpi_rx_log_beacon(struct mbuf *m, struct lkpi_hw *lhw, } /* We print skb, skb->data, m as we are seeing 'ghost beacons'. */ - TRACE_SCAN(lhw->ic, "Beacon: scan_flags %b, band %s freq %u chan %-4d " + TRACE_SCAN_BEACON(lhw->ic, "Beacon: scan_flags %b, band %s freq %u chan %-4d " "len %d { %#06x %#06x %6D %6D %6D %#06x %ju %u %#06x SSID '%s' }", lhw->scan_flags, LKPI_LHW_SCAN_BITS, lkpi_nl80211_band_name(rx_status->band), rx_status->freq, @@ -7421,11 +7421,11 @@ linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, * We use the mbuf here as otherwise the variable part might * be in skb frags. */ - if (is_beacon && ((linuxkpi_debug_80211 & D80211_SCAN) != 0)) + if (is_beacon && ((linuxkpi_debug_80211 & D80211_SCAN_BEACON) != 0)) lkpi_rx_log_beacon(m, lhw, rx_status); if (is_beacon && (linuxkpi_debug_80211 & D80211_TRACE_RX_BEACONS) == 0 && - (linuxkpi_debug_80211 & D80211_SCAN) == 0) + (linuxkpi_debug_80211 & D80211_SCAN_BEACON) == 0) goto no_trace_beacons; if (linuxkpi_debug_80211 & D80211_TRACE_RX) @@ -7441,7 +7441,7 @@ linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, /* Implement a dump_rxcb() !!! */ if ((linuxkpi_debug_80211 & D80211_TRACE_RX) != 0 || - (linuxkpi_debug_80211 & D80211_SCAN) != 0) + (linuxkpi_debug_80211 & D80211_SCAN_BEACON) != 0) printf("TRACE-RX: %s: RXCB: %ju %ju %u, %b, %u, %#0x, %#0x, " "%u band %u, %u { %d %d %d %d }, %d, %#x %#x %#x %#x %u %u %u\n", __func__, diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 2b93eab03c27..0dfcd7646c34 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -60,6 +60,7 @@ #define D80211_TRACE 0x00000010 #define D80211_TRACEOK 0x00000020 #define D80211_SCAN 0x00000040 +#define D80211_SCAN_BEACON 0x00000080 #define D80211_TRACE_TX 0x00000100 #define D80211_TRACE_TX_DUMP 0x00000200 #define D80211_TRACE_RX 0x00001000 @@ -81,8 +82,13 @@ if (linuxkpi_debug_80211 & D80211_SCAN) \ printf("%s:%d: %s SCAN " fmt "\n", \ __func__, __LINE__, ic->ic_name, ##__VA_ARGS__) +#define TRACE_SCAN_BEACON(ic, fmt, ...) \ + if (linuxkpi_debug_80211 & D80211_SCAN_BEACON) \ + printf("%s:%d: %s SCAN " fmt "\n", \ + __func__, __LINE__, ic->ic_name, ##__VA_ARGS__) #else #define TRACE_SCAN(...) do {} while (0) +#define TRACE_SCAN_BEACON(...) do {} while (0) #endif #define IMPROVE_TXQ(...) \