From nobody Thu May 28 07:57:36 2026 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 4gQzNx1r1Gz6fHqr for ; Thu, 28 May 2026 07:57:37 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQzNw5vG7z3l8W for ; Thu, 28 May 2026 07:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779955056; 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=h44RTcmn0g5VjjmAnIVoXspMgujDxlgD/3ID467Vj+U=; b=LglKY9y2WwvTxHrBV1V6q7VZX5eQG0L/QZGu6MVCr8TD6bWZh3ekCKo3pJrqdEn0upv12W 5T11boSiiCV8unTbmPLl2nWa5ORGf1zzb0DV02b/PuM2DLwjRn1+0OskjXYNqb95kBoItu rPJkwkVIxQoIdgvXxlbFnPBL3gMEPqmwkd1Jy0IUIJPokQpZSQLh2LruEi3pQvf+1lwlVW P3IeU1PkC7LhNk95wrzrIsp9RmXniG+fkaWeBWgSstt4wYc6gnbhiyKTJXBubUtL352MCU lzY/5R+CkTKCXgTub3UF1rNVnDp62p3DlbmAJWnTv52fZMVGhxLlw86OobtBfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779955056; a=rsa-sha256; cv=none; b=GSd2iUxQ1kH7lPCW6EsDhXVKc2epLhl+ThKue1wt6OOZXkWB6RSnySt6sL+HQoKxM7ZDM2 5OlnjxErTcA9Eg6zUmYYlYnhb21EX0Aao8MaTN6lu1QfQq8q2iUkiKZ/+IsYhyNBvZL3wR Gc9LD37GVVKRsLy8RyKQdytk5hyjIFku1+FVteZnqnFIEJov3L/aFTf5t/2gKWgq3Cxgol puIOxdsU1rcMlFe7DuC8T6SZ/yLk3otbLEJuR4cE2DVA8yvi0lHnmchcxxV3riarnkKOFV l+tbaWTg+4BAgFuzWA3H4F5uYeXu/yseStfdSs8siKPxAY4LWf9ciLxLzzP3qg== 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=1779955056; 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=h44RTcmn0g5VjjmAnIVoXspMgujDxlgD/3ID467Vj+U=; b=nOpg6wNGPsoa/IkTWSocJvbkWJ9Cui/N8SIOVaV9J3zl2u9lNTcg9Zcok4KNBKiQyGpOZ1 6oUvVzY9O+/P/CR8ZkZzYeqbM+hgE6LWhPCjKlULRBhFGrEjsUPSQnv8s9ujTkhYsMb9dr G7If53Jpr34NLvOXhDK9WOupg2bHD1orOMArHdQ5p9VQAx0DYjmcr5D4HA0AwoWegtfhCc VZsM8kKjSVSTOd8lF9IEhTqZA7l5vBDKioKhAOAHtaUEv1C+qZootMZSbw3C4e+tGG8jHR ZyBbZyxlJPU+eRJH0WhfcaV/ZegyZaovKO+S2CeKHmJG55p6pisN4Kotre0DdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQzNw5BSLzdbx for ; Thu, 28 May 2026 07:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2116c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 07:57:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bae3d28fb6a7 - stable/15 - vn_lock_pair(): handle the case of vp1->v_vnlock == vp2->v_vnlock 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 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: bae3d28fb6a72a5be337bf92c2294bbfdccbb13c Auto-Submitted: auto-generated Date: Thu, 28 May 2026 07:57:36 +0000 Message-Id: <6a17f570.2116c.67d93632@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bae3d28fb6a72a5be337bf92c2294bbfdccbb13c commit bae3d28fb6a72a5be337bf92c2294bbfdccbb13c Author: Konstantin Belousov AuthorDate: 2026-05-16 23:19:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-28 07:57:14 +0000 vn_lock_pair(): handle the case of vp1->v_vnlock == vp2->v_vnlock (cherry picked from commit ace4a3e177c0da5efd9ceee0d9f46068562e3f5e) --- sys/kern/vfs_vnops.c | 32 +++++++++++++++++++++++++------- sys/sys/vnode.h | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 393353d8c038..1746d344aa64 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -4358,9 +4358,16 @@ vn_lock_pair_pause(const char *wmesg) * Only one of LK_SHARED and LK_EXCLUSIVE must be specified. * LK_NODDLKTREAT can be optionally passed. * - * If vp1 == vp2, only one, most exclusive, lock is obtained on it. + * If vp1->v_vnlock == vp2->v_vnlock, only one, most exclusive, lock + * is obtained on the vnode(s). The function accounts for the + * possibility of vp1 or vp2' v_vnlock changing while the + * corresponding vnode is unlocked. + * + * Return values: + * 0 - locked, two unlocks are required + * EDEADLK - locked, vnodes share the same lock, only one unlock is due. */ -void +int vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, struct vnode *vp2, bool vp2_locked, int lkflags2) { @@ -4374,9 +4381,10 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) - return; + return (0); - if (vp1 == vp2) { +recheck_same: + if (vp1 != NULL && vp2 != NULL && vp1->v_vnlock == vp2->v_vnlock) { MPASS(vp1_locked == vp2_locked); /* Select the most exclusive mode for lock. */ @@ -4389,20 +4397,26 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, /* No need to relock if any lock is exclusive. */ if ((vp1->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) - return; + return (EDEADLK); locked1 = VOP_ISLOCKED(vp1); if (((lkflags1 & LK_SHARED) != 0 && locked1 != LK_EXCLUSIVE) || ((lkflags1 & LK_EXCLUSIVE) != 0 && locked1 == LK_EXCLUSIVE)) - return; + return (EDEADLK); VOP_UNLOCK(vp1); } ASSERT_VOP_UNLOCKED(vp1, "vp1"); vn_lock(vp1, lkflags1 | LK_RETRY); - return; + if (vp1->v_vnlock == vp2->v_vnlock) + return (EDEADLK); + VOP_UNLOCK(vp1); + if (vp2_locked) { + VOP_UNLOCK(vp2); + vp2_locked = false; + } } if (vp1 != NULL) { @@ -4473,6 +4487,9 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, vn_lock(vp1, lkflags1 | LK_RETRY); vp1_locked = true; } + if (vp1 != NULL && vp2 != NULL && + vp1->v_vnlock == vp2->v_vnlock) + goto recheck_same; } if (vp1 != NULL) { if (lkflags1 == LK_EXCLUSIVE) @@ -4486,6 +4503,7 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, else ASSERT_VOP_LOCKED(vp2, "vp2 ret"); } + return (0); } int diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index e48c4db95341..bb1d3faf567e 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -794,7 +794,7 @@ bool vn_isdisk_error(struct vnode *vp, int *errp); bool vn_isdisk(struct vnode *vp); int _vn_lock(struct vnode *vp, int flags, const char *file, int line); #define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__) -void vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, +int vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, struct vnode *vp2, bool vp2_locked, int lkflags2); int vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp); int vn_open_cred(struct nameidata *ndp, int *flagp, int cmode,