git: 8396b387e480 - stable/15 - kernel: Be clearer about what ZSTDIO is for
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Apr 2026 15:52:38 UTC
The branch stable/15 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=8396b387e4806bc491c0ae5b27f419e5a973b9e4
commit 8396b387e4806bc491c0ae5b27f419e5a973b9e4
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-03-21 07:21:24 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-04-07 15:52:08 +0000
kernel: Be clearer about what ZSTDIO is for
ZSTDIO is not just for core dumps, and it is now required by ZFS, so
move it (and GZIO, which is still just for dumps) to a new “Compression
support” section in GENERIC, and add them both to MINIMAL.
MFC after: 1 week
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D55940
(cherry picked from commit 092687a031064dc08ac198648c6393cc50b06cee)
---
sys/amd64/conf/FIRECRACKER | 6 ++++--
sys/amd64/conf/GENERIC | 6 ++++--
sys/amd64/conf/MINIMAL | 4 ++++
sys/arm64/conf/std.arm64 | 6 ++++--
sys/conf/NOTES | 4 ++--
sys/i386/conf/GENERIC | 6 ++++--
sys/i386/conf/MINIMAL | 4 ++++
sys/powerpc/conf/GENERIC | 6 ++++--
sys/powerpc/conf/GENERIC64 | 6 ++++--
sys/powerpc/conf/GENERIC64LE | 6 ++++--
sys/riscv/conf/GENERIC | 6 ++++--
11 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER
index a36fb974c24e..07c02d51ed4c 100644
--- a/sys/amd64/conf/FIRECRACKER
+++ b/sys/amd64/conf/FIRECRACKER
@@ -101,10 +101,12 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
options NETGDB # netgdb(4) client support
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index e4ed9704a65b..17f70c6c26fd 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -97,10 +97,12 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
options NETGDB # netgdb(4) client support
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index 38619f527388..c14d8fa261c5 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -74,6 +74,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64
index 58f3748e2700..2a1221d1b1d0 100644
--- a/sys/arm64/conf/std.arm64
+++ b/sys/arm64/conf/std.arm64
@@ -82,10 +82,12 @@ options KDB_TRACE # Print a stack trace for a panic.
#options KUBSAN # Kernel Undefined Behavior Sanitizer
#options KCSAN # Kernel Concurrency Sanitizer
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 293087b02a43..b6e6af1e8827 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2822,8 +2822,8 @@ options IMGACT_BINMISC
options GZIO
# zstd support
-# This enables support for Zstd compressed core dumps, GEOM_UZIP images,
-# and is required by zfs if statically linked.
+# This enables support for Zstandard compression for core dumps,
+# kernel dumps, GEOM_UZIP images, and tarfs, and is required by zfs.
options ZSTDIO
# BHND(4) drivers
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index f09e8b0703e4..a2f86753e945 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -90,10 +90,12 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
options NETGDB # netgdb(4) client support
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 65bdf8f79da2..fc04d4ed6dec 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -84,6 +84,10 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
device apic
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 1346fa8f9476..8720a2c27447 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -91,10 +91,12 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 446e3afca511..fbea6eb786c3 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -101,10 +101,12 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index b1a2d12713a8..d7a26d864220 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -97,10 +97,12 @@ options RCTL # Resource limits
options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 0b3defb3c285..ee529feb49ab 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -169,10 +169,12 @@ options KDB # Enable kernel debugger support.
options KDB_TRACE # Print a stack trace for a panic.
# options EARLY_PRINTF=sbi
+# Compression support
+options GZIO # gzip (dumps)
+options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
+
# Kernel dump features.
options EKCD # Support for encrypted kernel dumps
-options GZIO # gzip-compressed kernel and user dumps
-options ZSTDIO # zstd-compressed kernel and user dumps
options DEBUGNET # debugnet networking
options NETDUMP # netdump(4) client support