git: e716630d4cf8 - main - zfs: merge openzfs/zfs@887a3c533

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Thu, 09 Nov 2023 12:21:51 UTC
The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=e716630d4cf89e69ec3f675ebfceee09f1a85e05

commit e716630d4cf89e69ec3f675ebfceee09f1a85e05
Merge: f5b3e686292b 887a3c533b94
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2023-11-09 10:42:33 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2023-11-09 12:19:17 +0000

    zfs: merge openzfs/zfs@887a3c533
    
    Notable upstream pull request merges:
     #15022 5caeef02f RAID-Z expansion feature
     #15457 887a3c533 Increase L2ARC write rate and headroom
     #15504 1c1be60fa Unbreak FreeBSD world build after 3bd4df384
    
    Obtained from:  OpenZFS
    OpenZFS commit: 887a3c533b94a4b70075e310f15c45b9dee19410

 cddl/lib/libzpool/Makefile                         |    1 +
 sys/contrib/openzfs/cmd/raidz_test/raidz_bench.c   |   12 +-
 sys/contrib/openzfs/cmd/raidz_test/raidz_test.c    |  196 +-
 sys/contrib/openzfs/cmd/raidz_test/raidz_test.h    |    3 -
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |    5 +
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |  148 +-
 sys/contrib/openzfs/cmd/ztest.c                    |  912 ++++++-
 sys/contrib/openzfs/contrib/debian/control         |    1 -
 .../contrib/pyzfs/libzfs_core/_constants.py        |    2 +
 .../pyzfs/libzfs_core/_error_translation.py        |    3 +
 .../contrib/pyzfs/libzfs_core/exceptions.py        |    6 +
 sys/contrib/openzfs/include/libzfs.h               |    1 +
 sys/contrib/openzfs/include/sys/fs/zfs.h           |   25 +
 sys/contrib/openzfs/include/sys/spa_impl.h         |    4 +
 sys/contrib/openzfs/include/sys/uberblock_impl.h   |   35 +
 sys/contrib/openzfs/include/sys/vdev.h             |   10 +-
 sys/contrib/openzfs/include/sys/vdev_impl.h        |    6 +-
 sys/contrib/openzfs/include/sys/vdev_raidz.h       |  101 +-
 sys/contrib/openzfs/include/sys/vdev_raidz_impl.h  |   47 +-
 sys/contrib/openzfs/include/sys/zfs_debug.h        |    1 +
 sys/contrib/openzfs/include/zfeature_common.h      |    1 +
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          |  371 ++-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |   47 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |    5 +
 .../openzfs/lib/libzfs_core/libzfs_core.abi        |   12 +-
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |    1 +
 sys/contrib/openzfs/man/man1/ztest.1               |   22 +-
 sys/contrib/openzfs/man/man4/zfs.4                 |   25 +-
 sys/contrib/openzfs/man/man7/zpool-features.7      |   32 +-
 sys/contrib/openzfs/man/man8/zpool-attach.8        |   53 +-
 sys/contrib/openzfs/man/man8/zpool-wait.8          |    6 +-
 sys/contrib/openzfs/module/Kbuild.in               |    1 +
 .../openzfs/module/os/freebsd/zfs/vdev_label_os.c  |   59 +
 .../openzfs/module/os/linux/zfs/vdev_label_os.c    |   45 +
 .../openzfs/module/os/linux/zfs/zfs_debug.c        |    3 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     |    4 +-
 .../openzfs/module/zcommon/zfeature_common.c       |    5 +
 sys/contrib/openzfs/module/zcommon/zpool_prop.c    |    3 +
 sys/contrib/openzfs/module/zfs/arc.c               |   12 +-
 sys/contrib/openzfs/module/zfs/dsl_scan.c          |    1 -
 sys/contrib/openzfs/module/zfs/metaslab.c          |   12 +-
 sys/contrib/openzfs/module/zfs/spa.c               |  240 +-
 sys/contrib/openzfs/module/zfs/spa_checkpoint.c    |    3 +
 sys/contrib/openzfs/module/zfs/vdev.c              |  114 +-
 sys/contrib/openzfs/module/zfs/vdev_draid.c        |   28 +-
 sys/contrib/openzfs/module/zfs/vdev_initialize.c   |   12 +-
 sys/contrib/openzfs/module/zfs/vdev_label.c        |   51 +-
 sys/contrib/openzfs/module/zfs/vdev_raidz.c        | 2688 ++++++++++++++++++--
 sys/contrib/openzfs/module/zfs/vdev_trim.c         |   17 +-
 sys/contrib/openzfs/scripts/zloop.sh               |   63 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |    6 +-
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |    3 +
 .../openzfs/tests/zfs-tests/tests/Makefile.am      |   10 +-
 .../functional/cli_root/zpool_get/zpool_get.cfg    |    1 +
 .../tests/functional/raidz/raidz_002_pos.ksh       |   34 +-
 .../tests/functional/raidz/raidz_003_pos.ksh       |   41 -
 .../tests/functional/raidz/raidz_004_pos.ksh       |   41 -
 .../functional/raidz/raidz_expand_001_pos.ksh      |  215 ++
 .../functional/raidz/raidz_expand_002_pos.ksh      |  115 +
 .../functional/raidz/raidz_expand_003_neg.ksh      |  102 +
 .../functional/raidz/raidz_expand_003_pos.ksh      |  141 +
 .../functional/raidz/raidz_expand_004_pos.ksh      |  121 +
 .../functional/raidz/raidz_expand_005_pos.ksh      |  177 ++
 .../functional/raidz/raidz_expand_006_neg.ksh      |   78 +
 .../functional/raidz/raidz_expand_007_neg.ksh      |   86 +
 sys/modules/zfs/zfs_config.h                       |    4 +-
 sys/modules/zfs/zfs_gitrev.h                       |    2 +-
 67 files changed, 5748 insertions(+), 884 deletions(-)

diff --cc cddl/lib/libzpool/Makefile
index d05babdc26e0,000000000000..c801cf571e88
mode 100644,000000..100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@@ -1,336 -1,0 +1,337 @@@
 +
 +ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 +
 +# ZFS_COMMON_SRCS
 +.PATH: ${ZFSTOP}/module/zfs
 +.PATH: ${ZFSTOP}/module/zcommon
 +.PATH: ${ZFSTOP}/module/unicode
 +# LUA_SRCS
 +.PATH: ${ZFSTOP}/module/lua
 +# ZSTD_SRCS
 +.PATH: ${ZFSTOP}/module/zstd
 +.PATH: ${ZFSTOP}/module/zstd/lib/common
 +.PATH: ${ZFSTOP}/module/zstd/lib/compress
 +.PATH: ${ZFSTOP}/module/zstd/lib/decompress
 +
 +.PATH: ${ZFSTOP}/module/os/linux/zfs
 +
 +.PATH: ${ZFSTOP}/lib/libzpool
 +
 +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
 +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 +ATOMIC_SRCS=	opensolaris_atomic.S
 +ACFLAGS+=	-Wa,--noexecstack
 +.else
 +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern
 +ATOMIC_SRCS=	opensolaris_atomic.c
 +.endif
 +
 +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe"
 +# Don't waste GOT entries on small data.
 +PICFLAG=	-fPIC
 +.endif
 +
 +PACKAGE=	zfs
 +LIB=		zpool
 +
 +USER_C = \
 +	kernel.c \
 +	taskq.c \
 +	util.c
 +
 +KERNEL_C = \
 +	zfeature_common.c \
 +	zfs_comutil.c \
 +	zfs_deleg.c \
 +	zfs_fletcher.c \
 +	zfs_fletcher_superscalar.c \
 +	zfs_fletcher_superscalar4.c \
 +	zfs_namecheck.c \
 +	zfs_prop.c \
 +	zfs_zstd.c \
 +	zpool_prop.c \
 +	zprop_common.c \
 +	abd.c \
 +	abd_os.c \
 +	aggsum.c \
 +	arc.c \
 +	arc_os.c \
 +        blake3_zfs.c \
 +	blkptr.c \
 +	bplist.c \
 +	bpobj.c \
 +	bptree.c \
 +	bqueue.c \
 +	btree.c \
 +	brt.c \
 +	cityhash.c \
 +	dbuf.c \
 +	dbuf_stats.c \
 +	ddt.c \
 +	ddt_zap.c \
 +	dmu.c \
 +	dmu_diff.c \
 +	dmu_object.c \
 +	dmu_objset.c \
 +	dmu_recv.c \
 +	dmu_redact.c \
 +	dmu_send.c \
 +	dmu_traverse.c \
 +	dmu_tx.c \
 +	dmu_zfetch.c \
 +	dnode.c \
 +	dnode_sync.c \
 +	dsl_bookmark.c \
 +	dsl_dataset.c \
 +	dsl_deadlist.c \
 +	dsl_deleg.c \
 +	dsl_dir.c \
 +	dsl_crypt.c \
 +	dsl_pool.c \
 +	dsl_prop.c \
 +	dsl_scan.c \
 +	dsl_synctask.c \
 +	dsl_destroy.c \
 +	dsl_userhold.c \
 +	edonr_zfs.c \
 +	entropy_common.c \
 +	error_private.c \
 +	fm.c \
 +	fse_compress.c \
 +	fse_decompress.c \
 +	gzip.c \
 +	hist.c \
 +	hkdf.c \
 +	huf_compress.c \
 +	huf_decompress.c \
 +	lzjb.c \
 +	lz4.c \
 +	lz4_zfs.c \
 +	metaslab.c \
 +	mmp.c \
 +	multilist.c \
 +	objlist.c \
 +	pathname.c \
 +	pool.c \
 +	range_tree.c \
 +	refcount.c \
 +	rrwlock.c \
 +	sa.c \
 +	sha2_zfs.c \
 +	skein_zfs.c \
 +	spa.c \
 +	spa_checkpoint.c \
 +	spa_config.c \
 +	spa_errlog.c \
 +	spa_history.c \
 +	spa_log_spacemap.c \
 +	spa_misc.c \
 +	spa_stats.c \
 +	space_map.c \
 +	space_reftree.c \
 +	txg.c \
 +	trace.c \
 +	uberblock.c \
 +	unique.c \
 +	vdev.c \
 +	vdev_draid.c \
 +	vdev_draid_rand.c \
 +	vdev_file.c \
 +	vdev_indirect_births.c \
 +	vdev_indirect.c \
 +	vdev_indirect_mapping.c \
 +	vdev_initialize.c \
 +	vdev_label.c \
++	vdev_label_os.c \
 +	vdev_mirror.c \
 +	vdev_missing.c \
 +	vdev_queue.c \
 +	vdev_raidz.c \
 +	vdev_raidz_math_aarch64_neon.c \
 +	vdev_raidz_math_aarch64_neonx2.c \
 +	vdev_raidz_math_avx2.c \
 +	vdev_raidz_math_avx512bw.c \
 +	vdev_raidz_math_avx512f.c \
 +	vdev_raidz_math.c \
 +	vdev_raidz_math_scalar.c \
 +	vdev_rebuild.c \
 +	vdev_removal.c \
 +	vdev_root.c \
 +	vdev_trim.c \
 +	xxhash.c \
 +	zap.c \
 +	zap_leaf.c \
 +	zap_micro.c \
 +	zcp.c \
 +	zcp_get.c \
 +	zcp_global.c \
 +	zcp_iter.c \
 +	zcp_set.c \
 +	zcp_synctask.c \
 +	zfeature.c \
 +	zfs_byteswap.c \
 +        zfs_chksum.c \
 +	zfs_debug.c \
 +	zfs_fm.c \
 +	zfs_fuid.c \
 +	zfs_sa.c \
 +	zfs_znode.c \
 +	zfs_racct.c \
 +	zfs_ratelimit.c \
 +	zfs_rlock.c \
 +	zil.c \
 +	zio.c \
 +	zio_checksum.c \
 +	zio_compress.c \
 +	zio_crypt.c \
 +	zio_inject.c \
 +	zle.c \
 +	zrlock.c \
 +	zstd_common.c \
 +	zstd_compress.c \
 +	zstd_compress_literals.c \
 +	zstd_compress_sequences.c \
 +	zstd_compress_superblock.c \
 +	zstd_ddict.c \
 +	zstd_decompress.c \
 +	zstd_decompress_block.c \
 +	zstd_double_fast.c \
 +	zstd_fast.c \
 +	zstd_lazy.c \
 +	zstd_ldm.c \
 +	zstd_opt.c \
 +	zthr.c
 +
 +ARCH_C =
 +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 +ARCH_C += 	vdev_raidz_math_sse2.c \
 +		vdev_raidz_math_ssse3.c \
 +		zfs_fletcher_intel.c \
 +		zfs_fletcher_sse.c 
 +CFLAGS +=  -DHAVE_SSE2 	-DHAVE_SSE3
 +.endif
 +.if ${MACHINE_ARCH} == "amd64"
 +ARCH_C +=	zfs_fletcher_avx512.c
 +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \
 +	-DHAVE_AVX512BW
 +.endif
 +.if ${MACHINE_CPUARCH} == "aarch64"
 +ARCH_C +=	zfs_fletcher_aarch64_neon.c
 +.endif
 +
 +LUA_C = \
 +	lapi.c \
 +	lauxlib.c \
 +	lbaselib.c \
 +	lcode.c \
 +	lcompat.c \
 +	lcorolib.c \
 +	lctype.c \
 +	ldebug.c \
 +	ldo.c \
 +	lfunc.c \
 +	lgc.c \
 +	llex.c \
 +	lmem.c \
 +	lobject.c \
 +	lopcodes.c \
 +	lparser.c \
 +	lstate.c \
 +	lstring.c \
 +	lstrlib.c \
 +	ltable.c \
 +	ltablib.c \
 +	ltm.c \
 +	lvm.c \
 +	lzio.c
 +
 +UNICODE_C = u8_textprep.c uconv.c
 +
 +SRCS=		${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
 +
 +WARNS?=		2
 +CFLAGS+= \
 +	-DIN_BASE \
 +	-I${ZFSTOP}/include \
 +	-I${ZFSTOP}/lib/libspl/include \
 +	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
 +	-I${SRCTOP}/sys \
 +	-I${ZFSTOP}/include/os/freebsd/zfs \
 +	-I${SRCTOP}/cddl/compat/opensolaris/include \
 +	-I${ZFSTOP}/module/icp/include \
 +	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
 +	-DHAVE_ISSETUGID \
 +	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
 +	-I${SRCTOP}/sys/modules/zfs \
 +	-I${ZFSTOP}/include/os/freebsd/zfs \
 +	-DLIB_ZPOOL_BUILD -DZFS_DEBUG \
 +
 +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look
 +#      into libthr private structures. That's sooo evil, but it's only for
 +#      ZFS debugging tools needs.
 +CFLAGS+=	-DWANTS_MUTEX_OWNED
 +CFLAGS+=	-I${SRCTOP}/lib/libpthread/thread
 +CFLAGS+=	-I${SRCTOP}/lib/libpthread/sys
 +CFLAGS+=	-I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include
 +CFLAGS.gcc+=	-fms-extensions
 +
 +LIBADD=		md pthread z spl icp nvpair avl umem
 +
 +# atomic.S doesn't like profiling.
 +MK_PROFILE=	no
 +
 +CSTD=	c99
 +
 +# Since there are many asserts in this library, it makes no sense to compile
 +# it without debugging.
 +
 +CFLAGS+=	-g -DDEBUG=1
 +
 +# Pointer values are used as debugging "tags" to mark reference count
 +# ownerships and in some cases the tag reference is dropped after an
 +# object is freed.
 +CFLAGS.dbuf.c=			${NO_WUSE_AFTER_FREE}
 +CFLAGS.entropy_common.c=	-fno-tree-vectorize
 +CFLAGS.entropy_common.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.error_private.c=		-fno-tree-vectorize
 +CFLAGS.error_private.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.fse_compress.c=		-fno-tree-vectorize
 +CFLAGS.fse_compress.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.fse_decompress.c=	-fno-tree-vectorize
 +CFLAGS.fse_decompress.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.hist.c=			-fno-tree-vectorize
 +CFLAGS.hist.c+=			${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.huf_compress.c=		-fno-tree-vectorize
 +CFLAGS.huf_compress.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.huf_decompress.c=	-fno-tree-vectorize
 +CFLAGS.huf_decompress.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.pool.c=			-fno-tree-vectorize
 +CFLAGS.pool.c+=			${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.xxhash.c=		-fno-tree-vectorize
 +CFLAGS.xxhash.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_compress.c=		-fno-tree-vectorize
 +CFLAGS.zstd_compress.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_compress_literals.c=	-fno-tree-vectorize
 +CFLAGS.zstd_compress_literals.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_compress_sequences.c=	-fno-tree-vectorize
 +CFLAGS.zstd_compress_sequences.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_compress_superblock.c=	-fno-tree-vectorize
 +CFLAGS.zstd_compress_superblock.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_double_fast.c=	-fno-tree-vectorize
 +CFLAGS.zstd_double_fast.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_fast.c=		-fno-tree-vectorize
 +CFLAGS.zstd_fast.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_lazy.c=		-fno-tree-vectorize
 +CFLAGS.zstd_lazy.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_ldm.c=		-fno-tree-vectorize
 +CFLAGS.zstd_ldm.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_opt.c=		-fno-tree-vectorize
 +CFLAGS.zstd_opt.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_ddict.c=		-fno-tree-vectorize
 +CFLAGS.zstd_ddict.c+=		${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_decompress.c=	-fno-tree-vectorize
 +CFLAGS.zstd_decompress.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +CFLAGS.zstd_decompress_block.c=	-fno-tree-vectorize
 +CFLAGS.zstd_decompress_block.c+=	${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 +
 +.include <bsd.lib.mk>
diff --cc sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c
index 000000000000,3d965b89a962..3d965b89a962
mode 000000,100644..100644
--- a/sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c
+++ b/sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
index 000000000000,063d7fa735df..063d7fa735df
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
index 000000000000,004f3d1f9255..004f3d1f9255
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh
index 000000000000,4d85c46897b8..4d85c46897b8
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh
index 000000000000,712b25261773..712b25261773
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh
index 000000000000,2be55dae4254..2be55dae4254
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh
index 000000000000,a31a7d254bfe..a31a7d254bfe
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh
index 000000000000,35ba8bde2392..35ba8bde2392
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh
index 000000000000,78294cb9e516..78294cb9e516
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh
diff --cc sys/modules/zfs/zfs_config.h
index dd1a926d286c,000000000000..686ab2e3f80d
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,1149 -1,0 +1,1149 @@@
 +/*
 + */
 +
 +/* zfs_config.h.  Generated from zfs_config.h.in by configure.  */
 +/* zfs_config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Define to 1 if translation of program messages to the user's native
 +   language is requested. */
 +/* #undef ENABLE_NLS */
 +
 +/* bio_end_io_t wants 1 arg */
 +/* #undef HAVE_1ARG_BIO_END_IO_T */
 +
 +/* lookup_bdev() wants 1 arg */
 +/* #undef HAVE_1ARG_LOOKUP_BDEV */
 +
 +/* submit_bio() wants 1 arg */
 +/* #undef HAVE_1ARG_SUBMIT_BIO */
 +
 +/* bdi_setup_and_register() wants 2 args */
 +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */
 +
 +/* vfs_getattr wants 2 args */
 +/* #undef HAVE_2ARGS_VFS_GETATTR */
 +
 +/* zlib_deflate_workspacesize() wants 2 args */
 +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */
 +
 +/* bdi_setup_and_register() wants 3 args */
 +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */
 +
 +/* vfs_getattr wants 3 args */
 +/* #undef HAVE_3ARGS_VFS_GETATTR */
 +
 +/* vfs_getattr wants 4 args */
 +/* #undef HAVE_4ARGS_VFS_GETATTR */
 +
 +/* kernel has access_ok with 'type' parameter */
 +/* #undef HAVE_ACCESS_OK_TYPE */
 +
 +/* posix_acl has refcount_t */
 +/* #undef HAVE_ACL_REFCOUNT */
 +
 +/* add_disk() returns int */
 +/* #undef HAVE_ADD_DISK_RET */
 +
 +/* Define if host toolchain supports AES */
 +#define HAVE_AES 1
 +
 +/* Define if you have [rt] */
 +#define HAVE_AIO_H 1
 +
 +#ifdef __amd64__
 +#ifndef RESCUE
 +/* Define if host toolchain supports AVX */
 +#define HAVE_AVX 1
 +#endif
 +
 +/* Define if host toolchain supports AVX2 */
 +#define HAVE_AVX2 1
 +
 +/* Define if host toolchain supports AVX512BW */
 +#define HAVE_AVX512BW 1
 +
 +/* Define if host toolchain supports AVX512CD */
 +#define HAVE_AVX512CD 1
 +
 +/* Define if host toolchain supports AVX512DQ */
 +#define HAVE_AVX512DQ 1
 +
 +/* Define if host toolchain supports AVX512ER */
 +#define HAVE_AVX512ER 1
 +
 +/* Define if host toolchain supports AVX512F */
 +#define HAVE_AVX512F 1
 +
 +/* Define if host toolchain supports AVX512IFMA */
 +#define HAVE_AVX512IFMA 1
 +
 +/* Define if host toolchain supports AVX512PF */
 +#define HAVE_AVX512PF 1
 +
 +/* Define if host toolchain supports AVX512VBMI */
 +#define HAVE_AVX512VBMI 1
 +
 +/* Define if host toolchain supports AVX512VL */
 +#define HAVE_AVX512VL 1
 +#endif
 +
 +/* bdevname() is available */
 +/* #undef HAVE_BDEVNAME */
 +
 +/* bdev_check_media_change() exists */
 +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
 +
 +/* bdev_*_io_acct() available */
 +/* #undef HAVE_BDEV_IO_ACCT_63 */
 +
 +/* bdev_*_io_acct() available */
 +/* #undef HAVE_BDEV_IO_ACCT_OLD */
 +
 +/* bdev_kobj() exists */
 +/* #undef HAVE_BDEV_KOBJ */
 +
 +/* bdev_max_discard_sectors() is available */
 +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */
 +
 +/* bdev_max_secure_erase_sectors() is available */
 +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */
 +
 +/* block_device_operations->submit_bio() returns void */
 +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */
 +
 +/* bdev_whole() is available */
 +/* #undef HAVE_BDEV_WHOLE */
 +
 +/* bio_alloc() takes 4 arguments */
 +/* #undef HAVE_BIO_ALLOC_4ARG */
 +
 +/* bio->bi_bdev->bd_disk exists */
 +/* #undef HAVE_BIO_BDEV_DISK */
 +
 +/* bio->bi_opf is defined */
 +/* #undef HAVE_BIO_BI_OPF */
 +
 +/* bio->bi_status exists */
 +/* #undef HAVE_BIO_BI_STATUS */
 +
 +/* bio has bi_iter */
 +/* #undef HAVE_BIO_BVEC_ITER */
 +
 +/* bio_*_io_acct() available */
 +/* #undef HAVE_BIO_IO_ACCT */
 +
 +/* bio_max_segs() is implemented */
 +/* #undef HAVE_BIO_MAX_SEGS */
 +
 +/* bio_set_dev() is available */
 +/* #undef HAVE_BIO_SET_DEV */
 +
 +/* bio_set_dev() GPL-only */
 +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
 +
 +/* bio_set_dev() is a macro */
 +/* #undef HAVE_BIO_SET_DEV_MACRO */
 +
 +/* bio_set_op_attrs is available */
 +/* #undef HAVE_BIO_SET_OP_ATTRS */
 +
 +/* blkdev_get_by_path() exists and takes 4 args */
 +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */
 +
 +/* blkdev_get_by_path() handles ERESTARTSYS */
 +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */
 +
 +/* blkdev_issue_discard() is available */
 +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */
 +
 +/* blkdev_issue_secure_erase() is available */
 +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */
 +
 +/* blkdev_put() accepts void* as arg 2 */
 +/* #undef HAVE_BLKDEV_PUT_HOLDER */
 +
 +/* blkdev_reread_part() exists */
 +/* #undef HAVE_BLKDEV_REREAD_PART */
 +
 +/* blkg_tryget() is available */
 +/* #undef HAVE_BLKG_TRYGET */
 +
 +/* blkg_tryget() GPL-only */
 +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */
 +
 +/* blk_alloc_disk() exists */
 +/* #undef HAVE_BLK_ALLOC_DISK */
 +
 +/* blk_alloc_queue() expects request function */
 +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */
 +
 +/* blk_alloc_queue_rh() expects request function */
 +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */
 +
 +/* blk_cleanup_disk() exists */
 +/* #undef HAVE_BLK_CLEANUP_DISK */
 +
 +/* blk_mode_t is defined */
 +/* #undef HAVE_BLK_MODE_T */
 +
 +/* block multiqueue is available */
 +/* #undef HAVE_BLK_MQ */
 +
 +/* blk queue backing_dev_info is dynamic */
 +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
 +
 +/* blk_queue_discard() is available */
 +/* #undef HAVE_BLK_QUEUE_DISCARD */
 +
 +/* blk_queue_flag_clear() exists */
 +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */
 +
 +/* blk_queue_flag_set() exists */
 +/* #undef HAVE_BLK_QUEUE_FLAG_SET */
 +
 +/* blk_queue_flush() is available */
 +/* #undef HAVE_BLK_QUEUE_FLUSH */
 +
 +/* blk_queue_flush() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */
 +
 +/* blk_queue_secdiscard() is available */
 +/* #undef HAVE_BLK_QUEUE_SECDISCARD */
 +
 +/* blk_queue_secure_erase() is available */
 +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
 +
 +/* blk_queue_update_readahead() exists */
 +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
 +
 +/* blk_queue_write_cache() exists */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */
 +
 +/* blk_queue_write_cache() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */
 +
 +/* BLK_STS_RESV_CONFLICT is defined */
 +/* #undef HAVE_BLK_STS_RESV_CONFLICT */
 +
 +/* Define if release() in block_device_operations takes 1 arg */
 +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */
 +
 +/* Define if revalidate_disk() in block_device_operations */
 +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */
 +
 +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
 +   CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYCURRENT */
 +
 +/* Define to 1 if you have the Mac OS X function
 +   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 +
 +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 +   the CoreFoundation framework. */
 +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 +
 +/* check_disk_change() exists */
 +/* #undef HAVE_CHECK_DISK_CHANGE */
 +
 +/* clear_inode() is available */
 +/* #undef HAVE_CLEAR_INODE */
 +
 +/* dentry uses const struct dentry_operations */
 +/* #undef HAVE_CONST_DENTRY_OPERATIONS */
 +
 +/* copy_from_iter() is available */
 +/* #undef HAVE_COPY_FROM_ITER */
 +
 +/* copy_splice_read exists */
 +/* #undef HAVE_COPY_SPLICE_READ */
 +
 +/* copy_to_iter() is available */
 +/* #undef HAVE_COPY_TO_ITER */
 +
 +/* cpu_has_feature() is GPL-only */
 +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */
 +
 +/* yes */
 +/* #undef HAVE_CPU_HOTPLUG */
 +
 +/* current_time() exists */
 +/* #undef HAVE_CURRENT_TIME */
 +
 +/* Define if the GNU dcgettext() function is already present or preinstalled.
 +   */
 +/* #undef HAVE_DCGETTEXT */
 +
 +/* DECLARE_EVENT_CLASS() is available */
 +/* #undef HAVE_DECLARE_EVENT_CLASS */
 +
 +/* dentry aliases are in d_u member */
 +/* #undef HAVE_DENTRY_D_U_ALIASES */
 +
 +/* dequeue_signal() takes 4 arguments */
 +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */
 +
 +/* lookup_bdev() wants dev_t arg */
 +/* #undef HAVE_DEVT_LOOKUP_BDEV */
 +
 +/* sops->dirty_inode() wants flags */
 +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */
 +
 +/* disk_check_media_change() exists */
 +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */
 +
 +/* disk_*_io_acct() available */
 +/* #undef HAVE_DISK_IO_ACCT */
 +
 +/* disk_update_readahead() exists */
 +/* #undef HAVE_DISK_UPDATE_READAHEAD */
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#define HAVE_DLFCN_H 1
 +
 +/* d_make_root() is available */
 +/* #undef HAVE_D_MAKE_ROOT */
 +
 +/* d_prune_aliases() is available */
 +/* #undef HAVE_D_PRUNE_ALIASES */
 +
 +/* dops->d_revalidate() operation takes nameidata */
 +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */
 +
 +/* eops->encode_fh() wants child and parent inodes */
 +/* #undef HAVE_ENCODE_FH_WITH_INODE */
 +
 +/* sops->evict_inode() exists */
 +/* #undef HAVE_EVICT_INODE */
 +
 +/* FALLOC_FL_ZERO_RANGE is defined */
 +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */
 +
 +/* fault_in_iov_iter_readable() is available */
 +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */
 +
 +/* filemap_range_has_page() is available */
 +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */
 +
 +/* fops->aio_fsync() exists */
 +/* #undef HAVE_FILE_AIO_FSYNC */
 +
 +/* file_dentry() is available */
 +/* #undef HAVE_FILE_DENTRY */
 +
 +/* fops->fadvise() exists */
 +/* #undef HAVE_FILE_FADVISE */
 +
 +/* file_inode() is available */
 +/* #undef HAVE_FILE_INODE */
 +
 +/* flush_dcache_page() is GPL-only */
 +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */
 +
 +/* iops->follow_link() cookie */
 +/* #undef HAVE_FOLLOW_LINK_COOKIE */
 +
 +/* iops->follow_link() nameidata */
 +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */
 +
 +/* Define if compiler supports -Wformat-overflow */
 +/* #undef HAVE_FORMAT_OVERFLOW */
 +
 +/* fsync_bdev() is declared in include/blkdev.h */
 +/* #undef HAVE_FSYNC_BDEV */
 +
 +/* fops->fsync() with range */
 +/* #undef HAVE_FSYNC_RANGE */
 +
 +/* fops->fsync() without dentry */
 +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */
 +
 +/* yes */
 +/* #undef HAVE_GENERIC_FADVISE */
 +
 +/* generic_fillattr requires struct mnt_idmap* */
 +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */
 +
 +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */
 +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */
 +
 +/* generic_fillattr requires struct user_namespace* */
 +/* #undef HAVE_GENERIC_FILLATTR_USERNS */
 +
 +/* generic_*_io_acct() 3 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */
 +
 +/* generic_*_io_acct() 4 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
 +
 +/* generic_readlink is global */
 +/* #undef HAVE_GENERIC_READLINK */
 +
 +/* generic_setxattr() exists */
 +/* #undef HAVE_GENERIC_SETXATTR */
 +
 +/* generic_write_checks() takes kiocb */
 +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */
 +
 +/* Define if the GNU gettext() function is already present or preinstalled. */
 +/* #undef HAVE_GETTEXT */
 +
 +/* iops->get_acl() exists */
 +/* #undef HAVE_GET_ACL */
 +
 +/* iops->get_acl() takes rcu */
 +/* #undef HAVE_GET_ACL_RCU */
 +
 +/* has iops->get_inode_acl() */
 +/* #undef HAVE_GET_INODE_ACL */
 +
 +/* iops->get_link() cookie */
 +/* #undef HAVE_GET_LINK_COOKIE */
 +
 +/* iops->get_link() delayed */
 +/* #undef HAVE_GET_LINK_DELAYED */
 +
 +/* group_info->gid exists */
 +/* #undef HAVE_GROUP_INFO_GID */
 +
 +/* has_capability() is available */
 +/* #undef HAVE_HAS_CAPABILITY */
 +
 +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */
 +/* #undef HAVE_IATTR_VFSID */
 +
 +/* Define if you have the iconv() function and it works. */
 +#define HAVE_ICONV 1
 +
 +/* iops->getattr() takes struct mnt_idmap* */
 +/* #undef HAVE_IDMAP_IOPS_GETATTR */
 +
 +/* iops->setattr() takes struct mnt_idmap* */
 +/* #undef HAVE_IDMAP_IOPS_SETATTR */
 +
 +/* APIs for idmapped mount are present */
 +/* #undef HAVE_IDMAP_MNT_API */
 +
 +/* Define if compiler supports -Wimplicit-fallthrough */
 +/* #undef HAVE_IMPLICIT_FALLTHROUGH */
 +
 +/* Define if compiler supports -Winfinite-recursion */
 +/* #undef HAVE_INFINITE_RECURSION */
 +
 +/* inode_get_ctime() exists in linux/fs.h */
 +/* #undef HAVE_INODE_GET_CTIME */
 +
 +/* yes */
 +/* #undef HAVE_INODE_LOCK_SHARED */
 +
 +/* inode_owner_or_capable() exists */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
 +
 +/* inode_owner_or_capable() takes mnt_idmap */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */
 +
 +/* inode_owner_or_capable() takes user_ns */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */
 +
 +/* inode_set_ctime_to_ts() exists in linux/fs.h */
 +/* #undef HAVE_INODE_SET_CTIME_TO_TS */
 +
 +/* inode_set_flags() exists */
 +/* #undef HAVE_INODE_SET_FLAGS */
 +
 +/* inode_set_iversion() exists */
 +/* #undef HAVE_INODE_SET_IVERSION */
 +
 +/* inode->i_*time's are timespec64 */
 +/* #undef HAVE_INODE_TIMESPEC64_TIMES */
 +
 +/* timestamp_truncate() exists */
 +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
 +
 +/* in_compat_syscall() is available */
 +/* #undef HAVE_IN_COMPAT_SYSCALL */
 +
 +/* iops->create() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_CREATE_IDMAP */
 +
 +/* iops->create() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_CREATE_USERNS */
 +
 +/* iops->mkdir() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_MKDIR_IDMAP */
 +
 +/* iops->mkdir() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKDIR_USERNS */
 +
 +/* iops->mknod() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_MKNOD_IDMAP */
 +
 +/* iops->mknod() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKNOD_USERNS */
 +
 +/* iops->permission() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_PERMISSION_IDMAP */
 +
 +/* iops->permission() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_PERMISSION_USERNS */
 +
 +/* iops->rename() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_RENAME_IDMAP */
 +
 +/* iops->rename() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_RENAME_USERNS */
 +
 +/* iops->setattr() exists */
 +/* #undef HAVE_IOPS_SETATTR */
 +
 +/* iops->symlink() takes struct mnt_idmap* */
 +/* #undef HAVE_IOPS_SYMLINK_IDMAP */
*** 656 LINES SKIPPED ***