From nobody Thu Oct 01 15:20:26 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 4hwbFk64Grz6v5GG for ; Thu, 01 Oct 2026 15:20:26 +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 4hwbFk4Q2rz4KkJ for ; Thu, 01 Oct 2026 15:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868026; 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=oj63/WYLzBtAwNHH70LrtHb3nB+UrGJQlqEaGr4YG8k=; b=mPdQsZSIZwgcnKyRjCp6b8ImEq8z6gOwjcNzBxhf7HKoByH1e0dd4CnAMHtyrWyuJr0x1i LkuqVYHwJxphJeSrJbY8Ud9gzpcPkfJioWjQRKwQAaoiXMQwLmiQGKUetaqV5tI6LgQ+px 9HfCE3BQsJIvFVt+gmP++n96fA8rK4eVwY+hmXoxGRO3KV4PP1pKMv6tihIGsVjAdeLd1U tWLWG2QHkTq5pSn2raNIj9gkKvJlTGoeza7HpztPI5pSQymQ5i8NURnlP+yqX2rutX6p6/ s2zpFNvXqkHp7xh9DuWl6UYgNenwuSu3+or0WrGtbRAz8o+5wBZxX9QZmzRsOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790868026; b=SjXxqoeMPoNtYi9x8mR9WteT8lfzaYiL3DAfxR/rcIYDUlp/J1PzOJkcKIRtbR/vYW2Wo+ 67znCOwfjBFGs4RgZV8NwFMa01QbEGx5Vi/RsDe8L3gLWCPj/P8oDYXPoMerc+1Xyiei4k ysjB01Qd3fd2g7SRMM5N1VS973TXiraoEHAmlVHBjHCQZyMl3Chy9aN9lHmjkIO2DHDrdg emVDdeHb4JkFrIbZ2LKp9pEFF6GdjSS4qgvUKTbQuyh6ZFPzKQXYhyLK2c2xaXJX5WYEjl rSER5miJuI+BzC9EKuB2IMbP0c8ow6/Wc72sgZfxHrw+FtJgXTypnfK8CSLs8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868026; 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=oj63/WYLzBtAwNHH70LrtHb3nB+UrGJQlqEaGr4YG8k=; b=mIDkkVhovyJM8F71zqYyat0aqEpR9XkIRGdZeoKX7Qedox1FnxVQCNIU00khxZGO2/2n7M 7m8zDpVWxyQVNKBXpPafESlVL7VwVNL8wBHexNezVSESFSG2uGnCDAA06zISXW+KQh2E30 OFXveydQfXxTfje8a2xFi9vAztl+d8T+NgjzQbPbnsCCc2c2a8ZRCCXKTBp3bZsF5EmLDC 0tj0PYURCwvB/TK1rel6NzhYt1ZdulTo2q/UOkrhprRxBQdLr/lzfiZDNjBRUVrVRqwmFM yU4on3plGKfw+JGnJWjCTZP/WWDUTOVXYo/ws3GM5uDto/tT3DqK9+4FghEKhA== 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 4hwbFk3TNBzddK for ; Thu, 01 Oct 2026 15:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c48e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 15:20:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a5d112ba16b3 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a5d112ba16b3f905cd0ab209d260652600e6e944 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 15:20:26 +0000 Message-Id: <6abe7a3a.3c48e.c3e5860@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5d112ba16b3f905cd0ab209d260652600e6e944 commit a5d112ba16b3f905cd0ab209d260652600e6e944 Author: Mark Johnston AuthorDate: 2026-09-24 16:14:34 +0000 Commit: Mark Johnston CommitDate: 2026-10-01 13:42:48 +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 (cherry picked from commit dd16a5f53b0b2e967d20d2900f18fc320997679b) --- 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 a1aee233fdbd..da2f619d8d99 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -2557,7 +2557,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);