From nobody Mon Oct 12 02:51:30 2026 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 4j326V6nyXz6k5DQ for ; Mon, 12 Oct 2026 02:51:30 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j326V66HCz4TbV for ; Mon, 12 Oct 2026 02:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773490; 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=Be9WPUEk7JIVLRp4WwIV19u0AfMoNAjCLDXhJ0vW8Pg=; b=QrgQWHwW8FBbCsijrssxki7q8m+3nML9UqHS85NFI1aZWj0gJpHMSSPX6f5JUVRxGfhTCC O+4SrUW4j+2L4mHMaxyjJ0fGhXLEdSCLY/Fa9ZcbGK4HRAI+cLzF5ySSWgYYgE8dZ8Vm1j PpkzB9Pq91y4UpO56wiKp9EhRvnjwYmnyMnJKUIyfQEpXXEzAQd099em7v7Vr4NLLH5Y4J 8g7NRpj8g1jUWuLI9JLpedrb2zWHD1pIwTCPBtLMjFx7plE8WXvgm9ZuSh/c10jWx4croS jEl2LBNEQ2+FLel0QCtfwktj1NJbsHuWsKsfdxYGHo2XVtyG9DmUg/siPpVU+A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791773490; b=hN3WGsoAEtAf+R3aKB/x0FfINk1SqmCEj8OMZFdCfd017hcGrGCC1kCRuR5sDDOdCT0THm HHxWgGNT3/kPoccTMhzjgWQd2tRE0cz67w2e3oQ+zrXy+Flw1MxFMnxCZtY9MMHiO3RDIP F9EPCcD9utKeioswYxjDlbkSsuPYc9Bc/NxcAJTjoSlNgluwFD2VRoC+3CIj1Qc6s9KV4L /vIhLdXI/lbEONnWLOG0czdCE6D2rWP0n7OX+RQFEIyNQyOEO4xAHPbxa/6PReUDaenFtA G3mdhNr/OCPv0hC7iAXy7NdEepeou0rhiI11sfk9qYwVRHRKHqnkiwokw3Aqcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791773490; 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=Be9WPUEk7JIVLRp4WwIV19u0AfMoNAjCLDXhJ0vW8Pg=; b=j4gI3gl3OWwId3zI6Wi+UJQIOYWKPERNapfpR0HmGZq/9QaMEP0biuAew4+vg/iuQl1DmR oJOlz093Xq0xyQ9nONPI4bAAMkN3RtvNTh4xk65fP2E42iOlZBZPWJ+IWvuqrB6VR9hVPb mRNqbiktt0UYouwPSkcnBsU0zJ1T7fWD61tmzOlr/bG7I7Oc+t2tuEUpo+zViEuw0ShPea Kba27m75ii6CuF7kgDiK8ou97EPI2/8RtYbLfI/AU2AXn1+/uVeCB7XDty57HdObuVXooa Wxrztw9wFXn6SfWFjd7X+V8a6KFFZMKJk6DzteqI+kAW6ThBSU+eT62zF0rmwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j326V57w8z18gQ for ; Mon, 12 Oct 2026 02:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 02:51:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: b3ef4013a4fa - main - iwm: add lock assertion checks List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b3ef4013a4fa75063930d0221a0bc50f95af0527 Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 02:51:30 +0000 Message-Id: <6acc4b32.41a7a.36ae3d94@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=b3ef4013a4fa75063930d0221a0bc50f95af0527 commit b3ef4013a4fa75063930d0221a0bc50f95af0527 Author: Adrian Chadd AuthorDate: 2026-10-12 02:40:54 +0000 Commit: Adrian Chadd CommitDate: 2026-10-12 02:40:54 +0000 iwm: add lock assertion checks Add lock/unlock assertions to use in current and future code. Differential Revision: https://reviews.freebsd.org/D60400 --- sys/dev/iwm/if_iwm.c | 4 ++++ sys/dev/iwm/if_iwmvar.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 6840c6a4d00a..51a0313842d0 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -4892,6 +4892,8 @@ iwm_init(struct iwm_softc *sc) { int error; + IWM_LOCK_ASSERT_LOCKED(sc); + if (sc->sc_flags & IWM_FLAG_HW_INITED) { return; } @@ -6557,6 +6559,8 @@ iwm_detach_local(struct iwm_softc *sc, int do_net80211) device_t dev = sc->sc_dev; int i; + IWM_LOCK_ASSERT_UNLOCKED(sc); + if (!sc->sc_attached) return 0; sc->sc_attached = 0; diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h index f31057c07b9b..af1c484e9690 100644 --- a/sys/dev/iwm/if_iwmvar.h +++ b/sys/dev/iwm/if_iwmvar.h @@ -566,6 +566,8 @@ struct iwm_softc { #define IWM_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define IWM_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define IWM_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) +#define IWM_LOCK_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) +#define IWM_LOCK_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_NOTOWNED) static inline bool iwm_fw_has_api(struct iwm_softc *sc, unsigned int api)