git: f193a24ec570 - stable/13 - zfs: merge openzfs/zfs@6a6bd4939 (zfs-2.1-release) into stable/13
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Oct 2022 16:07:55 UTC
The branch stable/13 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=f193a24ec57067da831f732865e5871e311704af
commit f193a24ec57067da831f732865e5871e311704af
Merge: 6d2cfa2d34e3 6a6bd493988c
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-10-04 15:52:09 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-10-04 15:52:45 +0000
zfs: merge openzfs/zfs@6a6bd4939 (zfs-2.1-release) into stable/13
OpenZFS release 2.1.6
Notable upstream pull requeset merges:
#11733 ICP: Add missing stack frame info to SHA asm files
#12274 Optimize txg_kick() process
#12284 Add Module Parameter Regarding Log Size Limit
#12285 Introduce a tunable to exclude special class buffers from L2ARC
#12287 Remove refcount from spa_config_*()
#12425 Avoid small buffer copying on write
#12516 Fix NFS and large reads on older kernels
#12678 spa.c: Replace VERIFY(nvlist_*(...) == 0) with fnvlist_*
#12789 Improve log spacemap load time
#13022 Add more control/visibility and speedup spa_load_verify()
#13106 add physical device size to SIZE column in 'zpool list -v'
#13388 Improve mg_aliquot math
#13405 Revert "Reduce dbuf_find() lock contention"
#13452 More speculative prefetcher improvements
#13476 Refactor Log Size Limit
#13540 AVL: Remove obsolete branching optimizations
#13553 Reduce ZIO io_lock contention on sorted scrub
#13555 Scrub mirror children without BPs
#13563 FreeBSD: Improve crypto_dispatch() handling
#13576 Several sorted scrub optimizations
#13579 Fix and disable blocks statistics during scrub
#13582 Several B-tree optimizations
#13591 Avoid two 64-bit divisions per scanned block
#13606 Avoid memory copies during mirror scrub
#13613 Avoid memory copy when verifying raidz/draid parity
#13643 Fix scrub resume from newly created hole
#13756 FreeBSD: Mark ZFS_MODULE_PARAM_CALL as MPSAFE
#13767 arcstat: fix -p option
#13781 Importing from cachefile can trip assertion
#13794 Apply arc_shrink_shift to ARC above arc_c_min
#13798 Improve too large physical ashift handling
#13811 Fix column width in 'zpool iostat -v' and 'zpool list -v'
#13842 make DMU_OT_IS_METADATA and DMU_OT_IS_ENCRYPTED return B_TRUE
or B_FALSE
#13855 zfs recv hangs if max recordsize is less than received
recordsize
#13861 Fix use-after-free in btree code
#13865 vdev_draid_lookup_map() should not iterate outside draid_maps
#13878 Delay ZFS_PROP_SHARESMB property to handle it for encrypted
raw receive
#13882 FreeBSD: Fix integer conversion for vnlru_free{,_vfsops}()
#13885 Fix incorrect size given to bqueue_enqueue() call in dmu_redact.c
#13908 FreeBSD: stop passing LK_INTERLOCK to VOP_LOCK
#13930 zpool: Don't print "repairing" on force faulted drives
#13954 Fix bad free in skein code
Obtained from: OpenZFS
OpenZFS tag: zfs-2.1.6
OpenZFS commit: 6a6bd493988c75331deab06e5352a9bed035a87d
Relnotes: yes
cddl/lib/libicp/Makefile | 4 -
cddl/lib/libicp_rescue/Makefile | 4 -
sys/contrib/openzfs/META | 4 +-
sys/contrib/openzfs/Makefile.am | 7 +-
sys/contrib/openzfs/cmd/arcstat/arcstat.in | 2 +-
sys/contrib/openzfs/cmd/zdb/zdb.c | 113 +-
sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 155 ++-
sys/contrib/openzfs/cmd/zed/zed_disk_event.c | 60 +-
sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +-
sys/contrib/openzfs/cmd/zfs/zfs_project.c | 14 +-
sys/contrib/openzfs/cmd/zpool/zpool_main.c | 28 +-
.../openzfs/config/always-compiler-options.m4 | 58 +-
sys/contrib/openzfs/config/always-parallel.m4 | 8 +
sys/contrib/openzfs/config/kernel-blk-queue.m4 | 16 +-
sys/contrib/openzfs/config/kernel-blkdev.m4 | 28 +
.../config/kernel-block-device-operations.m4 | 17 +-
sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 4 +-
.../openzfs/config/kernel-make-request-fn.m4 | 20 +
sys/contrib/openzfs/config/kernel-shrink.m4 | 67 +-
sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 29 +-
sys/contrib/openzfs/config/zfs-build.m4 | 5 +-
.../dracut/90zfs/zfs-snapshot-bootfs.service.in | 2 +-
.../contrib/pyzfs/libzfs_core/_constants.py | 2 +-
.../openzfs/include/os/freebsd/spl/sys/mod_os.h | 2 +-
.../include/os/linux/kernel/linux/xattr_compat.h | 14 +
.../openzfs/include/os/linux/spl/sys/shrinker.h | 4 +
sys/contrib/openzfs/include/sys/abd.h | 1 +
sys/contrib/openzfs/include/sys/abd_impl.h | 1 -
sys/contrib/openzfs/include/sys/arc.h | 1 +
sys/contrib/openzfs/include/sys/bqueue.h | 14 +-
sys/contrib/openzfs/include/sys/btree.h | 12 +-
sys/contrib/openzfs/include/sys/crypto/icp.h | 3 -
sys/contrib/openzfs/include/sys/dbuf.h | 20 +-
sys/contrib/openzfs/include/sys/dmu.h | 6 +-
sys/contrib/openzfs/include/sys/dmu_objset.h | 4 -
sys/contrib/openzfs/include/sys/dmu_tx.h | 1 +
sys/contrib/openzfs/include/sys/dmu_zfetch.h | 16 +-
sys/contrib/openzfs/include/sys/dsl_pool.h | 8 +-
sys/contrib/openzfs/include/sys/dsl_scan.h | 2 +-
sys/contrib/openzfs/include/sys/fs/zfs.h | 43 +
sys/contrib/openzfs/include/sys/metaslab.h | 3 +
sys/contrib/openzfs/include/sys/metaslab_impl.h | 1 +
sys/contrib/openzfs/include/sys/range_tree.h | 21 +-
sys/contrib/openzfs/include/sys/spa.h | 21 -
sys/contrib/openzfs/include/sys/spa_impl.h | 4 +-
sys/contrib/openzfs/include/sys/spa_log_spacemap.h | 9 +-
sys/contrib/openzfs/include/sys/sysevent/dev.h | 3 +
sys/contrib/openzfs/include/sys/txg.h | 2 +-
sys/contrib/openzfs/include/sys/vdev_impl.h | 1 +
sys/contrib/openzfs/include/sys/zil.h | 11 +-
sys/contrib/openzfs/include/sys/zio.h | 19 +-
sys/contrib/openzfs/lib/libavl/Makefile.am | 3 +
sys/contrib/openzfs/lib/libefi/Makefile.am | 3 +
sys/contrib/openzfs/lib/libicp/Makefile.am | 5 +-
sys/contrib/openzfs/lib/libnvpair/Makefile.am | 3 +
sys/contrib/openzfs/lib/libshare/Makefile.am | 3 +
sys/contrib/openzfs/lib/libspl/Makefile.am | 3 +
sys/contrib/openzfs/lib/libtpool/Makefile.am | 6 +
sys/contrib/openzfs/lib/libunicode/Makefile.am | 3 +
sys/contrib/openzfs/lib/libuutil/Makefile.am | 3 +
sys/contrib/openzfs/lib/libzfs/Makefile.am | 4 +-
sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 3 +
sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 3 +
sys/contrib/openzfs/lib/libzpool/Makefile.am | 6 +-
sys/contrib/openzfs/lib/libzstd/Makefile.am | 2 +
sys/contrib/openzfs/lib/libzutil/Makefile.am | 5 +-
sys/contrib/openzfs/lib/libzutil/zutil_import.c | 2 +
sys/contrib/openzfs/man/man4/zfs.4 | 74 +-
sys/contrib/openzfs/man/man8/zdb.8 | 18 +-
sys/contrib/openzfs/module/.gitignore | 1 +
sys/contrib/openzfs/module/avl/avl.c | 24 +-
sys/contrib/openzfs/module/icp/Makefile.in | 6 -
sys/contrib/openzfs/module/icp/algs/edonr/edonr.c | 2 +-
sys/contrib/openzfs/module/icp/algs/sha1/sha1.c | 835 ------------
.../openzfs/module/icp/asm-x86_64/aes/aes_aesni.S | 24 +-
.../openzfs/module/icp/asm-x86_64/aes/aes_amd64.S | 4 +-
.../module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S | 6 +-
.../module/icp/asm-x86_64/modes/gcm_pclmulqdq.S | 2 +-
.../module/icp/asm-x86_64/sha1/sha1-x86_64.S | 1353 --------------------
.../module/icp/asm-x86_64/sha2/sha256_impl.S | 28 +-
.../module/icp/asm-x86_64/sha2/sha512_impl.S | 28 +-
sys/contrib/openzfs/module/icp/illumos-crypto.c | 2 -
sys/contrib/openzfs/module/icp/include/sha1/sha1.h | 61 -
.../openzfs/module/icp/include/sha1/sha1_consts.h | 65 -
.../openzfs/module/icp/include/sha1/sha1_impl.h | 73 --
.../module/icp/include/sys/ia32/asm_linkage.h | 6 +
sys/contrib/openzfs/module/icp/io/sha1_mod.c | 1230 ------------------
sys/contrib/openzfs/module/icp/io/skein_mod.c | 18 +-
sys/contrib/openzfs/module/lua/ldo.c | 13 +-
.../openzfs/module/lua/setjmp/setjmp_x86_64.S | 10 +-
sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 2 +-
sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 11 +-
.../openzfs/module/os/freebsd/zfs/crypto_os.c | 41 +-
.../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 +-
.../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 +-
.../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 4 +
.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 41 +-
sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 2 +-
.../openzfs/module/os/linux/zfs/vdev_disk.c | 12 +-
.../openzfs/module/os/linux/zfs/zio_crypt.c | 8 +-
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 4 +
sys/contrib/openzfs/module/zfs/abd.c | 2 +-
sys/contrib/openzfs/module/zfs/arc.c | 36 +-
sys/contrib/openzfs/module/zfs/bqueue.c | 23 +-
sys/contrib/openzfs/module/zfs/btree.c | 783 +++++------
sys/contrib/openzfs/module/zfs/dbuf.c | 120 +-
sys/contrib/openzfs/module/zfs/dbuf_stats.c | 4 +-
sys/contrib/openzfs/module/zfs/dmu.c | 2 +-
sys/contrib/openzfs/module/zfs/dmu_objset.c | 34 +-
sys/contrib/openzfs/module/zfs/dmu_redact.c | 4 +-
sys/contrib/openzfs/module/zfs/dmu_tx.c | 59 +-
sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 185 +--
sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 6 +-
sys/contrib/openzfs/module/zfs/dsl_pool.c | 91 +-
sys/contrib/openzfs/module/zfs/dsl_scan.c | 358 +++---
sys/contrib/openzfs/module/zfs/metaslab.c | 141 +-
sys/contrib/openzfs/module/zfs/range_tree.c | 79 +-
sys/contrib/openzfs/module/zfs/spa.c | 307 +++--
sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 231 ++--
sys/contrib/openzfs/module/zfs/spa_misc.c | 19 +-
sys/contrib/openzfs/module/zfs/txg.c | 36 +-
sys/contrib/openzfs/module/zfs/vdev.c | 44 +-
sys/contrib/openzfs/module/zfs/vdev_draid.c | 12 +-
sys/contrib/openzfs/module/zfs/vdev_mirror.c | 145 ++-
sys/contrib/openzfs/module/zfs/vdev_raidz.c | 33 +-
sys/contrib/openzfs/module/zfs/vdev_removal.c | 2 -
sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 15 +
sys/contrib/openzfs/module/zfs/zfs_log.c | 68 +-
sys/contrib/openzfs/module/zfs/zfs_vnops.c | 15 +
sys/contrib/openzfs/module/zfs/zio.c | 18 +-
sys/contrib/openzfs/module/zfs/zvol.c | 7 +-
sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 2 +-
sys/contrib/openzfs/rpm/generic/zfs.spec.in | 49 +-
sys/contrib/openzfs/tests/runfiles/common.run | 3 +-
.../openzfs/tests/test-runner/bin/zts-report.py.in | 2 -
.../openzfs/tests/zfs-tests/include/tunables.cfg | 2 +
.../tests/functional/cli_root/zdb/zdb_args_neg.ksh | 2 +-
.../functional/cli_root/zdb/zdb_objset_id.ksh | 43 +-
.../functional/cli_root/zpool_add/add-o_ashift.ksh | 5 +-
.../cli_root/zpool_expand/zpool_expand_001_pos.ksh | 112 +-
.../zfs-tests/tests/functional/io/io_uring.ksh | 2 +-
.../pool_checkpoint/checkpoint_lun_expsz.ksh | 6 +-
.../tests/functional/redundancy/Makefile.am | 3 +-
...d_damaged.ksh => redundancy_draid_damaged1.ksh} | 17 +-
.../redundancy/redundancy_draid_damaged2.ksh | 157 +++
.../functional/rsend/send_encrypted_props.ksh | 8 +
sys/modules/zfs/zfs_config.h | 29 +-
sys/modules/zfs/zfs_gitrev.h | 5 +-
148 files changed, 3016 insertions(+), 5277 deletions(-)
diff --cc cddl/lib/libicp/Makefile
index 253b252bc2d4,000000000000..9195b7182d54
mode 100644,000000..100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@@ -1,101 -1,0 +1,97 @@@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
+
+PACKAGE= utilities
+LIB= icp
+LIBADD=
+
+
+.if ${MACHINE_ARCH} == "amd64"
+ASM_SOURCES_C = asm-x86_64/aes/aeskey.c
+ASM_SOURCES_AS = \
+ asm-x86_64/aes/aes_amd64.S \
+ asm-x86_64/aes/aes_aesni.S \
+ asm-x86_64/modes/gcm_pclmulqdq.S \
+ asm-x86_64/modes/aesni-gcm-x86_64.S \
+ asm-x86_64/modes/ghash-x86_64.S \
- asm-x86_64/sha1/sha1-x86_64.S \
+ asm-x86_64/sha2/sha256_impl.S \
+ asm-x86_64/sha2/sha512_impl.S
+
+CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES
+.else
+ASM_SOURCES_C =
+ASM_SOURCES_AS =
+.endif
+
+
+KERNEL_C = \
+ spi/kcf_spi.c \
+ api/kcf_ctxops.c \
+ api/kcf_digest.c \
+ api/kcf_cipher.c \
+ api/kcf_miscapi.c \
+ api/kcf_mac.c \
+ algs/aes/aes_impl_aesni.c \
+ algs/aes/aes_impl_generic.c \
+ algs/aes/aes_impl_x86-64.c \
+ algs/aes/aes_impl.c \
+ algs/aes/aes_modes.c \
+ algs/edonr/edonr.c \
+ algs/modes/modes.c \
+ algs/modes/cbc.c \
+ algs/modes/gcm_generic.c \
+ algs/modes/gcm_pclmulqdq.c \
+ algs/modes/gcm.c \
+ algs/modes/ctr.c \
+ algs/modes/ccm.c \
+ algs/modes/ecb.c \
- algs/sha1/sha1.c \
+ algs/sha2/sha2.c \
+ algs/skein/skein.c \
+ algs/skein/skein_block.c \
+ algs/skein/skein_iv.c \
+ illumos-crypto.c \
+ io/aes.c \
+ io/edonr_mod.c \
- io/sha1_mod.c \
+ io/sha2_mod.c \
+ io/skein_mod.c \
+ os/modhash.c \
+ os/modconf.c \
+ core/kcf_sched.c \
+ core/kcf_prov_lib.c \
+ core/kcf_callprov.c \
+ core/kcf_mech_tabs.c \
+ core/kcf_prov_tabs.c \
+ $(ASM_SOURCES_C)
+
+
+
+
+
+
+SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
+
+WARNS?= 2
+SHLIB_MAJOR= 3
+CSTD= c99
+CFLAGS+= -DIN_BASE
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
+CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -DHAVE_ISSETUGID
+CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+
+
+CFLAGS.aes_amd64.S+= -DLOCORE
+CFLAGS.aes_aesni.S+= -DLOCORE
+CFLAGS.gcm_pclmulqdq.S+= -DLOCORE
+CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE
+CFLAGS.ghash-x86_64.S+= -DLOCORE
- CFLAGS.sha1-x86_64.S+= -DLOCORE
+CFLAGS.sha256_impl.S+= -DLOCORE
+CFLAGS.sha512_impl.S+= -DLOCORE
+
+.include <bsd.lib.mk>
diff --cc cddl/lib/libicp_rescue/Makefile
index a46fd6db3877,000000000000..342afd2556cc
mode 100644,000000..100644
--- a/cddl/lib/libicp_rescue/Makefile
+++ b/cddl/lib/libicp_rescue/Makefile
@@@ -1,99 -1,0 +1,95 @@@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
+
+PACKAGE= utilities
+LIB= icp_rescue
+LIBADD=
+
+
+.if ${MACHINE_ARCH} == "amd64"
+ASM_SOURCES_C = asm-x86_64/aes/aeskey.c
+ASM_SOURCES_AS = \
+ asm-x86_64/aes/aes_amd64.S \
+ asm-x86_64/aes/aes_aesni.S \
+ asm-x86_64/modes/gcm_pclmulqdq.S \
+ asm-x86_64/modes/aesni-gcm-x86_64.S \
- asm-x86_64/sha1/sha1-x86_64.S \
+ asm-x86_64/sha2/sha256_impl.S \
+ asm-x86_64/sha2/sha512_impl.S
+
+CFLAGS+= -D__amd64 -D_SYS_STACK_H
+.else
+ASM_SOURCES_C =
+ASM_SOURCES_AS =
+.endif
+
+
+KERNEL_C = \
+ spi/kcf_spi.c \
+ api/kcf_ctxops.c \
+ api/kcf_digest.c \
+ api/kcf_cipher.c \
+ api/kcf_miscapi.c \
+ api/kcf_mac.c \
+ algs/aes/aes_impl_aesni.c \
+ algs/aes/aes_impl_generic.c \
+ algs/aes/aes_impl_x86-64.c \
+ algs/aes/aes_impl.c \
+ algs/aes/aes_modes.c \
+ algs/edonr/edonr.c \
+ algs/modes/modes.c \
+ algs/modes/cbc.c \
+ algs/modes/gcm_generic.c \
+ algs/modes/gcm_pclmulqdq.c \
+ algs/modes/gcm.c \
+ algs/modes/ctr.c \
+ algs/modes/ccm.c \
+ algs/modes/ecb.c \
- algs/sha1/sha1.c \
+ algs/sha2/sha2.c \
+ algs/skein/skein_block.c \
+ illumos-crypto.c \
+ io/aes.c \
+ io/edonr_mod.c \
- io/sha1_mod.c \
+ io/sha2_mod.c \
+ io/skein_mod.c \
+ os/modhash.c \
+ os/modconf.c \
+ core/kcf_sched.c \
+ core/kcf_prov_lib.c \
+ core/kcf_callprov.c \
+ core/kcf_mech_tabs.c \
+ core/kcf_prov_tabs.c \
+ $(ASM_SOURCES_C)
+
+
+
+
+
+
+SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
+
+WARNS?= 2
+SHLIB_MAJOR= 3
+CSTD= c99
+CFLAGS+= -DIN_BASE
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
+CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE
+CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+
+
+CFLAGS.aes_amd64.S+= -DLOCORE
+CFLAGS.aes_aesni.S+= -DLOCORE
+CFLAGS.gcm_pclmulqdq.S+= -DLOCORE
+CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE
+CFLAGS.ghash-x86_64.S+= -DLOCORE
- CFLAGS.sha1-x86_64.S+= -DLOCORE
+CFLAGS.sha256_impl.S+= -DLOCORE
+CFLAGS.sha512_impl.S+= -DLOCORE
+CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM
+
+.include <bsd.lib.mk>
diff --cc sys/contrib/openzfs/config/always-parallel.m4
index 000000000000,c1f1ae78e7e7..c1f1ae78e7e7
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/always-parallel.m4
+++ b/sys/contrib/openzfs/config/always-parallel.m4
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh
index 000000000000,8e06db9bad99..8e06db9bad99
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh
diff --cc sys/modules/zfs/zfs_config.h
index a10ec47d9f45,000000000000..6f54dfc699a4
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,960 -1,0 +1,975 @@@
+/*
+ * $FreeBSD$
+ */
+
+/* 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
+
+#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 */
+
+/* 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() 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_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 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 */
+
+/* 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_to_iter() is available */
+/* #undef HAVE_COPY_TO_ITER */
+
+/* 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 */
+
+/* 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_*_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 */
+
+/* fops->aio_fsync() exists */
+/* #undef HAVE_FILE_AIO_FSYNC */
+
+/* file_dentry() is available */
+/* #undef HAVE_FILE_DENTRY */
+
+/* file_inode() is available */
+/* #undef HAVE_FILE_INODE */
+
+/* iops->follow_link() cookie */
+/* #undef HAVE_FOLLOW_LINK_COOKIE */
+
+/* iops->follow_link() nameidata */
+/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */
+
+/* fops->fsync() with range */
+/* #undef HAVE_FSYNC_RANGE */
+
+/* fops->fsync() without dentry */
+/* #undef HAVE_FSYNC_WITHOUT_DENTRY */
+
+/* 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 */
+
+/* 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 */
+
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 1
+
++/* Define if compiler supports -Winfinite-recursion */
++/* #undef HAVE_INFINITE_RECURSION */
++
+/* yes */
+/* #undef HAVE_INODE_LOCK_SHARED */
+
+/* inode_owner_or_capable() exists */
+/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
+
+/* inode_owner_or_capable() takes user_ns */
+/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED */
+
+/* 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 user_namespace* */
+/* #undef HAVE_IOPS_CREATE_USERNS */
+
+/* iops->mkdir() takes struct user_namespace* */
+/* #undef HAVE_IOPS_MKDIR_USERNS */
+
+/* iops->mknod() takes struct user_namespace* */
+/* #undef HAVE_IOPS_MKNOD_USERNS */
+
+/* iops->rename() takes struct user_namespace* */
+/* #undef HAVE_IOPS_RENAME_USERNS */
+
+/* iops->symlink() takes struct user_namespace* */
+/* #undef HAVE_IOPS_SYMLINK_USERNS */
+
+/* iov_iter_advance() is available */
+/* #undef HAVE_IOV_ITER_ADVANCE */
+
+/* iov_iter_count() is available */
+/* #undef HAVE_IOV_ITER_COUNT */
+
+/* iov_iter_fault_in_readable() is available */
+/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */
+
+/* iov_iter_revert() is available */
+/* #undef HAVE_IOV_ITER_REVERT */
+
+/* iov_iter_type() is available */
+/* #undef HAVE_IOV_ITER_TYPE */
+
+/* iov_iter types are available */
+/* #undef HAVE_IOV_ITER_TYPES */
+
+/* yes */
+/* #undef HAVE_IO_SCHEDULE_TIMEOUT */
+
+/* Define to 1 if you have the `issetugid' function. */
+#define HAVE_ISSETUGID 1
+
+/* kernel has kernel_fpu_* functions */
+/* #undef HAVE_KERNEL_FPU */
+
+/* kernel has asm/fpu/api.h */
+/* #undef HAVE_KERNEL_FPU_API_HEADER */
+
+/* kernel fpu internal */
+/* #undef HAVE_KERNEL_FPU_INTERNAL */
+
+/* kernel has asm/fpu/internal.h */
+/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */
+
+/* kernel has asm/fpu/xcr.h */
+/* #undef HAVE_KERNEL_FPU_XCR_HEADER */
+
+/* kernel fpu and XSAVE internal */
+/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */
+
+/* uncached_acl_sentinel() exists */
+/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
+
+/* kernel does stack verification */
+/* #undef HAVE_KERNEL_OBJTOOL */
+
+/* kernel has linux/objtool.h */
+/* #undef HAVE_KERNEL_OBJTOOL_HEADER */
+
+/* kernel_read() take loff_t pointer */
+/* #undef HAVE_KERNEL_READ_PPOS */
+
+/* timer_list.function gets a timer_list */
+/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */
+
+/* struct timer_list has a flags member */
+/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */
+
+/* timer_setup() is available */
+/* #undef HAVE_KERNEL_TIMER_SETUP */
+
+/* kernel_write() take loff_t pointer */
+/* #undef HAVE_KERNEL_WRITE_PPOS */
+
+/* kmem_cache_create_usercopy() exists */
+/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */
+
+/* kstrtoul() exists */
+/* #undef HAVE_KSTRTOUL */
+
+/* ktime_get_coarse_real_ts64() exists */
+/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */
+
+/* ktime_get_raw_ts64() exists */
+/* #undef HAVE_KTIME_GET_RAW_TS64 */
+
+/* kvmalloc exists */
+/* #undef HAVE_KVMALLOC */
+
+/* Define if you have [aio] */
+/* #undef HAVE_LIBAIO */
+
+/* Define if you have [blkid] */
+/* #undef HAVE_LIBBLKID */
+
+/* Define if you have [crypto] */
+#define HAVE_LIBCRYPTO 1
+
+/* Define if you have [tirpc] */
+/* #undef HAVE_LIBTIRPC */
+
+/* Define if you have [udev] */
+/* #undef HAVE_LIBUDEV */
+
+/* Define if you have [uuid] */
+/* #undef HAVE_LIBUUID */
+
+/* linux/blk-cgroup.h exists */
+/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */
+
+/* lseek_execute() is available */
+/* #undef HAVE_LSEEK_EXECUTE */
+
+/* makedev() is declared in sys/mkdev.h */
+/* #undef HAVE_MAKEDEV_IN_MKDEV */
+
+/* makedev() is declared in sys/sysmacros.h */
+/* #undef HAVE_MAKEDEV_IN_SYSMACROS */
+
+/* Noting that make_request_fn() returns blk_qc_t */
+/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */
+
+/* Noting that make_request_fn() returns void */
+/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */
+
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-
+/* iops->mkdir() takes umode_t */
+/* #undef HAVE_MKDIR_UMODE_T */
+
+/* Define to 1 if you have the `mlockall' function. */
+#define HAVE_MLOCKALL 1
+
+/* lookup_bdev() wants mode arg */
+/* #undef HAVE_MODE_LOOKUP_BDEV */
+
+/* Define if host toolchain supports MOVBE */
+#define HAVE_MOVBE 1
+
+/* new_sync_read()/new_sync_write() are available */
+/* #undef HAVE_NEW_SYNC_READ */
+
+/* folio_wait_bit() exists */
+/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */
+
+/* iops->getattr() takes a path */
+/* #undef HAVE_PATH_IOPS_GETATTR */
+
+/* Define if host toolchain supports PCLMULQDQ */
+#define HAVE_PCLMULQDQ 1
+
+/* percpu_counter_add_batch() is defined */
+/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */
+
+/* percpu_counter_init() wants gfp_t */
*** 451 LINES SKIPPED ***