The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3c687b75006585168be091add06ae121cbbe334a
commit 3c687b75006585168be091add06ae121cbbe334a Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2026-03-21 07:21:24 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2026-06-26 14:41:06 +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 | 8 +++++++- 11 files changed, 45 insertions(+), 17 deletions(-) diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index b9cf11543245..6d544085b55e 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -105,10 +105,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 98a08c18cbd9..96c7862e6147 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -100,10 +100,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 options NETGDB # netgdb(4) client support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 3d95ee84cf08..000bfc2ab9a6 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -77,6 +77,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 02631aa32164..3734d0702d33 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -79,10 +79,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 410b5e79fee1..a81d04d0dfcd 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2831,8 +2831,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 6fcbaa7d50fe..10d6a67a7ac2 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -87,10 +87,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 a27c90a005f8..b8d654151a95 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -85,6 +85,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 c2a68dba326a..dd2f78eb6ac7 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/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 diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index e807206a4338..c67c28867f9c 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -100,10 +100,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 5a9e914177e0..1a1d8f704a21 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -96,10 +96,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 411e25a3b9d6..a6b92574f2d0 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -180,8 +180,14 @@ device da9063_pmic # Dialog Semiconductor DA9063 PMIC 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 ZSTDIO # zstd-compressed kernel and user dumps +options EKCD # Support for encrypted kernel dumps +options DEBUGNET # debugnet networking +options NETDUMP # netdump(4) client support # Pseudo devices. device crypto # core crypto support
