From nobody Fri Jul 21 09:22:10 2023 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 4R6kbR00BMz4nblK; Fri, 21 Jul 2023 09:22:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R6kbQ6b1Cz3DrY; Fri, 21 Jul 2023 09:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689931330; 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=2BC/EQSpQgnmJgqq4/rhTvdVBP3I7JvsrFX7yqQBeew=; b=AUs8eNbstTN+SoZLNtL4cX04ypvIV2ZdUqRRnvdlRLBanqvLG1RW6n6CFXZCprKT/eAfWK BkqGkU+FEfDXMCLts4mrygswQbpEuLllxPuB1ONMcAYZ1Gf6QLMNmLvAb/JRMoq0/U6maW F5bVF1Zw2UKaOn7uaQstQtSny+rr96CFWNIlJTYdVxwjKBc+h1d7NG3Z0Kb8M7qESZxJsj IxYdv/S7exccVAhTrJ6ystHUnH00OXcdiWHCvPEX1ugn8N695Av4hqnLw+rsby1UMr75BB UXo81TgPsKfRWxCN1w37uxktadBL+n+L+BlxsjniFZbEBBh/kycfUXlsRPA5dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689931330; 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=2BC/EQSpQgnmJgqq4/rhTvdVBP3I7JvsrFX7yqQBeew=; b=JCrfIKiAXD8MXahg949OVgbfiwEnBkIb/l/D4+ts71t+b7Htg3w+W3tkQ+PG+E/jeyQSzc WJ5qKvTxTOfG8VBeAJ7ZNrco7m3SIDFLPZlGjbiuIMYui7ZiOGu1LAafuASuoRcL8yuoqE KQonBbizLI0xxrCdopQhHFR7beoM8Ooy5jzV0AAmdz4TBCT1S6ST7d1igqtfss8vLXV5Nr VfTodLACe1vO6pWOVmJWmGJE4pZa4aCobynkm/ukGvSb6TAyJb/AsFq3ObIi8FzeO2Fohi 6E5rLIA8tB8f7PCx+D7RBwMKqJ6kQKsiW3IZEfkmUudajdX94BkXVZW3T4o4Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689931330; a=rsa-sha256; cv=none; b=H06rvr1IXw/OpM3PfOJ9J7ChhMOvoropSImS/wRUG+YKyuLnuEqx0bf+5wn5gv9ZadCUSU F/dsN46zSS3waI6mGtTHne6XOZkm2EfJI1wz9bhstCEYF+VYj1K5m0quT/CaYIuzTFxRcB ajIYpcIIrJ0UgrN3QgZXazmK4eg/Z9LRmgSZ4HIjHqQyh138Yth2lyOmhnU9he2Og9zHmZ CvIVZeeuq3SXw9/cVUIwCMDLJZx6uparezEl+MnGQddNSzsGjGsraGmR3bcpes8V9LzIDT s0fTBwmwg80MgXH7JfxI34rH9njKl5/G0P+zjoz+cMlomxVuHUgUDau+PdOUIg== 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 4R6kbQ5NTjz16mF; Fri, 21 Jul 2023 09:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L9MAAi094453; Fri, 21 Jul 2023 09:22:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L9MAOp094452; Fri, 21 Jul 2023 09:22:10 GMT (envelope-from git) Date: Fri, 21 Jul 2023 09:22:10 GMT Message-Id: <202307210922.36L9MAOp094452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2238fb423031 - stable/13 - vn_lock_pair(): Support passing LK_NODDLKTREAT 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 2238fb423031ff7cccdf733a89f9d26198e39af0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2238fb423031ff7cccdf733a89f9d26198e39af0 commit 2238fb423031ff7cccdf733a89f9d26198e39af0 Author: Olivier Certner AuthorDate: 2023-07-09 17:12:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-21 09:21:38 +0000 vn_lock_pair(): Support passing LK_NODDLKTREAT (cherry picked from commit f58378393fb00f1683bc15f1ae7cbb83e047b9fb) --- sys/kern/vfs_vnops.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e314739fa0ad..628e3aecc864 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3878,6 +3878,9 @@ vn_lock_pair_pause(const char *wmesg) * Both vnodes could be unlocked temporary (and reclaimed). * * If requesting shared locking, locked vnode lock must not be recursed. + * + * Only one of LK_SHARED and LK_EXCLUSIVE must be specified. + * LK_NODDLKTREAT can be optionally passed. */ void vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, @@ -3885,19 +3888,21 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error; - MPASS(lkflags1 == LK_SHARED || lkflags1 == LK_EXCLUSIVE); - MPASS(lkflags2 == LK_SHARED || lkflags2 == LK_EXCLUSIVE); + MPASS((lkflags1 & LK_SHARED) != 0 ^ (lkflags1 & LK_EXCLUSIVE) != 0); + MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); + MPASS((lkflags2 & LK_SHARED) != 0 ^ (lkflags2 & LK_EXCLUSIVE) != 0); + MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) return; if (vp1 != NULL) { - if (lkflags1 == LK_SHARED && + if ((lkflags1 & LK_SHARED) != 0 && (vp1->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) - lkflags1 = LK_EXCLUSIVE; + lkflags1 = (lkflags1 & ~LK_SHARED) | LK_EXCLUSIVE; if (vp1_locked && VOP_ISLOCKED(vp1) != LK_EXCLUSIVE) { ASSERT_VOP_LOCKED(vp1, "vp1"); - if (lkflags1 == LK_EXCLUSIVE) { + if ((lkflags1 & LK_EXCLUSIVE) != 0) { VOP_UNLOCK(vp1); ASSERT_VOP_UNLOCKED(vp1, "vp1 shared recursed"); @@ -3910,12 +3915,12 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, } if (vp2 != NULL) { - if (lkflags2 == LK_SHARED && + if ((lkflags2 & LK_SHARED) != 0 && (vp2->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) - lkflags2 = LK_EXCLUSIVE; + lkflags2 = (lkflags2 & ~LK_SHARED) | LK_EXCLUSIVE; if (vp2_locked && VOP_ISLOCKED(vp2) != LK_EXCLUSIVE) { ASSERT_VOP_LOCKED(vp2, "vp2"); - if (lkflags2 == LK_EXCLUSIVE) { + if ((lkflags2 & LK_EXCLUSIVE) != 0) { VOP_UNLOCK(vp2); ASSERT_VOP_UNLOCKED(vp2, "vp2 shared recursed");