From nobody Thu Sep 24 16:20:35 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 4hrJwN1d87z6st2P for ; Thu, 24 Sep 2026 16:20:36 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrJwN0tVLz4b9P for ; Thu, 24 Sep 2026 16:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790266836; 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=Z8ga2trtSxLZPYutg3EM4Loyj7NEJfIdYOXCusfeIUs=; b=bAfEBPz6/NtypKFrJK0Vf6yMNdUhLXVdDKdRYMWnWhSzsCjy77Y5Gz4a/8wukrD36CE5Fi 6BC7DvTp1F9nABtTnLaY0HOaef6XUXnYtwfHE7t67eQeDd02Li4noiRoGLrxXmYjTik8Wx OoCJNP/ZyD9W7dZES0wUtwbF7fGU9nNcOEVwnIs9PbNJuvIWkSCgup7WcB1mx/0zm/8YIY SqJKXUVE2d1wZ7cKNu5ZDEhaME8Au3BIv0Vbsu5BkoYFk+tN9USTJHOF0UaKeL9YxHA5jN ++SM2dfTfR4rugTG9DPyDTdeJpXs4AtethvdI6P8veCqQ4u0ZQusqx4YRyTJtw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790266836; b=wVj9q6D0n0Ag0NLElEXv9N+vxtN1eBMpJ1twhKd6+jL54I7qkAdCDcrKO49/92fAdethK2 wzDaTtUV10lMrVIiTIn0gYu20Nph1uJ4a7LTCw3YtZ0XiYNSQ9FSTb5F78fv20PP4GqLxz 1V8J6AOfuVipNMEW9VaQuh0aot4OrRYkTVPeZXyac9DTF6hlFjvO69ihhAa3YS9Kqw9S5p 8ho2z5GzXd3KIHTp+NNX0Tmvms8F7cVR50aT7heoVfoZ9/ZdyTWURqPOuFqgDL/wfBmxEU dF9hNjg09ZxGdnspm4x+Urc+Glo5q6hnsjv7qonIoRISIiuBX2FcZUPvtNUihw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790266836; 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=Z8ga2trtSxLZPYutg3EM4Loyj7NEJfIdYOXCusfeIUs=; b=JIWm5TftGewJM7sG47ZEI3QD3LyXTJlxEDCjUoEYf4cxNBCkmISO36lJXR/s4tBYXtvZCa E3Qv4+sMGalTLrtYeQJFTYbtKEa7KNZ0/cXc00seHxCtd5SRJrSe1ocia7agSaWwQrknj6 n5PJtlNfprZuLwLIYuKR5eIfX7lLVktdCyjRrBPXU7dkJGxbEHfqbyZdEYYY4ncm1QJgE5 W21gGzrowKCcQ43R2KBbB68SN6A7DUuAlSf0vIBP4GsTBJSr8YstBfdIJRczr6nNTNo5Ki hbl/MJD3wDbPNQUDhWiasK2GVLCFjq1tScdC12grpqQxCe2zcUFHM8Nr7Fv7qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hrJwM74CjzWRw for ; Thu, 24 Sep 2026 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46b92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 16:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: dd16a5f53b0b - main - lockf: Do not block in vfs_busy() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd16a5f53b0b2e967d20d2900f18fc320997679b Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 16:20:35 +0000 Message-Id: <6ab54dd3.46b92.587e69c0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dd16a5f53b0b2e967d20d2900f18fc320997679b commit dd16a5f53b0b2e967d20d2900f18fc320997679b Author: Mark Johnston AuthorDate: 2026-09-24 16:14:34 +0000 Commit: Mark Johnston CommitDate: 2026-09-24 16:20:25 +0000 lockf: Do not block in vfs_busy() A race is possible otherwise: vfs_busy() may return after an unmounted filesystem has been removed from the global mount list. That is, vfs_busy() will block until vfs_mount_destroy() sets MNTK_REFEXPIRE, and at that point the mountpoint has been removed from the mountlist, so TAILQ_FOREACH can return an invalid value. Simply do not block if the mountpoint is being unmounted. Reviewed by: kib Fixes: eca39864f702 ("Add sysctl KERN_LOCKF") MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59982 --- sys/kern/kern_lockf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index a318c26484b4..2cb02b21cd78 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -2558,7 +2558,7 @@ sysctl_kern_lockf_run(struct sbuf *sb) error = 0; mtx_lock(&mountlist_mtx); TAILQ_FOREACH(mp, &mountlist, mnt_list) { - error = vfs_busy(mp, MBF_MNTLSTLOCK); + error = vfs_busy(mp, MBF_MNTLSTLOCK | MBF_NOWAIT); if (error != 0) continue; error = mp->mnt_op->vfs_report_lockf(mp, sb);