From nobody Wed Oct 28 20:35:49 2026 X-Original-To: dev-commits-src-branches@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 4jFJz974HLz6x6BR for ; Wed, 28 Oct 2026 20:35:49 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFJz945Xlz4Qqv for ; Wed, 28 Oct 2026 20:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219749; 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=rOoeKyw8yGZb0wUmNQToNiZxdBxoz3h1yimYGJM/clo=; b=hkHfbLpkx6GisZ/q40vkWd+00O+tj9o4OA//Y4XUKpjTIYzz0bPvfj2TBxUzY31zCr37dn wXa7+W6k9Eh8qlnR0lc6bWyphy8AnjsX4AukpNIYRAejPSjVXGbGd7KJBh/kUzE5pAmRa/ 1ZPJlavx6DqeY2GdGNuHiUw6e7yFqFrEvCplS1CjSBX9+Vr/gNAB4N8dFg0pr2rvRlGBqj wE4QMVilr+z+nlcTI5iE6eTVprZ5NMnm45LG+PoC10PRbqrCMBhWyHMKPF4po8ORpCPk2+ aLhUAq+I+hVzwV69vZK+8o+XcIph7uC5Dt5fb1ANiS78baRngnrsEQBf8uzj7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219749; b=GMGfhWG/7Moo6aWyxHClRO73CQEcNwCSk8KjTgnDPLWTJcrTjKZb+WwABgWzYZrniN9O/1 V74scpD8oxhLEwJxB98jWjZ6m5K0f2Soc6fNU8BUtZXDFMy9bVCC0n8FX2MJGtxtEx9dGC wnGjRGtw3vC9uGy2DtrkWHi95kRaghl17pgluzvA5kod9h2j+qAd/mlIEjDm7e5HM/9qqT N/oXov6Goa+KnAFXAZpVfk/eRZ/3FOqQjS0dj1u3i/jAG1HHQ3sYf+hVD182LNJOtP1jUD d2TZI6SVflgNlgbgydz6n7oqn7mSssh37PXYXP8SHKJYYzBC4EcYQQP9jPppwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219749; 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=rOoeKyw8yGZb0wUmNQToNiZxdBxoz3h1yimYGJM/clo=; b=rkAoovkwag1/7ELeHyaB86mVKNAQ5s/KghEN6pR5KSMXIC8NX8WyZGuKWUbI7kFC1Iww6m lahblMkoFbIGrgb4Qce95nzUk7Zd+TBYsjSzmWrdnIwkMGryG5OA0eYV4NpvNp+4Jvyc+C v6mTanKTzGBjD0Yo/Qmc69UIrvORjUgls5TD7l3wSH/PETszYEvra5E/cHF689ySfOuSpj fKfxhonOQrBcO+jzUOnzN/8yNFQiwcoT7365IybwpJAT4SjjcGbU/YWj0KiQh6Mo62vTTk 0Y4BeHLTwPxUDrGRl4VHyU9fNUADCJ50foUCrpGlnvwZ4hZiHe6j2m5c1spsLA== 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 4jFJz93lKmz1Mk5 for ; Wed, 28 Oct 2026 20:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 4ff8c71df5de - stable/15 - makefs/zfs: Allow the autotrim pool property to be set List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4ff8c71df5decc6eecd22f8f97c14f2ac4e1f749 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:49 +0000 Message-Id: <6ae25ca5.1d0b8.2ec122e4@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=4ff8c71df5decc6eecd22f8f97c14f2ac4e1f749 commit 4ff8c71df5decc6eecd22f8f97c14f2ac4e1f749 Author: R. Christian McDonald AuthorDate: 2026-10-07 14:57:40 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:09 +0000 makefs/zfs: Allow the autotrim pool property to be set Add an "autotrim" option taking "on" or "off". The value is stored in the pool properties object alongside "bootfs", so the imported pool starts trimming freed space automatically without a separate "zpool set" step. When the option is omitted nothing is written and the pool keeps the default ("off"), exactly as before. A string option is used rather than makefs's boolean option type since the latter ignores its value, which would make "autotrim=off" enable the feature. Define the spa_autotrim_t enumeration in the boot zfsimpl.h, copied from OpenZFS's sys/spa.h, so that makefs can refer to SPA_AUTOTRIM_OFF and SPA_AUTOTRIM_ON by name. The loader does not use it. Document the option in makefs(8) and add a regression test. Reviewed by: markj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60420 (cherry picked from commit dece5b05f577fc4c6b89af7ad48dfbdf7cc4945c) --- sys/cddl/boot/zfs/zfsimpl.h | 10 ++++++ usr.sbin/makefs/makefs.8 | 11 +++++- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 59 +++++++++++++++++++++++++++++++ usr.sbin/makefs/zfs.c | 17 +++++++++ usr.sbin/makefs/zfs/zfs.h | 2 ++ 5 files changed, 98 insertions(+), 1 deletion(-) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index d3ae3c32635d..b14a829025d1 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -904,6 +904,16 @@ typedef enum pool_state { POOL_STATE_POTENTIALLY_ACTIVE /* Internal libzfs state */ } pool_state_t; +/* + * Send TRIM commands in-line during normal pool operation while deleting. + * OFF: no + * ON: yes + */ +typedef enum { + SPA_AUTOTRIM_OFF = 0, + SPA_AUTOTRIM_ON, +} spa_autotrim_t; + /* * The uberblock version is incremented whenever an incompatible on-disk * format change is made to the SPA, DMU, or ZAP. diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 56e2ffda956f..2ce33cbc8d7f 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 12, 2026 +.Dd October 7, 2026 .Dt MAKEFS 8 .Os .Sh NAME @@ -536,6 +536,15 @@ The following keywords are supported: The base-2 logarithm of the minimum block size. Typical values are 9 (512B blocks) and 12 (4KB blocks). The default value is 12. +.It Cm autotrim +The value of the +.Ql autotrim +pool property, either +.Ql on +or +.Ql off . +The default is +.Ql off . .It Cm bootfs The name of the bootable dataset for the pool. Specifying this option causes the diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 940461fe2565..b8595a98a2ab 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -107,6 +107,64 @@ autoexpand_cleanup() common_cleanup } +# +# Test setting the autotrim pool property. +# +atf_test_case autotrim cleanup +autotrim_body() +{ + local src val + + create_test_inputs + + atf_check -s exit:1 -e match:"invalid value .foo. for autotrim" \ + $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + -o autotrim=foo $TEST_IMAGE $TEST_INPUTS_DIR + + for val in on off; do + atf_check $MAKEFS -s 1g -o rootpath=/ \ + -o poolname=$ZFS_POOL_NAME \ + -o autotrim=$val \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + check_image_contents + + # OpenZFS reports a pool property whose value equals the + # default as coming from the default, even if it was set. + if [ $val = off ]; then + src=default + else + src=local + fi + atf_check -o inline:$val\\n \ + zpool get -H -o value autotrim $ZFS_POOL_NAME + atf_check -o inline:$src\\n \ + zpool get -H -o source autotrim $ZFS_POOL_NAME + + atf_check zpool destroy ${ZFS_POOL_NAME} + atf_check rm -f ${TEST_ZFS_POOL_NAME} + atf_check mdconfig -d -u $(cat ${TEST_MD_DEVICE_FILE}) + atf_check rm -f ${TEST_MD_DEVICE_FILE} + done + + # Without the option the property keeps its default value. + atf_check $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + atf_check -o inline:off\\n \ + zpool get -H -o value autotrim $ZFS_POOL_NAME + atf_check -o inline:default\\n \ + zpool get -H -o source autotrim $ZFS_POOL_NAME +} +autotrim_cleanup() +{ + common_cleanup +} + # # Test with some default layout defined by the common code. # @@ -1163,6 +1221,7 @@ T_flag_mtree_cleanup() atf_init_test_cases() { atf_add_test_case autoexpand + atf_add_test_case autotrim atf_add_test_case basic atf_add_test_case compression atf_add_test_case dataset_link_counts diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 1288c52141ab..9e304202fb4f 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -82,6 +82,8 @@ zfs_prep_opts(fsinfo_t *fsopts) memset(zfs, 0, sizeof(*zfs)); const option_t zfs_options[] = { + { '\0', "autotrim", &zfs->autotrim, OPT_STRPTR, + 0, 0, "Automatic TRIM (on or off)" }, { '\0', "bootfs", &zfs->bootfs, OPT_STRPTR, 0, 0, "Bootable dataset" }, { '\0', "mssize", &zfs->mssize, OPT_INT64, @@ -247,6 +249,17 @@ zfs_check_opts(fsinfo_t *fsopts) if (zfs->vdevpath[0] != '/') errx(1, "path `%s' must be absolute", zfs->vdevpath); + zfs->autotrimval = SPA_AUTOTRIM_OFF; + if (zfs->autotrim != NULL) { + if (strcmp(zfs->autotrim, "on") == 0) + zfs->autotrimval = SPA_AUTOTRIM_ON; + else if (strcmp(zfs->autotrim, "off") == 0) + zfs->autotrimval = SPA_AUTOTRIM_OFF; + else + errx(1, "invalid value `%s' for autotrim", + zfs->autotrim); + } + if (zfs->ashift == 0) zfs->ashift = 12; @@ -262,6 +275,7 @@ zfs_cleanup_opts(fsinfo_t *fsopts) zfs = fsopts->fs_specific; free(zfs->rootpath); free(zfs->vdevpath); + free(zfs->autotrim); free(zfs->bootfs); free(__DECONST(void *, zfs->poolname)); STAILQ_FOREACH_SAFE(d, &zfs->datasetdescs, next, tmp) { @@ -474,6 +488,9 @@ pool_init_objdir_poolprops(zfs_opt_t *zfs, zfs_zap_t *objdir) zap_add_uint64(objdir, DMU_POOL_PROPS, id); zfs->poolprops = zap_alloc(zfs->mos, dnode); + + if (zfs->autotrim != NULL) + zap_add_uint64(zfs->poolprops, "autotrim", zfs->autotrimval); } /* diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index 13f2ece43c69..ebc54caad8e9 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -80,6 +80,8 @@ typedef struct { const char *poolname; char *rootpath; /* implicit mount point prefix */ char *vdevpath; /* vdev path, pool property */ + char *autotrim; /* "on" or "off", pool property */ + spa_autotrim_t autotrimval; /* parsed autotrim value */ char *bootfs; /* bootable dataset, pool property */ int ashift; /* vdev block size */ uint64_t mssize; /* metaslab size */