From nobody Fri Aug 7 09:10:05 2026 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 4hGddn4Xrpz6pC3W for ; Fri, 07 Aug 2026 09:10: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGddn401pz3gCv for ; Fri, 07 Aug 2026 09:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786093805; 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=RqXXNXmX6/sJ8UeKZaeFAsg50NwYXLA2hOqDAOmgvZ8=; b=k5Lg7SwZ4CjMAAmk10Qhi64w4gpRO0B/2PCrKyM8j4u0FVy58o/oTLJ5p5g4S4i/VBATtw 12BX2B1hp5O4O7J8y4ajjL8Xn2wcM7SGaQjlSpwcF5YgpQ2rchuJS2zipp0c4YysZwgml9 09kw+EWQw0Tf5sh3Zxp/Da1W8hcb5SesXISxM7/6G1oOcxHZ8CZRBNVKKaiu9Ssv5jTXuF pWEtd+Hiv059ewOOpXhp+VCW4HFmlfE9bVxnXYwCOu3OH7Df23/ZnkWFqIqCSKoIG3X7ZR pJ4FkAWgRQbH3mrk84C01oQIvBMjxH6vf5BnmajNrFBJv2sI4U0PANNk/YI1uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786093805; a=rsa-sha256; cv=none; b=bOmKIR5EDVv7VlMg0mSxwqJEmuQ8/F/5/hhDaJr1XbPdIvzi2emrY6ZjphHYa9ixfj7QzV eB66YNbe1L95cnaGK+Dj6wiSQ6ydgQwBo+reHEh8PQbkMjmLHssb4Q2qFaWHXMLDCPdOAA EGaCNVUF+YkJhie5sG+jUu0SNE9HnoV83iMyWCRM+t++D6UHOe97kZGce1fEuqF1VK9RPI dPJ+MA1FtD+FO2H8nlGk0ZkDovS75Jk9486VhPtqNW1VqQBzmeb6FCAhGQiAYhDBZmTPiE hzGoO24OT1VXUQH/jHQMuoH/uRRhAR45+lRrCoaJz1+t91F/imXUslYCl0isMA== 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=1786093805; 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=RqXXNXmX6/sJ8UeKZaeFAsg50NwYXLA2hOqDAOmgvZ8=; b=iGJupCS7DhK9Vkb+s53K87JRTrlgmCO4HEDMw2LOVCgrPYx9UM/Iqvf4o92KeSj0wCIqG3 FLgLf8aQ6Kh3OiwpvxjZfA7e65ez8OPeIEMJyXZeh+LSi36qRIcO5eEmq/bWrmRKxQLFRd kgbQKgEf0DCwifAxgB7JmupfDwlKKmq13juEq6puQwKzTs1Z7EGbe9WjzaAEzR9z6hnaqi YS9BY+E+/58EBJhuw3MO1GrOKz+yGCgjUPmkMj5T8jAvzrkZHsmZcHzCWjJrY3tQ/ql7wm le4aRE+DOUPwQ75ZVOltjxdaPUVNg8inKo3MMD6wo2ST02RoIYIW6D+yZ0rlpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGddn2w3bz11JB for ; Fri, 07 Aug 2026 09:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 09:10:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1d97ad676d58 - main - lockmgr(9): add lockcanrecurse(9) 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 List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 09:10:05 +0000 Message-Id: <6a75a0ed.1bd7e.20bcdbbf@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe commit 1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe Author: Konstantin Belousov AuthorDate: 2026-07-31 04:11:05 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-07 09:09:50 +0000 lockmgr(9): add lockcanrecurse(9) Also add vnode locking wrappers for lockcanrecurse(9) and lockdisablerecurse(9). Reviewed by: jah Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58567 --- sys/kern/kern_lock.c | 7 +++++++ sys/sys/lockmgr.h | 1 + sys/sys/vnode.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 76f68677e292..b12d5bc2f12c 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -495,6 +495,13 @@ lockdisablerecurse(struct lock *lk) lk->lock_object.lo_flags &= ~LO_RECURSABLE; } +bool +lockcanrecurse(struct lock *lk) +{ + lockmgr_assert(lk, KA_LOCKED); + return ((lk->lock_object.lo_flags & LO_RECURSABLE) != 0); +} + void lockdestroy(struct lock *lk) { diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h index 48eea47c60da..ca066148d7d3 100644 --- a/sys/sys/lockmgr.h +++ b/sys/sys/lockmgr.h @@ -82,6 +82,7 @@ void _lockmgr_disown(struct lock *lk, const char *file, int line); void lockallowrecurse(struct lock *lk); void lockallowshare(struct lock *lk); +bool lockcanrecurse(struct lock *lk); void lockdestroy(struct lock *lk); void lockdisablerecurse(struct lock *lk); void lockdisableshare(struct lock *lk); diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 9d17dde1e73d..2fa1a51ce1cc 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -480,6 +480,8 @@ extern u_int vn_lock_pair_pause_max; #define VI_MTX(vp) (&(vp)->v_interlock) #define VN_LOCK_AREC(vp) lockallowrecurse((vp)->v_vnlock) +#define VN_LOCK_DREC(vp) lockdisablerecurse((vp)->v_vnlock) +#define VN_LOCK_CANREC(vp) lockcanrecurse((vp)->v_vnlock) #define VN_LOCK_ASHARE(vp) lockallowshare((vp)->v_vnlock) #define VN_LOCK_DSHARE(vp) lockdisableshare((vp)->v_vnlock)