From nobody Thu Aug 6 08:55:09 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 4hG1M152NDz6mfg4 for ; Thu, 06 Aug 2026 08:55:09 +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 4hG1M13kTVz3Tj8 for ; Thu, 06 Aug 2026 08:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786006509; 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=vwNhfgD0CGRxFRpY5eS2wRdHdlG8X+OTzg1cvela3Rg=; b=JjFvsKnag6FMsbum+OI2qZcicE2AYLEeld4QD6x5pfwaKkWu0j3DI6jLLLTaxOr5a7hB71 1+2fgBBxBvA2RQvt4mtKei4y7t98ixt7ssfOW9BCIjbwXJ5QSimE0Fvcyg7UyRrJ/mHOdG oQUZz1Pg7DEkWFxB+zN3eSG4LVIwJWcAvlK2pLsK4CeJAG/PMHJNt3J/ng2XJjlIP6luHo JSvzCRFhekyhcODg6lCOPlXZNxGvXcn6B2m3sMESu05Z8SsyKsFXQjbSAXBz/KbESSfdrU ah0F3O0xgPfBVVcDCk/FeKloKZ1C3aYVjbsKgMwyzyOB6LJnJ/eV9zIJZEjp5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786006509; a=rsa-sha256; cv=none; b=JKVlRa1c9+2v/x1wC+1QGWq+WsHWadpWl8iW5wvuFF1tZdTjPyr4xEfRo6iCAc+1IdhYDN ISlAftH9dBYPkiJjTItQHH2UzYYuyzjGXV6hCDSzdpvgNfSpQLMvFNQx+zIOwdjzyp1Npg klKPcDGs8J55WAFS/NWo2ktpEboH94sfFNib9guBx/d1qX04ehLC9Bu0pWG/Hg8374vF5y wbOx/Eg5aSRVU87cx8FfDpfBUrcsPQSz5AhYUOFVp5Pw+Ih6Pw/Ry15i7hHpKGni6QnhbV 0f3CxmCTX+b1nGbmpWxO5pvFia72UE+lQV/GoqwXy4l4eoU0kv80+KkAlK5YcA== 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=1786006509; 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=vwNhfgD0CGRxFRpY5eS2wRdHdlG8X+OTzg1cvela3Rg=; b=FNFzbn6lxceanna/g3oyOb3G4a1eEugo2YL0DGMJB1P83nJN4MrCB0dFUQkE0Pp7THGXJV Oyt5tucm+R1pYPrOG7GFfjddr4zqvGVK75erhmkrnvMpKecFwptdu0WVaolRaMzxwg1syw /p7TLfcLENQITFxsSfsSK0VosjkIXek4AUwCos1hBbRDlCGiBWIm6ZDcUJL92H74AIEyMH Nxfdoa7YnfIDiiT0tXfzfChlKff32euQnbYq6UwP08e4JqA8zlFnXr7L4Dci9ObzM2ABjN viYTFzzGfNrk0snFqsK5osI4EV5nzeWc8eeMW5HLK9SQ0kdMdI12xD5BvI2hjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG1M12d6Lz1CM4 for ; Thu, 06 Aug 2026 08:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e53b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 08:55:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d3c3a705b5e6 - main - autofs: try to avoid waiting for timeouts of in-flight requests for forced unmounts 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3c3a705b5e6689798057b764713bfc0e3b69f6a Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 08:55:09 +0000 Message-Id: <6a744bed.3e53b.4d6a7c07@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c3a705b5e6689798057b764713bfc0e3b69f6a commit d3c3a705b5e6689798057b764713bfc0e3b69f6a Author: Konstantin Belousov AuthorDate: 2026-08-04 06:26:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-06 08:54:47 +0000 autofs: try to avoid waiting for timeouts of in-flight requests for forced unmounts Do the advisory aborts of the in-flight requests before flushing the vnodes. It should mostly eliminate the waits due to requests busying the mp. Reported and reviewed by: rew Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58637 --- sys/fs/autofs/autofs_vfsops.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c index 2159902f8b40..7e1d7c9d1f6a 100644 --- a/sys/fs/autofs/autofs_vfsops.c +++ b/sys/fs/autofs/autofs_vfsops.c @@ -109,6 +109,33 @@ autofs_mount(struct mount *mp) return (0); } +/* + * Try to abort any requests currently in flight. This is not + * strictly necessary, the strong pass is done after all vnodes are + * reclaimed, and does not prevent new requests from queueing. But + * doing it now should practically avoid waiting for timeouts because + * each in-flight requests busies the mount point, which makes + * unmount() to wait for it to drain. + */ +static void +autofs_purge(struct mount *mp) +{ + struct autofs_mount *amp; + struct autofs_request *ar; + + amp = VFSTOAUTOFS(mp); + sx_xlock(&autofs_softc->sc_lock); + TAILQ_FOREACH(ar, &autofs_softc->sc_requests, ar_next) { + if (ar->ar_mount != amp) + continue; + ar->ar_error = ENXIO; + ar->ar_done = true; + ar->ar_in_progress = false; + } + sx_xunlock(&autofs_softc->sc_lock); + cv_broadcast(&autofs_softc->sc_cv); +} + static int autofs_unmount(struct mount *mp, int mntflags) { @@ -208,6 +235,7 @@ static struct vfsops autofs_vfsops = { .vfs_fhtovp = NULL, /* XXX */ .vfs_mount = autofs_mount, .vfs_unmount = autofs_unmount, + .vfs_purge = autofs_purge, .vfs_root = autofs_root, .vfs_statfs = autofs_statfs, .vfs_init = autofs_init,