From nobody Tue Feb 01 09:03:07 2022 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 2EAE419ADC8B; Tue, 1 Feb 2022 09:03:08 +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 4JnzVM6w8Fz4Wcm; Tue, 1 Feb 2022 09:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643706188; 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=xv4D5btygRDJkDl4A+S+3Vsc/So8y57U7NU0Z0EYHec=; b=aBNyW69BGxow/+qpRWMijDXFpMEx7iE7VIg1Pf0+uSXWMyYwhDTHH7tDuc6iZSZbMtRgyB +KacMTll8pCR7Pi8g0dp2X8co//jhF9YIHg5Rf6WPCLuK8ulIakYkhr7IpCxZl0Lb8Ew6k qlXuzS+DSKgxY/FTQHnsAFm87nsdXTEzAx2YITQgz0ijC0GwrjxV65x3VBn2NRLNRy6Lnz 6Re+R3F5MnXRFQvvo3ZC6+tmI7Fst8J8p40b5yh2y2vjjrHTZ7/bT2VJaTLgZEwZS2QqZr 3mQUKpx+qXe/QpOqMaCreVDfK1pOhoT2khGHLrkwG0AyUoWOLr/tT1BRRxHZDw== 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 C117A5720; Tue, 1 Feb 2022 09:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 211937wc043061; Tue, 1 Feb 2022 09:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211937AT043060; Tue, 1 Feb 2022 09:03:07 GMT (envelope-from git) Date: Tue, 1 Feb 2022 09:03:07 GMT Message-Id: <202202010903.211937AT043060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 303d3ae7e841 - main - ufs, msdosfs: do not record witness order when creating vnode 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 303d3ae7e8419b457078598b8569e57a5e3fb5ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643706188; 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=xv4D5btygRDJkDl4A+S+3Vsc/So8y57U7NU0Z0EYHec=; b=oqQCBTWuKbmHWTf3xKAEFXupsGGSxG+aMzMPxvdANfo1fCcIMY8tw0wlCJ0xwlBwJN4CFq GccXVECU8wb9ptLp8z/Z1HW48Us5BPUk2m/MQfHZo8K31/jqRQN9KFF/NVnJ8GmP6rXGb3 5HY5suXGRIh1Sh5SNJgez0lESjj5P21wx+n1QI3Ux2DsnmvpN6ZxBm5lnkSfHqTBhy7L6z Nsh9RQE44t9pl5q1Op1tWvlCzwrL3mJ564oxXabMM5tQv7mXfXd4DBfW9ZXoa7nlYLi/tI XR6l1c8hrKEGHMqzFqm47MBus1h9WNkM2kRCHwjLttheYg32IUXklHSHM29gsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643706188; a=rsa-sha256; cv=none; b=f5nKhQaOD3Tvb/yvHjpYcxOd35nRdWWf6wkMIJwtRfKiKg49+boSv79DzoRkFH4ybpDgEW mPr1xjHV9wYTfVC1WOeCDi3r1nLDUN7icPH7Q4xOjYKbZdesrYuIVTBSjzjPGSfEt4sCKE rHGDVGr4MBEQ77MFVQ6+DzGwQlVhLUL2oPRHcflp5eZP1dEq6DKoihTgShdobf7bWx0XBx yStMpRufvd9FxNsmAT9GSsi1ch0a8mOLxVM54oDB4YUfnq7+QJo1O8kMLggXePMu+mFbL5 nbXwYE+sSGRoEhLtFuup7rMN3OfMfAzu5zAbf/VBFv9OuRzbixfuN4dpI8gQ7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=303d3ae7e8419b457078598b8569e57a5e3fb5ce commit 303d3ae7e8419b457078598b8569e57a5e3fb5ce Author: Konstantin Belousov AuthorDate: 2022-02-01 05:16:30 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-01 08:51:55 +0000 ufs, msdosfs: do not record witness order when creating vnode When allocating new vnode, we need to lock it exclusively before making it externally visible. Since other threads cannot observe the vnode yet, current lock order cannot create LoR conditions. Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34126 --- sys/fs/msdosfs/msdosfs_denode.c | 2 +- sys/ufs/ffs/ffs_vfsops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 70b574e48e4b..408c96981481 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -181,7 +181,7 @@ badoff: ldep->de_diroffset = diroffset; ldep->de_inode = inode; cluster_init_vn(&ldep->de_clusterw); - lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(nvp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(nvp); /* for doscheckpath */ fc_purge(ldep, 0); /* init the FAT cache for this denode */ error = insmntque(nvp, mntp); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 131bdc33f427..a2a361e813e4 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1891,7 +1891,7 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags) /* * FFS supports recursive locking. */ - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(vp); vp->v_data = ip; vp->v_bufobj.bo_bsize = fs->fs_bsize;