From nobody Fri Oct 6 14:25:16 2023 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 4S29gc4pVGz4wgmk; Fri, 6 Oct 2023 14:25:16 +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 4S29gc2b5Zz3R64; Fri, 6 Oct 2023 14:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602316; 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=FUjqq2MSeSnj3nFjD0Eia0Evkxc2PWJH+xeHB01TSeQ=; b=Q10hoZwHcBGnnv8EYV1BiylJOL7LDcvGUNNZcvMlItlBAeaqof25kuYJ8G9Fwq03tKJAtt JgWKD9oFGDlgpB7L4N1xMH3hc/1NEBBj9zckzW5WcrwDi0M45lFJB08UjE3O7xAmeZjKmX R6GJDT2PcF/519duo1Ef+2JaWDkBXAFrspVoS9AxnJq73bxxL4NooEhy/iYSqdV8c61j2h 8vd4/P5ADnq+oxydKAykM4iWoyzFb2AOYeuNM/rKVG7MNueF9U3hanENrNF7TV0vWYFRSd 2XnsuH59FDx6l9c0nUTsoR2Dxjcg5rIvQF9XBG2lN4Xy4Y6MR43sqc02bONqGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696602316; a=rsa-sha256; cv=none; b=I7n826b+dZIsPbYL57X4oOPKN5rCdHixPReBxh5DkcXAYMmKGIPWB/1HlpV8zxj/g7YjAz 5SjhDe9YUJsTZ2zn0TmVxlOQyoNOrfbDZkFARD+TEStotTqJOCqGPTnaYB3NLGpHOsoDBN 8GWlETxXp7WyQKfRZN1lucDNS4ztgtaOMpjW7+C85lTfOjG0MJWnFBpLDQFIj2SdqsIXzc T/7xBFV3Sh314n3DyT6C/TglTmdQCibW5MeOecWEGl3zBH0N0uM4jBP6kZ86nBb7x69l+y TYKC7LV4xC4vzV2wl7d02iSXPOxTyPNxYyY911fjfWm/V/rJw2L82KQ+tJK3dQ== 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=1696602316; 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=FUjqq2MSeSnj3nFjD0Eia0Evkxc2PWJH+xeHB01TSeQ=; b=v+njGHbURStTHD+lU2odlvsaHD8mUbZ5MgUXIYitSY4Y0bL6BWnDwGZeCi9p1x08f+xfev bgqQoU5p9ygdrrvTdpeM76GF+eSNYmS7rvXAn8KWSAoKU8XRpRVw43ePmxaB12hVYOcM21 53ORk+mbcPPAAf7/6QCahBuLyoBJ/KyYGcdf46gE6NxzWKkiu0IcOJlgfzBgDjYExZ38Zc djAfSd81qn1MiF1W/wS3K+91UDi+7VONtk1W7TjiRqqFPFP38h5DxSdihQyhNDbtjKKXZ5 zEVf9534HzfmWsFljLAg7V1dZhPNd3GaCWDehBc10SZdwKuQ/iibLaHvejSPeA== 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 4S29gc1hQmzr9T; Fri, 6 Oct 2023 14:25:16 +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 396EPGLs093560; Fri, 6 Oct 2023 14:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396EPG8L093557; Fri, 6 Oct 2023 14:25:16 GMT (envelope-from git) Date: Fri, 6 Oct 2023 14:25:16 GMT Message-Id: <202310061425.396EPG8L093557@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: 5b9404565fef - stable/14 - LinuxKPI: 802.11: hide txq debugging behind checks 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/14 X-Git-Reftype: branch X-Git-Commit: 5b9404565fef6cf4f01210343c8074b9407cb268 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5b9404565fef6cf4f01210343c8074b9407cb268 commit 5b9404565fef6cf4f01210343c8074b9407cb268 Author: Bjoern A. Zeeb AuthorDate: 2023-10-04 20:30:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-06 12:47:40 +0000 LinuxKPI: 802.11: hide txq debugging behind checks Two txq debug messages were left unconditionally. Hide them behind ifdef/if() condition checks for selective debugging only. Sponsored by: The FreeBSD Foundation (cherry picked from commit 0d2cb6a6ecde3b271ede59d77801cb43a8804688) --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 9f5f5bef7f27..4a296e2f0fad 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4911,15 +4911,18 @@ linuxkpi_ieee80211_stop_queue(struct ieee80211_hw *hw, int qnum) for (ac = 0; ac < ac_count; ac++) { IMPROVE_TXQ("LOCKING"); if (qnum == vif->hw_queue[ac]) { +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (lvif->hw_queue_stopped[ac]) + if (lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d qnum %d already " "stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac, qnum); +#endif lvif->hw_queue_stopped[ac] = true; } } @@ -4966,15 +4969,18 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq) /* XXX-BZ what about software scan? */ +#ifdef LINUXKPI_DEBUG_80211 /* * For now log this to better understand * how this is supposed to work. */ - if (!lvif->hw_queue_stopped[ac]) + if (!lvif->hw_queue_stopped[ac] && + (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) != 0) ic_printf(lhw->ic, "%s:%d: lhw %p hw %p " "lvif %p vif %p ac %d hw_q not stopped\n", __func__, __LINE__, lhw, hw, lvif, vif, ac); +#endif lvif->hw_queue_stopped[ac] = false; LKPI_80211_LVIF_LOCK(lvif);