From nobody Thu Sep 24 16:20:35 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 4hrJwT2f9zz6st53 for ; Thu, 24 Sep 2026 16:20:41 +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 4hrJwT1Snxz4bJt for ; Thu, 24 Sep 2026 16:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790266841; 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=NM8w24WNwDTZXkB/EAIxFIH9eIMcbG80N7fyopXpDBBBpBb1X5HH+xizTOGVs4wyUiuJek 7qq8mGsuLgAXuMAZnqq4jpYJxbup0IsjBnPPDkUsJCQrhX+pz/8gzFDJB50QnfNs7F62v8 tVdaawK3+SKtFJB7k0pCUShddUMGm+HF9FczuvBs7+KxbQL1EdEAdO93u5d5OqSqGjYT/a kk2ZwSwcPL93Zldldx3ETNiBOH8JGv021JVT8u8EQ547phqSg2nvy8gGJkH0zXY7yseOJP XTqdsJZpPw4JhTnLg1OdVVj1JuEfXEs/CNTXsftniW7DQQ93hb+WlB4Zt4fFZg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790266841; b=otJ9H4F9EAWVQ/iTrDxjbs4ciHx+aciy+Q91S2C3FbORQVlJVHJYEBRiwxGAslaz0TIjWh THTTKarGGvlKCZPQCZzPe5zeFTyTPfWdc6j20huo49raW3zzXwjuOhjVml7cGtEr1CQPpz 9yyyUh/dqEsbQYOiRla1v2U4opAA3MNqHikNeoAH3LAaPPXGLVvXq9l5akjtZXMoIB6s7r eeSParH4+bYoWhgUpJlBgqrvwJiNhYW6kMgkU0njk/jaPmUZaSf2eDr90s1HJMmBGYf0qn lc3K1rb1Cdmh1n6STHYXIP44Lnx914g0s1mebcnpxX7sQY9dW1xorxy+FynVeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790266841; 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=X0+954u9fmhG0JH/HHEy0iMuswS766eOFxq1HHM1ppQkLbzR5o5LBjOoeEvgf7qXyikBBi AI8cPtiOY6KM8fpx5USPTTHeo8dDyK4ZVQhCuusH/dESzMhpHIXv16cdDEBYQcx3e1N5wQ 0ttXdDqnNMKUGhcvHRohS6SQ8lRGA5gsA/qn3Pyzc6TT1+tlFyxFKO1hH/Ip1OjuL29oLk NJ/ebQNctc5VmLJGiL+PXHagan24f6dY4gGKkZy+7ecNYwhja4uVYIc7c1KsKZE9hc8m0a 2dpQGFvnL/pwXPYQn87IlGPqxMYN/kvZ8C1z4MgvRo7S3ltJz0uP9bLeXK+vUQ== 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 4hrJwT0VHjzWPH for ; Thu, 24 Sep 2026 16:20:41 +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 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: 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);