From nobody Thu Aug 13 00:35:51 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 4hL5xh3r4vzGmqt for ; Thu, 13 Aug 2026 00:35:52 +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 4hL5xh0vCcz3SL4 for ; Thu, 13 Aug 2026 00:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786581352; 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=bQrKT5rmoIArmCytyfux0DZ2Xfw5nn7vL09FFHVc5Qw=; b=LMYMTX327QZpIes+PZE0YcB7Y2FiRjuiTNYzQ3YZ7c/ZV9bMCuqc6Swv9jr1EP8U0puvWb iRfDL+vG8xX/spgHQhmA52T7CJ6EVAxMUQ5jbvH98AG+mXk9Z0Evz5aRukuxHIGmgPS2sO LmVVEC+OdIw1EnMz0EGZvSarPDi2KVPdsNMGX/aUeJf3VcD9boDZdhmGB+6ba1bnxUBcMC GiRFGBq+g+iCT8/4pCroFvRylJZQmonvZJxlMnEUDvxeArlAHzSTszFQMcyjikNkiSLKev PEN2wOM9JUIsMyj2QScPY6txveRm4imfgmTKjE9+RXDiw30S4d8j2oyGYgQ1lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786581352; a=rsa-sha256; cv=none; b=FPFl+Mr8xbGjtUcSr186l8JwWQne9UCW6GVHofSfYFAB6XmbpuCQm60htOoR+KiVlXa7k0 QcnUpYUnlkR9L25WKZZj1xMjlZv069oxwi09QB8HXM1P+hOordz8mGF1XfZbJh1ngzvTU8 k4aJ2eAydSSdlBzN2ayuYv6axv7j9r20vAgPmsB3pcfTJO6JUOgOLAB8bf4+ZXFP4w+wni hm46/oZDIkEYjcUR7IC13D9wJs1VkkQOiGpHVjpoZCxTYieMLA0AnvloocaHMcul336XlX 9cnQ5u+fE3Ef0UE+3EdxE1VWeWJJQzPC7khvO4Vam/C7q9uPPL/9SNCfaQEQRA== 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=1786581352; 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=bQrKT5rmoIArmCytyfux0DZ2Xfw5nn7vL09FFHVc5Qw=; b=cJIyxoAcB3ZLYe/eGZ+ngV2t8zk7EQPncjFsYMREQZD+FhoOk21ilhtrK80NH+v42i1pHq 4VQljH1wzX1PVa3wo+c3nhEhyI234+T/s9H0XzCZSeGc+e4s/EbEPQiQphpMwb1AZet9Yr Wd+jk79m8nTNdiKDBh30zXpvyZwYiTLuQsX91NvPMNFxXNZhxAn6A2Hr3lpLZl2Z/FnLvV cp7yXU/gVaeFdWUK0BwnYxQbswEzT7T0xM1QbImfa/mJqpr7ZoCG/Yh1vG6lsKexvkjRA2 N1sO3NyEjimevcVKSaGBM24kltRXrqeJQj76QPdwnM9GEBFfo/WcGpRQ8I2ztg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hL5xg6TLqzpQN for ; Thu, 13 Aug 2026 00:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2101f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 13 Aug 2026 00:35:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2389370c75c1 - stable/15 - lockmgr(9): add lockcanrecurse(9) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2389370c75c132147fbfa99289a2cbc10a8a43ea Auto-Submitted: auto-generated Date: Thu, 13 Aug 2026 00:35:51 +0000 Message-Id: <6a7d1167.2101f.67be41bd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2389370c75c132147fbfa99289a2cbc10a8a43ea commit 2389370c75c132147fbfa99289a2cbc10a8a43ea Author: Konstantin Belousov AuthorDate: 2026-07-31 04:11:05 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-13 00:34:41 +0000 lockmgr(9): add lockcanrecurse(9) (cherry picked from commit 1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe) --- 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 4513a7a62140..dfa0debc5c39 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -484,6 +484,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)