From nobody Sat Oct 04 03:02:29 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 4cdr1K4Jc2z69vGb; Sat, 04 Oct 2025 03:02:29 +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 4cdr1K3dbWz3pfX; Sat, 04 Oct 2025 03:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759546949; 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=ceGVa8OcMqBVFg1LSqMNPgQv4kVkpP07GRY5qPGW3Lk=; b=msr5BT62p657eaaUlkw1j1oRf37QoKFfizOKY777sZV533W69YbVUgnsip4Uc4UwED3nOY tgKAMHbBKTI6WDGzW80/su+iZX0JbdvrNdj9T53jz2L5koBVfTGFhZGQ39ArEW33yjfEmf j2Afo2sljigTo5HyN1bYNRRxxNsj6750LK+QELkYuu64sqwVanPtIOPFLobIfzSLE0FRJ6 8UY1O5XbV3LpWkhaJ2uaYrgL2qc4KJs32Qn+kc26CwA0X+1lNNYrHX4quiPTuqXeGILiB9 ZopAx/iN4C6zl2MPpN6udkU2gs6Ig6V3xtIEhxiMwVoPgPRnlfUQOSeBXqK5BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759546949; 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=ceGVa8OcMqBVFg1LSqMNPgQv4kVkpP07GRY5qPGW3Lk=; b=L6x7t0C6nddW3u25WLNWBg19ViLdXW/G6jVMhpltgLovHNwYdww6nmKXUC6ov5LmSySbZc PjgY7/12LacBiNnWK2KkWRDhh75+hT74eRPS/pcr98Xsb926qVficrCEqa+XhTwbh4f2Sn tWHH8AfM4MQ7xLnJ0M0n1j7cLI8rdzqnFiRf5bf9eQd57vVr7/CdyexQUXH6qS5R6k6s+q Wkyy9gNrbUBzI1ZD017vtIX+h1cF0MeGtM2wEO396W6jtILQ6Gbvdkha0ySz3K//FK9uDi MOdVZNc/oBRqvnWyqn2OZE1KhShgN0h0Z7siSq9oXcK73Yw2DrbGgkVDsBZsqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759546949; a=rsa-sha256; cv=none; b=H7wwPW7YfUJHNGExs4ejY8iNNZJPCIcya4A1bO/RvBFOL307ZGynvobZ+MHHlYXCEbSi5V dDp+PwgYUzQMr70Z/C9R9zpKO+T2C0uaIhV5MVGG+n/sV1lUfpQilaIKNrMPbLi6dld2K+ 8AqQzsKTwlTESdMI2pi8L8gAnGz82Ga8ie7bmArFtbGxlSlBLCsBOw0GtSrceVB2pnTLw0 CjuV2xxlBTCZJCJrIFDvKm92n3EoLFxd4MBrHxjkhtbt5O3Rmdyn5P23xSVWCn6W373NKs 707ZM74cOFX3CncLXonntvFe1vxoIPmvoPTfF2cS0AKnAOxz/4eESBvvCPkJDQ== 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 4cdr1K3FL3z7Yl; Sat, 04 Oct 2025 03:02:29 +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 59432TL5014879; Sat, 4 Oct 2025 03:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59432TrW014876; Sat, 4 Oct 2025 03:02:29 GMT (envelope-from git) Date: Sat, 4 Oct 2025 03:02:29 GMT Message-Id: <202510040302.59432TrW014876@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: 262172de955f - main - iwx: add some lock assertions in the TX start path 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: 262172de955ff09f5029039f0d823996a63ff3d1 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=262172de955ff09f5029039f0d823996a63ff3d1 commit 262172de955ff09f5029039f0d823996a63ff3d1 Author: Adrian Chadd AuthorDate: 2025-09-21 04:55:45 +0000 Commit: Adrian Chadd CommitDate: 2025-10-04 02:55:14 +0000 iwx: add some lock assertions in the TX start path The locking paths into these routines LOOK correct, but I figured it'd be good to at least enforce we're not doing concurrent entry into iwx_start() / iwx_tx() without the lock held. Differential Revision: https://reviews.freebsd.org/D52655 Reviewed by: thj --- sys/dev/iwx/if_iwx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 5be7f2755598..557b5a7a1ca2 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -4805,6 +4805,8 @@ iwx_rx_tx_cmd(struct iwx_softc *sc, struct iwx_rx_packet *pkt, static void iwx_clear_oactive(struct iwx_softc *sc, struct iwx_tx_ring *ring) { + IWX_ASSERT_LOCKED(sc); + if (ring->queued < iwx_lomark) { sc->qfullmsk &= ~(1 << ring->qid); if (sc->qfullmsk == 0 /* && ifq_is_oactive(&ifp->if_snd) */) { @@ -5630,6 +5632,8 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) struct mbuf *m1; size_t txcmd_size; + IWX_ASSERT_LOCKED(sc); + wh = mtod(m, struct ieee80211_frame *); type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; @@ -8534,6 +8538,8 @@ iwx_start(struct iwx_softc *sc) struct ieee80211_node *ni; struct mbuf *m; + IWX_ASSERT_LOCKED(sc); + while (sc->qfullmsk == 0 && (m = mbufq_dequeue(&sc->sc_snd)) != NULL) { ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; if (iwx_tx(sc, m, ni) != 0) {