From nobody Mon Feb 10 14:52:46 2025 X-Original-To: dev-commits-src-branches@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 4Ys6xp6FGmz5mHBK; Mon, 10 Feb 2025 14:52:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xp2Gkvz4LSd; Mon, 10 Feb 2025 14:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199166; 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=0cFa1tI7geMSu57dMRVLPiJza3ndRKsqYqpCSodDlw0=; b=pd7BeJEX1bVUZy2dKXR33Sxirqyvh/AFHz/AbXDxRP0cxkv7aJOe+kS/vBPmyszVM+wntD JY5fbaqmunXU10TxNtJd0/g0SgJx7Q3WChC2VnGLtcykE3s8xt6K+Xmdn+HEYIZi35rHvx 1fC5iBNFfRvulnJtdGfBNLW2PwSBvqGIIHamPPvDYn6dAizpY8j4waLWHM91kkR1z4402I F/wD5G3Rui7nnkf3d3+lfkyX65ca+2M6ib40XWVhDEH2qMZDL1iSY/3PSrWztUWja0yiKl b7KDfMDQnuy4YrhKXMMM56qDq2COkxFGDB9PysYgukbEUOu4yQmt6U9dRzGpIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199166; 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=0cFa1tI7geMSu57dMRVLPiJza3ndRKsqYqpCSodDlw0=; b=g/FBIl9J6CRh6MZK0hzeTC5t7dWSVyTT4ChVkWHRjvkeuegw0nzF6yiRq92F0LQTybsQZX 8Wq+oRH193jYew3tqJDRNqHkHNTJeyXIVIDrN/3ssXqzeQ/urXUkJl4oVLI5NyPdfSSN6t iS5h9xUcHHAyfTUXFCZzJYMczSmHt66DgixblyJwkNiN+WBNN1bZiYDZWyt+fztNfQVy/X r1TsSOiioeR3CTVGsQ9vkzcc5OAYdt+Dm6T14ap2FNodUae8zcIsv9uLxC7nk7BDC4kbhd I1ndpr89YIfJXUF4VmK7tpFOmkJpww1tSYwns3/bJ1Jt8vlbvOzxXCkaT5Pcmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199166; a=rsa-sha256; cv=none; b=NTBgF2aXwARLpW1qrxML38bxtScKsHf4KkxqDxeyH9/+KBLo9pIG/j1ZuTj/UxuzL05d+N VjWlQXLTIUY+AvKgYdoRwAgI0t7irasmYzFVkyH7Dh05HsNJ0mV3ktuRJ3jpDjH2uK3cch LC0JsQG6rOPDXDI7fUp0U4z4wj8l5oi5sPDdkmt1LpsouSlKRkEkQfaBdKjQiVkubm6kGK faeJmLWbSrwodTamdwjd0NPuNgf5WmuVbXv7Zb3Ya/Cd7APvlf1ACeclPYu3n6z2gZ7hQy voJVHhd10D4ZHqfCspgZsbYZGtbVgHfpU1138QGd+BoGGhNUAKiauzxPO2P31g== 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 4Ys6xp1nWrzXWr; Mon, 10 Feb 2025 14:52:46 +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 51AEqkum028082; Mon, 10 Feb 2025 14:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqk33028079; Mon, 10 Feb 2025 14:52:46 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:46 GMT Message-Id: <202502101452.51AEqk33028079@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: 4eaf978df5e1 - stable/14 - net80211: add IEEE80211_IS_LOCKED() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 4eaf978df5e11c70c6319467fedadc7a2b27e76c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4eaf978df5e11c70c6319467fedadc7a2b27e76c commit 4eaf978df5e11c70c6319467fedadc7a2b27e76c Author: Bjoern A. Zeeb AuthorDate: 2025-01-15 22:50:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: add IEEE80211_IS_LOCKED() When trying to sort out a teardown locking problem (downcall in the driver can sleep) I found that the fan-out tree was getting too big to fix net80211 locking per-se for this while working on entirely different problems. Add IEEE80211_IS_LOCKED() so the driver can check and un-/re-lock as necessary (as we do in other cases already) to avoid panics on debug kernels left and right. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48475 (cherry picked from commit 054c5ddf587a7a0c430cf64dbf100b718eafdcc5) --- sys/net80211/ieee80211_freebsd.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index ec017bb21ec4..e21364884e15 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -73,6 +73,8 @@ typedef struct { mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_OWNED) #define IEEE80211_UNLOCK_ASSERT(_ic) \ mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_NOTOWNED) +#define IEEE80211_IS_LOCKED(_ic) \ + mtx_owned(IEEE80211_LOCK_OBJ(_ic)) /* * Transmit lock.