From nobody Wed Jul 29 05:20:41 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 4h90zM1G9bz6mg9C for ; Wed, 29 Jul 2026 05:20:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h90zL3Nfvz4M3p for ; Wed, 29 Jul 2026 05:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785302446; 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=V+RJ7Degswl98o55Ak6uR67GY9xi+sFjx/JZnXAI8+8=; b=cAxXOD7o7OBvL9+Or+M0ij1pPhaO/1qcvjPJBRe4YjKN7AV0bcHdJgSY9gEib4eSgy+t/q zUVu+yCaecrBCHCKr7XGXaRh1S/4amtl8iyZrxf6kLyjPd4U7KbJ4AdWmi9NKEDt+thSrr wSHfTlvfQxG8gRPk5xGm+NvZJYspaeI/SToC7mVd9XXT4v/aZl0P5z9NEF/IDp03jHx5SJ 7wN2SfrFwnFu2UvhR+cI+ODVshgZMv6pYOF5ZLAcA6KNK3rOPZ55xlEycb6ATPJjesMC6W 46RD3A2kQEQFkXDOej4Ojh5swwGLsb+dAERDeXHg/kpi8U9XSukv7l88fk4oCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785302446; a=rsa-sha256; cv=none; b=W9pTyszSmB6hkQow9y4gEvPsry7BLimeziZxoEg7gvUUpuV99hrQgUKoGa++os17U1cG/n 0FE246+gFaeCAfhABfQwAvFNYkcZKkPRPUdiCZoyoMhoC/zOhkuJHraBj17KnrrmsFbYOn WhpqoaQOtoIS35uhoWUK74kw77QXULAKOVcyaYO1Quwcw60aJtYziaq5SFa0xC1Ug5F2lW sXLJG46CnZp2IRbk5bV6SacKkUMUt3OGv5q2zBFTM2BQL8tdCk6qpGO7z/bTSaofI5W32W OQzK/mPcrH9VvYLgtLh7Vki8zwLRLU01jIxLlIE+oar/qN8vxPP7lK/UiUIqYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785302446; 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=V+RJ7Degswl98o55Ak6uR67GY9xi+sFjx/JZnXAI8+8=; b=jEJ7xvVZWJ5QVrkhkWxxPLuXx1PLL5R5bfdUr7nOIpGXBlIfyDivQX4olziRqEho4WWKVQ 918Y9l60K7d5ml717BsSuPfhApD1Dt4ShKHt1JvDP7+NvpYRqBbsdrn9pwwrbkirOAr6Q+ J4ZBgFRBF+k41iZvzQuF+Q3ij6YfnhcDhRmtprfCF+LwlUkRI07DzYFgRUaEBUC0fVlmNF E4oFGg+3V9o8wChuXvsWMDKCT/B6xEw28FC8oIInUmb4nX87eYPYjCWN5X26DtXjK5huOq eJYnnkdo2kX8/+ksygCWmfDbwAym8wLY2ih3kp8ZZHHvHw/tUBr+E8Be2JedqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h90zL0pQdz1Bhw for ; Wed, 29 Jul 2026 05:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 329c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 05:20:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fb4d7bd4b767 - main - vfs_busy(): add MBF_PCATCH flag to allow interrupting the sleep 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb4d7bd4b7676963f9f37ff47f315f8c3652538b Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 05:20:41 +0000 Message-Id: <6a698da9.329c0.29ae5aab@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4d7bd4b7676963f9f37ff47f315f8c3652538b commit fb4d7bd4b7676963f9f37ff47f315f8c3652538b Author: Konstantin Belousov AuthorDate: 2026-07-27 13:40:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-29 05:20:07 +0000 vfs_busy(): add MBF_PCATCH flag to allow interrupting the sleep Reviewed by: jah, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58477 --- sys/kern/vfs_subr.c | 17 ++++++++++++++++- sys/sys/mount.h | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 64c11660e211..8d6793ad9573 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -879,6 +879,7 @@ int vfs_busy(struct mount *mp, int flags) { struct mount_pcpu *mpcpu; + int error; MPASS((flags & ~MBF_MASK) == 0); CTR3(KTR_VFS, "%s: mp %p with flags %d", __func__, mp, flags); @@ -923,10 +924,24 @@ vfs_busy(struct mount *mp, int flags) if (flags & MBF_MNTLSTLOCK) mtx_unlock(&mountlist_mtx); mp->mnt_kern_flag |= MNTK_MWAIT; - msleep(mp, MNT_MTX(mp), PVFS | PDROP, "vfs_busy", 0); + error = msleep(mp, MNT_MTX(mp), ((flags & MBF_PCATCH) != 0 ? + PCATCH : 0) | PVFS | PDROP, "vfs_busy", 0); if (flags & MBF_MNTLSTLOCK) mtx_lock(&mountlist_mtx); MNT_ILOCK(mp); + if (error != 0) { + MNT_REL(mp); + + /* + * Clearing MNTK_MWAIT might cause spurious + * wakeups, but better clear our flag there + * then leak it. + */ + mp->mnt_kern_flag &= ~MNTK_MWAIT; + wakeup(mp); + MNT_IUNLOCK(mp); + return (error); + } } if (flags & MBF_MNTLSTLOCK) mtx_unlock(&mountlist_mtx); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index b8b65a81369f..bc14a59da716 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -768,7 +768,8 @@ struct uio; */ #define MBF_NOWAIT 0x01 #define MBF_MNTLSTLOCK 0x02 -#define MBF_MASK (MBF_NOWAIT | MBF_MNTLSTLOCK) +#define MBF_PCATCH 0x04 +#define MBF_MASK (MBF_NOWAIT | MBF_MNTLSTLOCK | MBF_PCATCH) #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_MOUNT);