From nobody Thu Sep 4 00:44:58 2025 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 4cHLNV39wWz66Sy6; Thu, 04 Sep 2025 00:44:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHLNV2Ww9z44vF; Thu, 04 Sep 2025 00:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946698; 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=JREgnQlEE2jiFUIJDSwHf2Mx9Ktxn9HuyIqFAghTvtk=; b=eQoYnxxcOikYWolutXP5ODor1nl7uqPlyt2ItzMB3Q9j4vbd+2VJbdR3IQQyQQy0dhFQGu hj7kLNtxuFZaF1sFeiYsWndOKTyPXNf9JRTTJwum7X3tUA+4A+oFRiFJmulfGsnoE7JtXr YdHdW73BRVnxat1BtgkY7O/WwCdG/fnZHBVc6We8Wvb3ylP/ffJFtDC+g5cCi8j3CdXmIr scO5xxcaQ9XfbbyBrUvYuDxUt9LufFnIoeJe15J1rFXveiE5/Zpax1ZweKvG7WHKoFBHlW Z/OM6iyjgqT0HCc9X2sKuTj4Am3O0G4Py2dxx3ZBgcg2nS0uXCQBMMj3uQEuiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756946698; 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=JREgnQlEE2jiFUIJDSwHf2Mx9Ktxn9HuyIqFAghTvtk=; b=Yn4RJ21gvaDI5a84s/9WdkqbYMWgTrQcQyTApP263g8eUFmmciKkKRm+CdJOitrK+xfwCe fzefansOYv62cUYCXOblw4854//KqMGTdkjStt2cmkjLiSoAPGcmVlwz5D6nim2ZQIpN1O AmdfvLvWdILj91BJNMjtqjq2azgDb7dIKNgO0/uyn8dBvyrG2JrrUP+/JbtYTuVyrz4RJn 6PIVXKfDU2M6jaUx2mUWc1DkQ89MU+K5pSCRWGyxFxXe1F3dFWsds83x0Le74a1LUoeLXl YaxFdXnSo0uAV3fjB9zHQOElbSiMA1/ffs3n6fr8hjzX4/Hg2zCrWOs6kMD+0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756946698; a=rsa-sha256; cv=none; b=pJvSddnI4hse7TumOvI831Kcv4rVA4Et5TpKmGUygDau70qioHxcyLndP596inSYtc6Ees Z7qMKBApXjTtCvlQTZzHT6sETvzVp7fvFlckFkF8C3mqIbSMlFW5YdBL5HMeebc9Uj25w8 oxDJFC2W9ggiVGJrISlYuK0u8okXN7WI7lsbqQ5WOd2lOUPis9AwnMGAUMRECW6f3mjYav 3KpVyrUPlWmTIDdeQQhnUfeQ7nBPIGVm+yVbyEHd96kly93kAy4nkQMra9aJaObFDQZDD8 w+xNfYwTpVSkOLraYMZBpVM8CqhTee+cH+IjOPkEoUx6Mt+dtsrV/Pj49WJ9Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cHLNV1p9kzggP; Thu, 04 Sep 2025 00:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5840iwR3060577; Thu, 4 Sep 2025 00:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5840iw4t060574; Thu, 4 Sep 2025 00:44:58 GMT (envelope-from git) Date: Thu, 4 Sep 2025 00:44:58 GMT Message-Id: <202509040044.5840iw4t060574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 93006233f203 - stable/14 - vfs: make vfscount refcounting handle possible kld unload 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 93006233f20317dfa18f65f879828910f95b10c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=93006233f20317dfa18f65f879828910f95b10c5 commit 93006233f20317dfa18f65f879828910f95b10c5 Author: Konstantin Belousov AuthorDate: 2025-08-27 22:24:01 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-04 00:43:14 +0000 vfs: make vfscount refcounting handle possible kld unload (cherry picked from commit be8bae67002503baff6bb9fb77fbe6b80f035c33) --- sys/kern/vfs_init.c | 16 ++++++++++++++-- sys/kern/vfs_mount.c | 7 +++++-- sys/sys/mount.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 64263caaef98..e516d929d9d0 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -108,6 +108,16 @@ struct vattr va_null; * Routines having to do with the management of the vnode table. */ +void +vfs_unref_vfsconf(struct vfsconf *vfsp) +{ + vfsconf_lock(); + KASSERT(vfsp->vfc_refcount > 0, + ("vfs %p refcount underflow %d", vfsp, vfsp->vfc_refcount)); + vfsp->vfc_refcount--; + vfsconf_unlock(); +} + static struct vfsconf * vfs_byname_locked(const char *name) { @@ -128,9 +138,11 @@ vfs_byname(const char *name) { struct vfsconf *vfsp; - vfsconf_slock(); + vfsconf_lock(); vfsp = vfs_byname_locked(name); - vfsconf_sunlock(); + if (vfsp != NULL) + vfsp->vfc_refcount++; + vfsconf_unlock(); return (vfsp); } diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 1990f3714ab6..85d14a943d01 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -683,7 +683,6 @@ vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp, const char *fspath, MPASSERT(mp->mnt_vfs_ops == 1, mp, ("vfs_ops should be 1 but %d found", mp->mnt_vfs_ops)); (void) vfs_busy(mp, MBF_NOWAIT); - atomic_add_acq_int(&vfsp->vfc_refcount, 1); mp->mnt_op = vfsp->vfc_vfsops; mp->mnt_vfc = vfsp; mp->mnt_stat.f_type = vfsp->vfc_typenum; @@ -731,7 +730,6 @@ vfs_mount_destroy(struct mount *mp) __FILE__, __LINE__)); MPPASS(mp->mnt_writeopcount == 0, mp); MPPASS(mp->mnt_secondary_writes == 0, mp); - atomic_subtract_rel_int(&mp->mnt_vfc->vfc_refcount, 1); if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) { struct vnode *vp; @@ -769,6 +767,9 @@ vfs_mount_destroy(struct mount *mp) vfs_free_addrlist(mp->mnt_export); free(mp->mnt_export, M_MOUNT); } + vfsconf_lock(); + mp->mnt_vfc->vfc_refcount--; + vfsconf_unlock(); crfree(mp->mnt_cred); uma_zfree(mount_zone, mp); } @@ -1133,6 +1134,7 @@ vfs_domount_first( if (jailed(td->td_ucred) && (!prison_allow(td->td_ucred, vfsp->vfc_prison_flag) || vp == td->td_ucred->cr_prison->pr_root)) { vput(vp); + vfs_unref_vfsconf(vfsp); return (EPERM); } @@ -1169,6 +1171,7 @@ vfs_domount_first( } if (error != 0) { vput(vp); + vfs_unref_vfsconf(vfsp); return (error); } vn_seqc_write_begin(vp); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index efe230f518f8..f7e756e03c84 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1002,6 +1002,7 @@ struct mntarg *mount_argsu(struct mntarg *ma, const char *name, const void *val, void statfs_scale_blocks(struct statfs *sf, long max_size); struct vfsconf *vfs_byname(const char *); struct vfsconf *vfs_byname_kld(const char *, struct thread *td, int *); +void vfs_unref_vfsconf(struct vfsconf *vfsp); void vfs_mount_destroy(struct mount *); void vfs_event_signal(fsid_t *, u_int32_t, intptr_t); void vfs_freeopts(struct vfsoptlist *opts);