git: 29b24020f6fa - main - zfs: merge openzfs/zfs@013c77e66

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Thu, 12 Nov 2026 10:29:13 UTC
The branch main has been updated by mm:

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

commit 29b24020f6fa24bcd47a156f424bee8b5db869b9
Merge: 1ebf46ecb627 013c77e66e37
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-11-12 10:27:12 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-11-12 10:27:12 +0000

    zfs: merge openzfs/zfs@013c77e66
    
    Notable upstream pull request merges:
     #17567 816804dfd Add support for anyraid vdevsG
     #18826 -multiple FDT: don't extend dedup across RAIDZ expansion
     #18861 1ff8fc14a Fix out-of-bound access when resizing in receive_spill
     #19026 518021947 Add alloc factor logic
     #19091 e056f4df3 don't send spill or oversized blocks as WRITE_EMBEDDED
     #19125 6d5d3f635 Wait for the txg-time database write before setting
                      spa_final_txg
     #19170 b060bcb1d zio: drop a queued scan read only when its block is freed
     #19171 3db7dde41 dsl_scan: resume a scan which suspends at the origin
                      snapshot
     #19178 497f28f07 vdev_raidz: keep unverified dRAID rebuild repairs
                      speculative
     #19188 5f1957a15 spa: number new txgs above every uberblock on disk
     #19190 495d09b51 Export zpool_valid_proplist from libzfs
     #19191 ed07ad74e zdb: Lower eviction timeouts on prefetched data
     #19192 86b3fb1f4 Build the pool stats config without the namespace lock
     #19198 a9418818b vdev_rebuild: wait for the syncing txg before rebuilding
                      a metaslab
     #19204 a8ea85249 userspace: remove makedev detection and cleanup headers
     #19206 -multiple spl: remove unused headers
     #19208 f239ea947 Walk snapshot names without holding the objset in
                      list-next ioctl
     #19211 7e556b324 dmu_send: don't send uncompressed ARC data as compressed
     #19212 79b0e2126 zpool: don't print a huge duration when a scan ends
                      before it started
     #19213 d72c45490 libzutil: fix the udev_device_get_is_initialized() config
                      check
     #19216 c97a5a4c2 Clone sparse files in time proportional to their data
     #19217 5e35770b3 Allow cloning a file's tail block past the destination's
                      EOF
     #19218 -multiple Do not hang on a suspended pool in four more waits
     #19222 -multiple vdev_prop_get: report real vdev fragmentation
     #19223 000b4c46d ddt: prune only entries unchanged since the prune walk
     #19227 -multiple libzfs: support refreservation=auto in zfs_create()
     #19228 7f838b8fb libzfs: fix a double free of the btree leaf cache
     #19229 88da095a2 Fix a deadlock between zvol first open and pool export
     #19231 -multiple zfs_file: hide zfs_file_t internals
     #19234 f1f96f5e7 dbuf: restore BP_IS_HOLE() recheck after
                      dnode_block_freed()
     #19236 954472f2d dsl_crypt: say when change-key finds a key it cannot
                      unwrap
     #19250 -multiple Remove userspace umem shim; use kmem_* everywhere
     #19253 e9e24ce2c ZIL: avoid deadlock in xattr owner check
     #19261 7d3e648d5 Allow quota to be changed even when over quota
     #19264 7391add65 ddt: don't prune every unique entry for a target below
                      one entry
     #19267 64c061e33 Zero the last page past EOF when extending a file
     #19268 269d147bb FreeBSD: do not clear dirty bits outside a sub-block
                      write
     #19271 e61fe2571 Open only the named pool when zpool checks a pool name
     #19272 5f68a22f0 Skip the second duplicate search when adding to an nvlist
     #19274 c0688a275 ZIL replay of an indirect write leaks later writes in the
     #19278 -multiple vdev_removal: don't remove a mirror with a child still
                      resilvering
     #19279 100f0e001 raidz: refuse too small replacements during expansion
     #19281 a99330d3e dmu_recv: fix corrective recv of zstd compressed blocks
     #19288 21a89645f zpool: compare special and dedup vdevs only with normal
                      vdevs
     #19292 c7921a82b libzfs: reject malformed numeric ids in userquota props
     #19293 7d534ee08 zpool: fix 'zpool status' error count and list output
     #19297 44efa5044 zoned_uid: print as integer, reject out-of-range uidS
     #19298 23cef4390 zfs: reject 'bookmark -r' to a dataset other than the
                      source's
     #19301 186bf8c93 ddt: fix NULL bp dereference in ddt_repair_entry_done()
     #19304 183ab72c3 spa: make the normal class the last allocation fallback
     #19308 -multiple libzfs: don't abort when a recv target's origin is
                      outside the tree
     #19309 b3e4cf0c8 libzfs: don't require keylocation when receiving an
                      encryption root
     #19310 7eae9e89c dsl_crypt: only expect an IVset guid on snapshots
     #19312 a78337a9d metaslab: use the physical birth to decide checkpointed frees
     #19314 f61e0291a zio: find large gang headers while the pool is loading
     #19315 23feecbbc zfs_ioctl: allow read-only channel programs on read-only
                      pools
     #19316 8b11b983c libzutil: prefer devices of the same pool when fixing up
                      paths
     #19319 -multiple zvol: leave alone a minor that is being removed
     #19320 -multiple ZIL: zero the header bp in zil_crash() only if lwbs own
                      it
     #19322 ae4deb34b Exempt the usage ZAPs from FREE_RANGE_VERIFY() in syncing
                      context
     #19323 f7c15333a dmu_recv: keep rrd->abd current in do_corrective_recv()
     #19325 -multiple metaslab: don't modify ms_weight when verifying it
     #19326 -multiple zap: don't use a stale ptrtbl shift in zap_shrink()
     #19329 9699602a0 ZIL: Sync the txg that a suspended commit waits for
     #19332 -multiple vdev_removal: don't hold ms_lock while loading a space map
     #19337 0080dc9c4 Don't hold spa_errlist_lock while resolving errors
     #19343 9d6e2cc70 Do not refill a plain ARC buf when authenticating it
     #19346 602c474a2 Report EIO when no vdev can take a Direct I/O write
     #19351 9e8e7a964 metaslab: don't gang every block on a degraded
                      single-disk vdev
     #19353 1a0a83b03 spa: don't self-heal while loading an older txg
     #19355 0606e0dcc Build the vdev config in place instead of copying it
     #19356 7c3d85aaf ZIL replay can apply part of a split WR_NEED_COPY write
     #19365 7c546ef8e raidz: refuse expansions that the boot area cannot holD
     #19376 5d7c42cfd Add zfs rewrite -W to skip blocks already at their
                      current size
     #19381 daab47652 zio: Remove the priority match assertion when joining
                      a batch
     #19391 22013c391 zio: free the gang header ABD when its read fails
     #19395 21df1e4f7 raidz: resilver every child a block born before an
                      expansion spans
     #19398 b31984ce4 Find the dataset of a renamed volume by its object number
     #19399 b1f55c3ef vdev_mirror: scrub every copy of a gang block in a sorted
                      scrub
     #19400 83f7e0e8d Translate initialize and TRIM ranges under the config lock
     #19402 cd1b094b2 Accept the dedup NOP of zfs rewrite -P in arc_write_done()
     #19403 15f2b6042 Do not let scrub skip a dedup block its DDT entry does
                      not describe
     #19406 a6fc6209e spl: avoid reclaim for speculative physical allocations
     #19411 48f048c0b icp: record the accelerated GCM hash-table allocation size
     #19414 a6ed3cf31 libspl: split usleep_range() into seconds and nanoseconds
     #19430 b509a677f zvol: remove minors in parallel
     #19433 -multiple raidz: fix scrub repairs during a raidz expansion
     #19440 1e9b428dc raidz: write the scratch uberblocks on non-debug builds
     #19451 -multiple libzpool: fix zfs_file_off() and three zfs_file_* error
                      paths
     #19429 -multiple nvpair: performance optimisations
     #19495 74215dc63 Let zfs rewrite -W skip only blocks that a rewrite would
                      keep
     #19496 e117a84db libzutil: keep the latest label when two vdevs claim one
                      id
     #19503 df0d1bb22 Fix dbuf dirty record traversal locking
     #19506 04586b11f raidz: compute the aggregate copy offset before adding it
     #19508 -multiple libspl/thread: rewrite for kthread semantics and to hide
                      pthread
     #19511 1ad9b782c vdev: atomically account checkpoint space during parallel
                      load
     #19515 4733b98c2 dsl_deadlist_open(): clean up on error
     #19516 dedf1fb18 Fix user accounting after incremental receives into
                      encrypted datasets
     #19518 -multiple libspl: cleanup atomics
     #19520 061dd8a13 zoned_uid: check rename destination permissions
     #19521 5135029ce zoned_uid: preserve global-only zoning property checksG
     #19538 1ccce6d52 Do not copy stale data from a mirror child in a rebuild
     #19549 7bfe0418f ddt: do not prune an entry that a copies=2 write may have
                      extended
     #19550 c8534b99c raidz: don't lose the expansion wakeup when a resilver
                      ends early
     #19554 dce3650fa recv: check the temporary clone name length
     #19556 dc66d8489 Release the upgrade hold before clearing os_upgrade_id
     #19578 df744acc4 vdev: avoid null member access in statistics updates
     #19588 71563e5e1 Wait for dataset evictions when exporting a read-only pool
     #19590 -multiple raidz: keep the scratch copy when import recovery fails
     #19594 1547ff6bc Return ENODEV from vdev_prop_get/set for a missing vdev
     #19601 9c606af17 Include zfs rewrite -P blocks in raw encrypted sends
     #19602 ba46f0833 Keep the logical birth of dedup blocks in zfs rewrite -P
     #19604 03840dd33 Keep the indirect mapping lookup from wrapping below
                      entry 0
     #19628 66184a0dc L2ARC: Do not stop writing when l2arc_headroom is 0
     #19630 6b84a198e zio: initialize all props of gang children
     #19631 cc0d3dc4e L2ARC: Do not write encrypted buffers whose MAC differs
     #19633 924b8c89c Fix direct reads of blocks pending free
     #19634 cea524bd5 zio_reexecute() keeps the old allocation trace
     #19656 af9553c59 Release the new znode when its ZIL commit fails
     #19698 984e7c165 zpool: reject a dRAID children count of zero
     #19679 -multiple FreeBSD: move SPL stuff out of zfs_context_os.h
     #19693 70cba4665 zap: Fix zap_trunc() to account next ptrtbl blocks
     #19705 c9e0d4c89 raidz: take the reflow range lock when spa_ubsync advances
     #19708 8ad60bab5 zpool: reject empty dRAID failure groups and stray
                      devices
     #19709 fbc758d36 Drop spa_namespace_lock while spa_vdev_exit() waits on a
                      suspended pool
     #19713 ef35f1441 Decrypt when holding an unmounted filesystem's objset
     #19716 7704a886e spa_stats: add "misc" pool stats with suspended & resumed
                      counters
     #19728 -multiple anyraid: write the tile map at the vdev's ashift
     #19743 -multiple Fix some small ZPL nits
     #19744 -multiple ZPL: Wrap various error origins with SET_ERROR()
     #19769 -multiple Aarch64 SIMD build fixes
     #19782 ed3001e94 arc: fix use-after-free in synchronous L2ARC read retry
     #19789 -multiple kstat: fix up some sketchy uses of ks_data
                      (incl use-after-free)
     #19793 -multiple Fix FreeBSD build issues
    
    Obtained from:  OpenZFS
    OpenZFS commit: 013c77e66e37bc2ac54d8e0725e548d90e53d4b6

 cddl/lib/libspl/Makefile                           |    5 +-
 cddl/lib/libzpool/Makefile                         |    1 +
 sys/contrib/openzfs/.editorconfig                  |    2 +-
 .../openzfs/.github/PULL_REQUEST_TEMPLATE.md       |    9 +
 sys/contrib/openzfs/.github/workflows/README.md    |  122 +-
 .../openzfs/.github/workflows/checkstyle.yaml      |   28 +-
 sys/contrib/openzfs/.github/workflows/codeql.yml   |    4 +-
 sys/contrib/openzfs/.github/workflows/labels.yml   |  636 +++++-
 .../.github/workflows/scripts/failfirst-detect.py  |  201 ++
 .../.github/workflows/scripts/failfirst-tests.sh   |  247 +++
 .../.github/workflows/scripts/qemu-1-setup.sh      |    2 +-
 .../.github/workflows/scripts/qemu-2-start.sh      |   33 +-
 .../.github/workflows/scripts/qemu-3-deps-vm.sh    |   43 +-
 .../.github/workflows/scripts/qemu-3-deps.sh       |    3 +
 .../.github/workflows/scripts/qemu-4-build-vm.sh   |   42 +-
 .../.github/workflows/scripts/qemu-6-tests.sh      |    6 +-
 .../workflows/scripts/qemu-9-summary-page.sh       |    1 +
 .../openzfs/.github/workflows/scripts/reuse-ci.py  |  145 ++
 sys/contrib/openzfs/.github/workflows/smatch.yml   |    5 +-
 .../openzfs/.github/workflows/unit-tests.yml       |   32 +-
 sys/contrib/openzfs/.github/workflows/zfs-arm.yml  |   25 +-
 .../openzfs/.github/workflows/zfs-precheck.yml     |  201 ++
 .../.github/workflows/zfs-qemu-packages.yml        |    3 +-
 sys/contrib/openzfs/.github/workflows/zfs-qemu.yml |   83 +-
 sys/contrib/openzfs/.github/workflows/zloop.yml    |   39 +-
 sys/contrib/openzfs/.gitignore                     |    2 +
 sys/contrib/openzfs/.mailmap                       |    3 +-
 sys/contrib/openzfs/AGENTS.md                      |  129 ++
 sys/contrib/openzfs/AUTHORS                        |    2 +-
 sys/contrib/openzfs/CLAUDE.md                      |    1 +
 sys/contrib/openzfs/META                           |    2 +-
 sys/contrib/openzfs/cmd/Makefile.am                |    2 -
 sys/contrib/openzfs/cmd/mount_zfs.c                |   88 +-
 sys/contrib/openzfs/cmd/raidz_test/raidz_test.c    |   18 +-
 sys/contrib/openzfs/cmd/zarcsummary                |    2 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |  704 +++++-
 sys/contrib/openzfs/cmd/zdb/zdb.h                  |    1 +
 sys/contrib/openzfs/cmd/zdb/zdb_il.c               |   17 +-
 sys/contrib/openzfs/cmd/zed/Makefile.am            |    2 +-
 sys/contrib/openzfs/cmd/zed/agents/fmd_api.c       |   24 +-
 sys/contrib/openzfs/cmd/zed/agents/fmd_api.h       |    4 +-
 sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c |    9 +
 sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c    |   66 +-
 sys/contrib/openzfs/cmd/zfs/Makefile.am            |    2 -
 sys/contrib/openzfs/cmd/zfs/zfs_iter.c             |    1 -
 sys/contrib/openzfs/cmd/zfs/zfs_main.c             | 1297 +++++------
 sys/contrib/openzfs/cmd/zfs/zfs_project.c          |   33 +-
 sys/contrib/openzfs/cmd/zfs_ids_to_path.c          |    1 -
 sys/contrib/openzfs/cmd/zhack.c                    |    4 +-
 sys/contrib/openzfs/cmd/zinject/translate.c        |    2 -
 sys/contrib/openzfs/cmd/zpool/Makefile.am          |   28 +-
 .../openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c   |    5 +-
 .../openzfs/cmd/zpool/os/linux/zpool_vdev_os.c     |   17 +-
 sys/contrib/openzfs/cmd/zpool/zpool.d/phy          |   99 +
 sys/contrib/openzfs/cmd/zpool/zpool.d/phy_errors   |    1 +
 .../cmd/zpool/zpool.d/phy_invalid_dword_count      |    1 +
 sys/contrib/openzfs/cmd/zpool/zpool.d/phy_link     |    1 +
 .../cmd/zpool/zpool.d/phy_loss_of_dword_sync_count |    1 +
 .../openzfs/cmd/zpool/zpool.d/phy_maximum_linkrate |    1 +
 .../openzfs/cmd/zpool/zpool.d/phy_minimum_linkrate |    1 +
 sys/contrib/openzfs/cmd/zpool/zpool.d/phy_name     |    1 +
 .../cmd/zpool/zpool.d/phy_negotiated_linkrate      |    1 +
 .../cmd/zpool/zpool.d/phy_reset_problem_count      |    1 +
 .../zpool.d/phy_running_disparity_error_count      |    1 +
 sys/contrib/openzfs/cmd/zpool/zpool.d/phy_topo     |    1 +
 .../openzfs/cmd/zpool/zpool.d/phy_total_errors     |    1 +
 sys/contrib/openzfs/cmd/zpool/zpool_iter.c         |    1 -
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         | 2094 +++++++++---------
 sys/contrib/openzfs/cmd/zpool/zpool_util.c         |    3 +-
 sys/contrib/openzfs/cmd/zpool/zpool_vdev.c         |  396 ++--
 .../openzfs/cmd/zstream/zstream_decompress.c       |    7 +
 sys/contrib/openzfs/cmd/zstream/zstream_io.c       |   22 +-
 sys/contrib/openzfs/cmd/zstream/zstream_queue.c    |    2 +-
 sys/contrib/openzfs/cmd/zstream/zstream_raw.c      |   76 +-
 sys/contrib/openzfs/cmd/zstream/zstream_redup.c    |   10 +-
 .../openzfs/cmd/zstream/zstream_selftest_queue.c   |    2 +-
 sys/contrib/openzfs/cmd/ztest.c                    |  491 +++--
 .../openzfs/config/always-compiler-options.m4      |   10 +-
 sys/contrib/openzfs/config/config.rpath            |  684 ------
 sys/contrib/openzfs/config/gettext.m4              |  387 ----
 sys/contrib/openzfs/config/host-cpu-c-abi.m4       |  645 ------
 sys/contrib/openzfs/config/iconv.m4                |  288 ---
 sys/contrib/openzfs/config/kernel-crypto.m4        |  125 ++
 sys/contrib/openzfs/config/kernel-fpu.m4           |   70 +-
 sys/contrib/openzfs/config/kernel-get-disk-ro.m4   |   21 -
 .../openzfs/config/kernel-make-request-fn.m4       |   21 +
 sys/contrib/openzfs/config/kernel.m4               |    4 +-
 sys/contrib/openzfs/config/lib-ld.m4               |  169 --
 sys/contrib/openzfs/config/lib-link.m4             |  775 -------
 sys/contrib/openzfs/config/lib-prefix.m4           |  249 ---
 sys/contrib/openzfs/config/nls.m4                  |   33 -
 sys/contrib/openzfs/config/po.m4                   |  451 ----
 sys/contrib/openzfs/config/progtest.m4             |   92 -
 sys/contrib/openzfs/config/rpm.am                  |   16 +-
 sys/contrib/openzfs/config/user-atomic.m4          |   41 +
 sys/contrib/openzfs/config/user-gettext.m4         |    7 -
 sys/contrib/openzfs/config/user-libatomic.m4       |   29 -
 sys/contrib/openzfs/config/user-makedev.m4         |   38 -
 sys/contrib/openzfs/config/user.m4                 |    6 +-
 sys/contrib/openzfs/config/zfs-build.m4            |   19 +-
 sys/contrib/openzfs/contrib/coverity/model.c       |   34 +-
 sys/contrib/openzfs/contrib/debian/not-installed   |    1 +
 .../contrib/debian/openzfs-zfsutils.examples       |    1 +
 .../contrib/dracut/90zfs/module-setup.sh.in        |    4 +-
 .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c      |    2 +-
 .../contrib/pyzfs/libzfs_core/_constants.py        |    2 +
 .../pyzfs/libzfs_core/test/test_libzfs_core.py     |   30 +-
 sys/contrib/openzfs/etc/Makefile.am                |    1 +
 .../etc/zfs/vdev_id.conf.sas_expander.example      |    7 +
 sys/contrib/openzfs/include/Makefile.am            |    2 +
 sys/contrib/openzfs/include/libzfs.h               |    8 +
 sys/contrib/openzfs/include/os/freebsd/Makefile.am |    5 +-
 .../openzfs/include/os/freebsd/spl/sys/cmn_err.h   |    2 +
 .../openzfs/include/os/freebsd/spl/sys/inttypes.h  |    1 -
 .../openzfs/include/os/freebsd/spl/sys/isa_defs.h  |   31 -
 .../openzfs/include/os/freebsd/spl/sys/kmem.h      |    4 +
 .../openzfs/include/os/freebsd/spl/sys/misc.h      |    6 +-
 .../openzfs/include/os/freebsd/spl/sys/mode.h      |    1 -
 .../openzfs/include/os/freebsd/spl/sys/proc.h      |    1 +
 .../openzfs/include/os/freebsd/spl/sys/simd.h      |    9 +-
 .../include/os/freebsd/spl/sys/simd_aarch64.h      |    6 +-
 .../openzfs/include/os/freebsd/spl/sys/simd_arm.h  |    4 +-
 .../include/os/freebsd/spl/sys/simd_powerpc.h      |    6 +-
 .../openzfs/include/os/freebsd/spl/sys/simd_x86.h  |    6 +-
 .../openzfs/include/os/freebsd/spl/sys/time.h      |    4 +-
 .../include/os/freebsd/spl/sys/{lock.h => tsd.h}   |   23 +-
 .../openzfs/include/os/freebsd/spl/sys/uio.h       |    8 +-
 .../openzfs/include/os/freebsd/spl/sys/uuid.h      |   89 -
 .../include/os/freebsd/zfs/sys/zfs_context_os.h    |   31 -
 .../include/os/freebsd/zfs/sys/zfs_znode_impl.h    |    3 +
 sys/contrib/openzfs/include/os/linux/Makefile.am   |    5 +-
 .../include/os/linux/kernel/linux/blkdev_compat.h  |    8 +
 .../openzfs/include/os/linux/kernel/linux/simd.h   |    8 +-
 .../include/os/linux/kernel/linux/simd_aarch64.h   |   59 +-
 .../include/os/linux/kernel/linux/simd_arm.h       |   21 +-
 .../include/os/linux/kernel/linux/simd_powerpc.h   |   19 +-
 .../include/os/linux/kernel/linux/simd_x86.h       |   27 +-
 .../openzfs/include/os/linux/spl/sys/callo.h       |   52 -
 .../openzfs/include/os/linux/spl/sys/condvar.h     |    5 +-
 .../openzfs/include/os/linux/spl/sys/inttypes.h    |   28 -
 .../openzfs/include/os/linux/spl/sys/isa_defs.h    |    6 -
 .../openzfs/include/os/linux/spl/sys/taskq.h       |    1 -
 .../openzfs/include/os/linux/spl/sys/trace_spl.h   |   21 -
 sys/contrib/openzfs/include/os/linux/spl/sys/uio.h |    8 +-
 .../openzfs/include/os/linux/spl/sys/user.h        |   42 -
 .../openzfs/include/os/linux/spl/sys/vnode.h       |    1 -
 .../openzfs/include/os/linux/spl/sys/wait.h        |   31 -
 .../include/os/linux/zfs/sys/zfs_vnops_os.h        |    1 +
 .../include/os/linux/zfs/sys/zfs_znode_impl.h      |    3 +
 .../include/os/linux/zfs/sys/zio_crypt_os.h        |   10 +-
 .../os/linux/zfs/sys/zio_crypt_os_kcapi.h}         |   24 +-
 sys/contrib/openzfs/include/sys/arc_impl.h         |    3 +
 sys/contrib/openzfs/include/sys/dbuf.h             |   14 +-
 sys/contrib/openzfs/include/sys/ddt.h              |    9 +-
 sys/contrib/openzfs/include/sys/dmu.h              |    4 +-
 sys/contrib/openzfs/include/sys/dmu_impl.h         |   20 +-
 sys/contrib/openzfs/include/sys/dmu_recv.h         |    1 -
 sys/contrib/openzfs/include/sys/dmu_send.h         |    1 -
 sys/contrib/openzfs/include/sys/dmu_tx.h           |    1 -
 sys/contrib/openzfs/include/sys/dnode.h            |   15 +-
 sys/contrib/openzfs/include/sys/dsl_dataset.h      |    2 +
 sys/contrib/openzfs/include/sys/fs/zfs.h           |   11 +
 sys/contrib/openzfs/include/sys/metaslab.h         |    3 +
 sys/contrib/openzfs/include/sys/metaslab_impl.h    |    2 +
 sys/contrib/openzfs/include/sys/nvpair_impl.h      |    6 +
 sys/contrib/openzfs/include/sys/rrwlock.h          |    1 -
 sys/contrib/openzfs/include/sys/spa.h              |   14 +
 sys/contrib/openzfs/include/sys/spa_impl.h         |    2 +
 sys/contrib/openzfs/include/sys/vdev.h             |   13 +-
 sys/contrib/openzfs/include/sys/vdev_anyraid.h     |  308 +++
 sys/contrib/openzfs/include/sys/vdev_impl.h        |   15 +-
 sys/contrib/openzfs/include/sys/vdev_mirror.h      |   68 +
 sys/contrib/openzfs/include/sys/vdev_raidz.h       |    8 +-
 sys/contrib/openzfs/include/sys/vdev_raidz_impl.h  |    1 +
 sys/contrib/openzfs/include/sys/zfs_context.h      |    4 +-
 sys/contrib/openzfs/include/sys/zfs_file.h         |   11 +-
 sys/contrib/openzfs/include/sys/zfs_refcount.h     |    1 -
 sys/contrib/openzfs/include/sys/zil.h              |   28 +-
 sys/contrib/openzfs/include/sys/zil_impl.h         |    3 +
 sys/contrib/openzfs/include/sys/zio.h              |   52 +-
 sys/contrib/openzfs/include/sys/zio_checksum.h     |    4 +-
 sys/contrib/openzfs/include/sys/zvol_impl.h        |    1 +
 sys/contrib/openzfs/include/zfeature_common.h      |    2 +-
 sys/contrib/openzfs/include/zfs_fletcher.h         |   11 +
 sys/contrib/openzfs/lib/libefi/rdwr_efi.c          |   86 +-
 sys/contrib/openzfs/lib/libnvpair/Makefile.am      |    4 +-
 sys/contrib/openzfs/lib/libnvpair/libnvpair.abi    | 2302 ++++++++++++++++++--
 sys/contrib/openzfs/lib/libnvpair/libnvpair.c      |    2 -
 sys/contrib/openzfs/lib/libspl/Makefile.am         |    4 +-
 sys/contrib/openzfs/lib/libspl/atomic.c            |  362 ---
 sys/contrib/openzfs/lib/libspl/backtrace.c         |   34 +-
 sys/contrib/openzfs/lib/libspl/condvar.c           |   12 +-
 sys/contrib/openzfs/lib/libspl/include/Makefile.am |   19 +-
 sys/contrib/openzfs/lib/libspl/include/atomic.h    |  337 ---
 .../openzfs/lib/libspl/include/sys/atomic.h        |  529 +++++
 .../openzfs/lib/libspl/include/sys/cmn_err.h       |    2 +-
 sys/contrib/openzfs/lib/libspl/include/sys/dkio.h  |  474 ----
 .../openzfs/lib/libspl/include/sys/dklabel.h       |  257 ---
 .../openzfs/lib/libspl/include/sys/dktp/fdisk.h    |  164 --
 .../openzfs/lib/libspl/include/sys/isa_defs.h      |   14 -
 sys/contrib/openzfs/lib/libspl/include/sys/kmem.h  |   60 +-
 .../openzfs/lib/libspl/include/sys/kmem_cache.h    |   72 +
 sys/contrib/openzfs/lib/libspl/include/sys/mhd.h   |  149 --
 sys/contrib/openzfs/lib/libspl/include/sys/mkdev.h |   20 -
 sys/contrib/openzfs/lib/libspl/include/sys/mutex.h |    5 +-
 sys/contrib/openzfs/lib/libspl/include/sys/poll.h  |   31 -
 sys/contrib/openzfs/lib/libspl/include/sys/priv.h  |   20 -
 .../openzfs/lib/libspl/include/sys/rwlock.h        |    5 +-
 sys/contrib/openzfs/lib/libspl/include/sys/simd.h  |   25 +-
 sys/contrib/openzfs/lib/libspl/include/sys/stack.h |   65 -
 .../openzfs/lib/libspl/include/sys/sysmacros.h     |   16 +-
 .../openzfs/lib/libspl/include/sys/thread.h        |   20 +-
 sys/contrib/openzfs/lib/libspl/include/sys/timer.h |    5 +-
 sys/contrib/openzfs/lib/libspl/include/sys/types.h |   12 +-
 .../openzfs/lib/libspl/include/sys/types32.h       |    2 -
 sys/contrib/openzfs/lib/libspl/include/sys/vmem.h  |   33 +
 sys/contrib/openzfs/lib/libspl/include/umem.h      |  221 --
 sys/contrib/openzfs/lib/libspl/kmem.c              |   95 +-
 sys/contrib/openzfs/lib/libspl/kmem_cache.c        |  106 +
 sys/contrib/openzfs/lib/libspl/mutex.c             |   10 +-
 sys/contrib/openzfs/lib/libspl/rwlock.c            |   10 +-
 sys/contrib/openzfs/lib/libspl/sid.c               |    8 +-
 sys/contrib/openzfs/lib/libspl/taskq.c             |    3 +
 sys/contrib/openzfs/lib/libspl/thread.c            |  365 +++-
 sys/contrib/openzfs/lib/libzfs/Makefile.am         |    2 +-
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          | 1209 +++++-----
 sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c |    1 -
 sys/contrib/openzfs/lib/libzfs/libzfs_config.c     |    5 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c     |  315 +--
 sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c    |  650 +++---
 sys/contrib/openzfs/lib/libzfs/libzfs_diff.c       |   48 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_import.c     |    1 -
 sys/contrib/openzfs/lib/libzfs/libzfs_iter.c       |   10 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_mount.c      |   49 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |  898 ++++----
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |  616 +++---
 sys/contrib/openzfs/lib/libzfs/libzfs_share.c      |   75 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |  556 ++---
 .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c  |   29 +-
 .../lib/libzfs/os/freebsd/libzfs_share_nfs.c       |    1 -
 .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c  |    9 +-
 .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c   |   35 +-
 .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c   |   51 +-
 sys/contrib/openzfs/lib/libzfs_core/Makefile.am    |    2 -
 .../openzfs/lib/libzfs_core/libzfs_core.abi        |  761 +++----
 sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c  |   12 +-
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |    1 +
 sys/contrib/openzfs/lib/libzpool/abd_os.c          |   16 +-
 sys/contrib/openzfs/lib/libzpool/kernel.c          |   16 +-
 sys/contrib/openzfs/lib/libzpool/util.c            |   16 +-
 sys/contrib/openzfs/lib/libzpool/zfs_debug.c       |    4 +-
 sys/contrib/openzfs/lib/libzpool/zfs_file_os.c     |   92 +-
 .../lib/libzutil/os/freebsd/zutil_import_os.c      |    2 -
 .../lib/libzutil/os/linux/zutil_import_os.c        |    4 +-
 sys/contrib/openzfs/lib/libzutil/zutil_import.c    |  228 +-
 sys/contrib/openzfs/lib/libzutil/zutil_pool.c      |    1 +
 sys/contrib/openzfs/man/man1/test-runner.1         |   20 +-
 sys/contrib/openzfs/man/man4/zfs.4                 |   45 +-
 sys/contrib/openzfs/man/man5/vdev_id.conf.5        |   19 +-
 sys/contrib/openzfs/man/man7/vdevprops.7           |   15 +
 sys/contrib/openzfs/man/man7/zfsprops.7            |   30 +-
 sys/contrib/openzfs/man/man7/zpoolconcepts.7       |   36 +
 sys/contrib/openzfs/man/man8/vdev_id.8             |    8 +-
 sys/contrib/openzfs/man/man8/zdb.8                 |   13 +-
 sys/contrib/openzfs/man/man8/zfs-bookmark.8        |   15 +-
 sys/contrib/openzfs/man/man8/zfs-program.8         |    3 +
 sys/contrib/openzfs/man/man8/zfs-rewrite.8         |   49 +-
 sys/contrib/openzfs/man/man8/zpool-attach.8        |   10 +-
 sys/contrib/openzfs/man/man8/zpool-create.8        |   10 +-
 sys/contrib/openzfs/man/man8/zpool-ddtprune.8      |    8 +-
 sys/contrib/openzfs/man/man8/zpool-events.8        |    8 +-
 sys/contrib/openzfs/module/Kbuild.in               |    7 +-
 sys/contrib/openzfs/module/Makefile.bsd            |    1 +
 sys/contrib/openzfs/module/Makefile.in             |    6 +-
 .../openzfs/module/icp/algs/aes/aes_impl_aesni.c   |   18 +-
 .../openzfs/module/icp/algs/aes/aes_modes.c        |    3 +-
 .../openzfs/module/icp/algs/blake3/blake3_impl.c   |   60 +-
 sys/contrib/openzfs/module/icp/algs/modes/gcm.c    |   48 +-
 .../openzfs/module/icp/algs/modes/gcm_pclmulqdq.c  |    6 +-
 .../openzfs/module/icp/algs/sha2/sha256_impl.c     |    2 +-
 .../openzfs/module/icp/algs/sha2/sha512_impl.c     |    2 +-
 sys/contrib/openzfs/module/nvpair/fnvpair.c        |   87 +-
 sys/contrib/openzfs/module/nvpair/nvpair.c         |  154 +-
 .../openzfs/module/os/freebsd/spl/spl_kstat.c      |    9 +-
 .../openzfs/module/os/freebsd/spl/spl_taskq.c      |    1 +
 .../openzfs/module/os/freebsd/zfs/kmod_core.c      |    1 +
 .../openzfs/module/os/freebsd/zfs/sysctl_os.c      |    2 +
 .../openzfs/module/os/freebsd/zfs/vdev_geom.c      |    2 +
 .../openzfs/module/os/freebsd/zfs/zfs_debug.c      |    4 +-
 .../openzfs/module/os/freebsd/zfs/zfs_dir.c        |    6 +-
 .../openzfs/module/os/freebsd/zfs/zfs_file_os.c    |   48 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c     |    6 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   |   40 +-
 .../openzfs/module/os/freebsd/zfs/zfs_znode_os.c   |   73 +-
 .../openzfs/module/os/freebsd/zfs/zio_crypt_os.c   |    3 +-
 .../openzfs/module/os/freebsd/zfs/zvol_os.c        |    9 +-
 .../openzfs/module/os/linux/spl/spl-kmem-cache.c   |   16 +-
 sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c |   34 +-
 .../openzfs/module/os/linux/spl/spl-taskq.c        |    5 +-
 .../openzfs/module/os/linux/zfs/vdev_disk.c        |    1 +
 .../openzfs/module/os/linux/zfs/zfs_file_os.c      |   75 +-
 sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c  |    6 +-
 .../openzfs/module/os/linux/zfs/zfs_vfsops.c       |   67 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     |  129 +-
 .../openzfs/module/os/linux/zfs/zfs_znode_os.c     |  108 +-
 .../module/os/linux/zfs/zio_crypt_os_kcapi.c       |  441 ++++
 .../openzfs/module/os/linux/zfs/zpl_ctldir.c       |   98 +-
 sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c |   88 +-
 .../openzfs/module/os/linux/zfs/zpl_inode.c        |   53 +-
 .../openzfs/module/os/linux/zfs/zpl_super.c        |    3 +-
 sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c  |   86 +-
 sys/contrib/openzfs/module/zcommon/simd_stat.c     |    5 +
 .../openzfs/module/zcommon/zfeature_common.c       |    5 +-
 sys/contrib/openzfs/module/zcommon/zfs_fletcher.c  |   28 +-
 sys/contrib/openzfs/module/zcommon/zfs_namecheck.c |    4 +-
 sys/contrib/openzfs/module/zcommon/zfs_valstr.c    |    9 +-
 sys/contrib/openzfs/module/zcommon/zpool_prop.c    |    9 +
 sys/contrib/openzfs/module/zfs/arc.c               |   55 +-
 sys/contrib/openzfs/module/zfs/bpobj.c             |    2 +-
 sys/contrib/openzfs/module/zfs/dataset_kstats.c    |   27 +-
 sys/contrib/openzfs/module/zfs/dbuf.c              |  160 +-
 sys/contrib/openzfs/module/zfs/dbuf_stats.c        |    9 +-
 sys/contrib/openzfs/module/zfs/ddt.c               |  110 +-
 sys/contrib/openzfs/module/zfs/dmu.c               |  130 +-
 sys/contrib/openzfs/module/zfs/dmu_direct.c        |   82 +-
 sys/contrib/openzfs/module/zfs/dmu_objset.c        |   83 +-
 sys/contrib/openzfs/module/zfs/dmu_recv.c          |  250 ++-
 sys/contrib/openzfs/module/zfs/dmu_send.c          |   41 +-
 sys/contrib/openzfs/module/zfs/dmu_traverse.c      |    5 +
 sys/contrib/openzfs/module/zfs/dmu_tx.c            |   19 +-
 sys/contrib/openzfs/module/zfs/dnode.c             |    9 +-
 sys/contrib/openzfs/module/zfs/dnode_sync.c        |   35 +-
 sys/contrib/openzfs/module/zfs/dsl_bookmark.c      |    2 +-
 sys/contrib/openzfs/module/zfs/dsl_crypt.c         |   42 +-
 sys/contrib/openzfs/module/zfs/dsl_dataset.c       |   48 +
 sys/contrib/openzfs/module/zfs/dsl_deadlist.c      |   23 +-
 sys/contrib/openzfs/module/zfs/dsl_dir.c           |    5 +-
 sys/contrib/openzfs/module/zfs/dsl_scan.c          |    9 +-
 sys/contrib/openzfs/module/zfs/metaslab.c          |  225 +-
 sys/contrib/openzfs/module/zfs/rrwlock.c           |    1 +
 sys/contrib/openzfs/module/zfs/sa.c                |    2 +-
 sys/contrib/openzfs/module/zfs/spa.c               |  267 ++-
 sys/contrib/openzfs/module/zfs/spa_checkpoint.c    |    3 +-
 sys/contrib/openzfs/module/zfs/spa_config.c        |    5 +-
 sys/contrib/openzfs/module/zfs/spa_errlog.c        |   74 +-
 sys/contrib/openzfs/module/zfs/spa_misc.c          |  283 ++-
 sys/contrib/openzfs/module/zfs/spa_stats.c         |  132 +-
 sys/contrib/openzfs/module/zfs/vdev.c              |  177 +-
 sys/contrib/openzfs/module/zfs/vdev_anyraid.c      | 1773 +++++++++++++++
 sys/contrib/openzfs/module/zfs/vdev_draid.c        |   30 +-
 sys/contrib/openzfs/module/zfs/vdev_file.c         |    1 +
 sys/contrib/openzfs/module/zfs/vdev_indirect.c     |    3 +-
 .../openzfs/module/zfs/vdev_indirect_mapping.c     |  101 +-
 sys/contrib/openzfs/module/zfs/vdev_initialize.c   |   13 +
 sys/contrib/openzfs/module/zfs/vdev_label.c        |  153 +-
 sys/contrib/openzfs/module/zfs/vdev_mirror.c       |  114 +-
 sys/contrib/openzfs/module/zfs/vdev_missing.c      |    2 +
 sys/contrib/openzfs/module/zfs/vdev_queue.c        |    3 +-
 sys/contrib/openzfs/module/zfs/vdev_raidz.c        |  376 +++-
 sys/contrib/openzfs/module/zfs/vdev_raidz_math.c   |    1 -
 .../zfs/vdev_raidz_math_aarch64_neon_common.h      |    4 +-
 .../openzfs/module/zfs/vdev_raidz_math_avx2.c      |    6 +-
 .../openzfs/module/zfs/vdev_raidz_math_avx512bw.c  |    4 +-
 .../openzfs/module/zfs/vdev_raidz_math_avx512f.c   |    4 +-
 .../openzfs/module/zfs/vdev_raidz_math_impl.h      |   51 +-
 .../zfs/vdev_raidz_math_powerpc_altivec_common.h   |    4 +-
 .../openzfs/module/zfs/vdev_raidz_math_scalar.c    |    5 +-
 .../openzfs/module/zfs/vdev_raidz_math_sse2.c      |    4 +-
 .../openzfs/module/zfs/vdev_raidz_math_ssse3.c     |    4 +-
 sys/contrib/openzfs/module/zfs/vdev_rebuild.c      |   25 +-
 sys/contrib/openzfs/module/zfs/vdev_removal.c      |   49 +-
 sys/contrib/openzfs/module/zfs/vdev_root.c         |    1 +
 sys/contrib/openzfs/module/zfs/vdev_trim.c         |   14 +-
 sys/contrib/openzfs/module/zfs/zap_fat.c           |   77 +-
 sys/contrib/openzfs/module/zfs/zfeature.c          |    9 +
 sys/contrib/openzfs/module/zfs/zfs_chksum.c        |    1 -
 sys/contrib/openzfs/module/zfs/zfs_ioctl.c         |  159 +-
 sys/contrib/openzfs/module/zfs/zfs_log.c           |   42 +-
 sys/contrib/openzfs/module/zfs/zfs_quota.c         |    4 +
 sys/contrib/openzfs/module/zfs/zfs_replay.c        |   59 +-
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |  121 +-
 sys/contrib/openzfs/module/zfs/zil.c               |  474 +++-
 sys/contrib/openzfs/module/zfs/zio.c               |  229 +-
 sys/contrib/openzfs/module/zfs/zio_checksum.c      |   47 +-
 sys/contrib/openzfs/module/zfs/zio_crypt_os_icp.c  |    3 +-
 sys/contrib/openzfs/module/zfs/zio_inject.c        |   73 +-
 sys/contrib/openzfs/module/zfs/zvol.c              |  220 +-
 sys/contrib/openzfs/rpm/generic/zfs.spec.in        |    1 +
 sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in    |    1 +
 sys/contrib/openzfs/scripts/Makefile.am            |    2 +
 sys/contrib/openzfs/scripts/cstyle.pl              |   21 +-
 sys/contrib/openzfs/scripts/kmodtool               |  239 +-
 sys/contrib/openzfs/scripts/make-testdb.sh         |  127 ++
 sys/contrib/openzfs/scripts/spdxcheck.pl           |    5 +-
 sys/contrib/openzfs/scripts/zfs-tests.sh           |  169 +-
 sys/contrib/openzfs/scripts/zloop.sh               |   41 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |  154 +-
 sys/contrib/openzfs/tests/runfiles/linux.run       |   30 +-
 sys/contrib/openzfs/tests/runfiles/sanity.run      |   17 +-
 .../tests/test-runner/bin/test-runner.py.in        |  130 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |   78 +-
 .../openzfs/tests/test-runner/include/logapi.shlib |    7 +
 sys/contrib/openzfs/tests/unit/.gitignore          |    5 +
 sys/contrib/openzfs/tests/unit/Makefile.am         |   78 +-
 sys/contrib/openzfs/tests/unit/README.md           |    9 +-
 sys/contrib/openzfs/tests/unit/test_backtrace.c    |   99 +
 sys/contrib/openzfs/tests/unit/test_btree.c        |   12 +-
 .../openzfs/tests/unit/test_indirect_mapping.c     |  232 ++
 sys/contrib/openzfs/tests/unit/test_nvpair.c       |  879 ++++++--
 .../openzfs/tests/unit/test_nvpair_stress.c        |  486 +++++
 sys/contrib/openzfs/tests/unit/test_sha2.c         |    1 +
 sys/contrib/openzfs/tests/unit/test_timer.c        |  107 +
 sys/contrib/openzfs/tests/unit/test_zap.c          |   17 +-
 sys/contrib/openzfs/tests/unit/test_zfs_file.c     |  433 ++++
 sys/contrib/openzfs/tests/unit/unit.h              |    6 +
 .../tests/zfs-tests/callbacks/zfs_failsafe.ksh     |    6 +
 sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore |    4 +
 .../openzfs/tests/zfs-tests/cmd/Makefile.am        |    6 +-
 .../openzfs/tests/zfs-tests/cmd/btree_test.c       |    2 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/ctime.c    |   28 +-
 .../tests/zfs-tests/cmd/dio_append_fallocate.c     |  202 ++
 .../tests/zfs-tests/cmd/libzfs_input_check.c       |    4 +-
 .../cmd/linux_dos_attributes/dos_attributes.h      |    1 +
 sys/contrib/openzfs/tests/zfs-tests/cmd/mkfile.c   |   49 +-
 .../openzfs/tests/zfs-tests/cmd/mmap_eof_extend.c  |  182 ++
 .../openzfs/tests/zfs-tests/cmd/mmap_ftruncate.c   |    3 +-
 .../openzfs/tests/zfs-tests/cmd/mmap_stale_check.c |  148 ++
 .../openzfs/tests/zfs-tests/cmd/open_by_fid.c      |   80 +
 sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c |   12 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/statx.c    |   29 +-
 .../openzfs/tests/zfs-tests/cmd/zcp_support.c      |    3 +-
 .../openzfs/tests/zfs-tests/include/blkdev.shlib   |   17 +-
 .../openzfs/tests/zfs-tests/include/commands.cfg   |    6 +
 .../openzfs/tests/zfs-tests/include/default.cfg.in |    4 +
 .../openzfs/tests/zfs-tests/include/libtest.shlib  |  117 +-
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |   12 +
 .../openzfs/tests/zfs-tests/tests/Makefile.am      |  126 ++
 .../functional/alloc_class/alloc_class_018_pos.ksh |   82 +
 .../functional/anyraid/anyraid_checkpoint.ksh      |   55 +
 .../anyraid/anyraid_clean_mirror_001_pos.ksh       |   45 +
 .../anyraid/anyraid_clean_mirror_002_pos.ksh       |   56 +
 .../anyraid/anyraid_clean_mirror_003_pos.ksh       |   52 +
 .../anyraid/anyraid_clean_mirror_004_pos.ksh       |   46 +
 .../tests/functional/anyraid/anyraid_common.kshlib |   88 +
 .../anyraid_faildisk_write_replace_resilver.ksh    |   81 +
 .../functional/anyraid/anyraid_import_ashift.ksh   |   64 +
 .../anyraid_offline_write_online_resilver.ksh      |  118 +
 .../anyraid/anyraid_special_vdev_001_pos.ksh       |   67 +
 .../anyraid/anyraid_special_vdev_002_pos.ksh       |   63 +
 .../functional/anyraid/anyraid_tile_layout.ksh     |   57 +
 .../zfs-tests/tests/functional/anyraid/cleanup.ksh |   24 +
 .../zfs-tests/tests/functional/anyraid/default.cfg |   22 +
 .../zfs-tests/tests/functional/anyraid/setup.ksh   |   26 +
 .../tests/functional/arc/dbufstats_002_pos.ksh     |   16 +-
 .../block_cloning_ficlonerange_tail_past_eof.ksh   |   62 +
 .../block_cloning_replay_indirect.ksh              |  121 +
 .../block_cloning/block_cloning_resilver_free.ksh  |  133 ++
 .../block_cloning_sparse_past_eof.ksh              |  156 ++
 .../zfs-tests/tests/functional/cache/cleanup.ksh   |    2 +-
 .../channel_program/synctask_core/setup.ksh        |    5 +-
 .../synctask_core/tst.readonly_pool.ksh            |   68 +
 .../functional/cli_root/zdb/zdb_il_saxattr.ksh     |   88 +
 .../cli_root/zdb/zdb_object_range_pos.ksh          |   15 +-
 .../cli_root/zdb/zdb_simulated_ddt_errors.ksh      |   88 +
 .../zfs_bookmark/zfs_bookmark_recursive.ksh        |   24 +
 .../zfs_change-key/zfs_change-key_mismatch.ksh     |   14 +-
 .../zfs_change-key/zfs_change-key_pbkdf2iters.ksh  |   13 +-
 .../cli_root/zfs_copies/zfs_copies.kshlib          |    8 +-
 .../cli_root/zfs_create/zfs_create_refreserv.ksh   |   57 +
 .../zfs_clone_livelist_condense_and_disable.ksh    |   26 +-
 .../zfs_destroy_dev_removal_condense.ksh           |    8 +-
 .../cli_root/zfs_get/zfs_get_009_pos.ksh           |    5 +-
 .../cli_root/zfs_load-key/zfs_load-key.cfg         |    3 +-
 .../zfs_load-key/zfs_load-key_common.kshlib        |    5 +-
 .../functional/cli_root/zfs_mount/zfs_mount.kshlib |    1 +
 .../cli_root/zfs_receive/zfs_receive_005_neg.ksh   |   17 +
 .../zfs_receive/zfs_receive_promote_outside.ksh    |   64 +
 .../cli_root/zfs_receive/zfs_receive_raw_-b.ksh    |   62 +
 .../zfs_receive/zfs_receive_zstd_corrective.ksh    |  125 ++
 .../zfs_rewrite/zfs_rewrite_dedup_birth.ksh        |  145 ++
 .../cli_root/zfs_rewrite/zfs_rewrite_physical.ksh  |   19 +
 .../zfs_rewrite/zfs_rewrite_physical_raw_send.ksh  |  115 +
 .../zfs_rewrite/zfs_rewrite_skip_current.ksh       |  179 ++
 .../zfs_rewrite/zfs_rewrite_skip_width.ksh         |  187 ++
 .../zfs_rollback/zfs_rollback_held_unlinked.ksh    |  116 +
 .../cli_root/zfs_send/zfs_send_005_pos.ksh         |    2 +-
 .../functional/cli_root/zfs_send/zfs_send_raw.ksh  |   14 +-
 .../cli_root/zfs_set/mountpoint_003_pos.ksh        |   14 +-
 .../cli_root/zfs_unshare/zfs_unshare_002_pos.ksh   |   22 +-
 .../functional/cli_root/zinject/zinject_counts.ksh |    7 +-
 .../functional/cli_root/zpool_add/cleanup.ksh      |    2 +
 .../cli_root/zpool_add/zpool_add_001_pos.ksh       |   22 +-
 .../cli_root/zpool_add/zpool_add_009_neg.ksh       |   16 +-
 .../cli_root/zpool_add/zpool_add_warn_removal.ksh  |    2 +
 .../cli_root/zpool_attach/zpool_attach_002_pos.ksh |   60 +
 .../cli_root/zpool_attach/zpool_attach_003_pos.ksh |   99 +
 .../functional/cli_root/zpool_create/cleanup.ksh   |    2 +
 .../cli_root/zpool_create/zpool_create.shlib       |    2 +-
 .../cli_root/zpool_create/zpool_create_001_pos.ksh |   16 +-
 .../cli_root/zpool_create/zpool_create_005_pos.ksh |    4 +-
 .../cli_root/zpool_create/zpool_create_006_pos.ksh |   11 +-
 .../cli_root/zpool_create/zpool_create_007_neg.ksh |    5 +
 .../cli_root/zpool_create/zpool_create_009_neg.ksh |   14 +-
 .../cli_root/zpool_create/zpool_create_010_neg.ksh |    1 +
 .../zpool_create/zpool_create_anyraid_001_pos.ksh  |   53 +
 .../zpool_create/zpool_create_anyraid_002_pos.ksh  |   59 +
 .../zpool_create/zpool_create_anyraid_003_pos.ksh  |   51 +
 .../zpool_create/zpool_create_anyraid_004_pos.ksh  |   47 +
 .../zpool_create/zpool_create_anyraid_005_neg.ksh  |   51 +
 .../zpool_create/zpool_create_draid_005_pos.ksh    |   16 +-
 .../functional/cli_root/zpool_export/cleanup.ksh   |    1 +
 .../zpool_export/zpool_export_anyraid_001_pos.ksh  |   51 +
 .../zpool_export/zpool_export_readonly_pos.ksh     |   72 +
 .../zpool_export/zpool_export_stats_pos.ksh        |   62 +
 .../zpool_export/zpool_export_zvol_open_pos.ksh    |   82 +
 .../zpool_export/zpool_export_zvol_remove_pos.ksh  |  112 +
 .../functional/cli_root/zpool_get/zpool_get.cfg    |    1 +
 .../cli_root/zpool_get/zpool_get_006_pos.ksh       |   92 +-
 .../zpool_import/import_deadlist_damaged.ksh       |  218 ++
 .../zpool_import/import_devices_missing.ksh        |    2 +-
 .../zpool_import/import_relax_metadata_damaged.ksh |   22 +-
 .../zpool_import/import_rewind_device_replaced.ksh |   16 +-
 .../import_rewind_dryrun_no_writes.ksh             |  108 +
 .../import_rewind_metadata_damaged.ksh             |   53 +-
 .../zpool_import/import_stale_top_label.ksh        |   72 +
 .../cli_root/zpool_import/zpool_import.kshlib      |   20 +
 .../cli_root/zpool_import/zpool_import_010_pos.ksh |   15 +-
 .../zpool_import_encrypted_zplprops.ksh            |   95 +
 .../cli_root/zpool_import/zpool_import_errata3.ksh |    1 +
 .../zpool_import/zpool_import_reguid_stale.ksh     |   77 +
 .../cli_root/zpool_initialize/cleanup.ksh          |    2 +
 .../functional/cli_root/zpool_initialize/setup.ksh |   25 +
 .../zpool_initialize_anyraid_attach.ksh            |   46 +
 ...zpool_initialize_fault_export_import_online.ksh |   41 +-
 .../zpool_initialize_import_export.ksh             |   65 +-
 ...ool_initialize_offline_export_import_online.ksh |   47 +-
 .../zpool_initialize_online_offline.ksh            |   65 +-
 .../zpool_initialize_start_and_cancel_neg.ksh      |   32 +-
 .../zpool_initialize_start_and_cancel_pos.ksh      |   21 +-
 .../zpool_initialize/zpool_initialize_uninit.ksh   |  100 +-
 .../zpool_initialize_verify_checksums.ksh          |   27 +-
 .../zpool_initialize_verify_initialized.ksh        |   53 +-
 .../zpool_prefetch/zpool_prefetch_001_pos.ksh      |    2 +-
 .../cli_root/zpool_reopen/zpool_reopen.shlib       |   20 +-
 .../cli_root/zpool_status/zpool_status_-v.ksh      |   77 +-
 .../zpool_status_errlog_read_error.ksh             |  112 +
 .../cli_root/zpool_trim/zpool_trim_rate.ksh        |   89 +-
 .../zpool_wait/scan/zpool_wait_rebuild.ksh         |   11 +-
 .../zpool_wait/scan/zpool_wait_resilver.ksh        |   15 +-
 .../zpool_wait/scan/zpool_wait_scrub_basic.ksh     |    2 +-
 .../cli_root/zpool_wait/zpool_wait.kshlib          |    9 +
 .../cli_user/misc/zarcsummary_001_pos.ksh          |   36 +
 .../tests/functional/deadman/deadman_zio.ksh       |   10 +-
 .../tests/functional/dedup/dedup_legacy_repair.ksh |   91 +
 .../tests/functional/dedup/dedup_prune_leak.ksh    |   37 +
 .../functional/dedup/dedup_prune_percentage.ksh    |   79 +
 .../tests/functional/dedup/dedup_prune_scrub.ksh   |  150 ++
 .../functional/device_access/device_access.kshlib  |   22 +-
 .../functional/device_access/device_access_add.ksh |    6 +-
 .../device_access/device_access_attach.ksh         |    6 +-
 .../device_access/device_access_create.ksh         |   10 +-
 .../device_access/device_access_import.ksh         |   18 +-
 .../zfs-tests/tests/functional/direct/dio.kshlib   |   13 -
 .../tests/functional/direct/dio_nopwrite.ksh       |   76 +
 .../functional/direct/dio_read_verify_decline.ksh  |   54 +-
 .../tests/functional/direct/dio_write_verify.ksh   |    2 +-
 .../functional/direct/dio_write_verify_bounce.ksh  |  158 ++
 .../tests/functional/events/vdev_add_event.ksh     |  126 ++
 .../tests/functional/events/zed_cksum_config.ksh   |    3 +
 .../functional/fadvise/fadvise_willneed_limit.ksh  |    6 +
 .../failmode/failmode_create_continue.ksh          |  170 ++
 .../failmode/failmode_dio_unwritable.ksh           |   90 +
 .../functional/failmode/failmode_dmu_tx_wait.ksh   |   20 +-
 .../functional/failmode/failmode_nowait_wait.ksh   |   79 +
 .../functional/failmode/failmode_vdev_detach.ksh   |  147 ++
 .../functional/failmode/failmode_vdev_state.ksh    |  103 +
 .../fallocate/fallocate_odirect_append.ksh         |   91 +
 .../tests/functional/fault/auto_online_001_pos.ksh |   32 +-
 .../functional/fault/auto_replace_001_pos.ksh      |    2 +-
 .../functional/fault/auto_replace_002_pos.ksh      |    2 +-
 .../tests/functional/fault/auto_spare_001_pos.ksh  |   19 +-
 .../tests/functional/fault/auto_spare_002_pos.ksh  |   20 +-
 .../tests/functional/fault/auto_spare_multiple.ksh |   34 +-
 .../zfs-tests/tests/functional/fault/cleanup.ksh   |    2 +
 .../zfs-tests/tests/functional/fault/fault.cfg     |    2 +-
 .../zfs-tests/tests/functional/fault/setup.ksh     |    3 +
 .../functional/fault/suspend_zil_keep_first.ksh    |  100 +
 .../gang_blocks/gang_blocks_degraded_vdev.ksh      |   99 +
 .../gang_blocks/gang_blocks_dyn_header_import.ksh  |   91 +
 .../gang_blocks/gang_blocks_scrub_copies.ksh       |  129 ++
 .../gang_blocks/gang_blocks_special_fallback.ksh   |   66 +
 .../zfs-tests/tests/functional/hkdf/hkdf_test.c    |    1 +
 .../functional/idmap_mount/idmap_mount_003.ksh     |    2 +-
 .../functional/idmap_mount/idmap_mount_004.ksh     |    2 +-
 .../functional/idmap_mount/idmap_mount_005.ksh     |    2 +-
 .../zfs-tests/tests/functional/l2arc/cleanup.ksh   |    2 +-
 .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh   |   23 +-
 .../functional/l2arc/l2arc_headroom_zero_pos.ksh   |   78 +
 .../tests/functional/l2arc/l2arc_l2miss_pos.ksh    |   16 +-
 .../log_spacemap/log_spacemap_flushall.ksh         |   27 +-
 .../log_spacemap/log_spacemap_verify_weight.ksh    |  135 ++
 .../tests/functional/mmap/mmap_cached_receive.ksh  |   72 +
 .../tests/functional/mmap/mmap_cached_rollback.ksh |   65 +
 .../tests/functional/mmap/mmap_eof_extend.ksh      |  112 +
 .../zfs-tests/tests/functional/mmp/mmp.kshlib      |    5 +-
 .../tests/functional/mmp/mmp_active_import.ksh     |    4 +-
 .../pool_checkpoint/checkpoint_bclone.ksh          |   92 +
 .../pool_checkpoint/checkpoint_discard_busy.ksh    |    8 +-
 .../projectquota/projectquota_010_pos.ksh          |   60 +
 .../tests/functional/quota/quota_007_pos.ksh       |  101 +
 .../raidz/blockfiles/raidz_dedup_overrun-0.dat.bz2 |  Bin 0 -> 142654 bytes
 .../raidz/blockfiles/raidz_dedup_overrun-1.dat.bz2 |  Bin 0 -> 142865 bytes
 .../raidz/blockfiles/raidz_dedup_overrun-2.dat.bz2 |  Bin 0 -> 131144 bytes
 .../raidz/blockfiles/raidz_dedup_overrun-3.dat.bz2 |  Bin 0 -> 94081 bytes
 .../tests/functional/raidz/raidz_dedup_overrun.ksh |   95 +
 .../functional/raidz/raidz_expand_001_pos.ksh      |    7 +
 .../functional/raidz/raidz_expand_008_pos.ksh      |  118 +
 .../functional/raidz/raidz_expand_009_neg.ksh      |   86 +
 .../functional/raidz/raidz_expand_010_pos.ksh      |  117 +
 .../functional/raidz/raidz_expand_011_pos.ksh      |  149 ++
 .../functional/raidz/raidz_expand_012_neg.ksh      |  119 +
 .../raidz/raidz_expand_boundary_repair.ksh         |  191 ++
 .../functional/raidz/raidz_expand_rewrite.ksh      |  175 ++
 .../functional/raidz/raidz_expand_scrub_repair.ksh |  140 ++
 .../tests/functional/redundancy/cleanup.ksh        |    1 +
 .../tests/functional/redundancy/redundancy.kshlib  |    6 +
 .../functional/redundancy/redundancy_draid.ksh     |   10 +-
 .../redundancy/redundancy_draid_damaged1.ksh       |   10 +-
 .../redundancy/redundancy_draid_damaged2.ksh       |   10 +-
 .../redundancy/redundancy_draid_degraded1.ksh      |   10 +-
 .../redundancy/redundancy_draid_degraded2.ksh      |   10 +-
 .../functional/redundancy/redundancy_raidz.ksh     |   10 +-
 .../tests/functional/redundancy/setup.ksh          |    4 +
 .../functional/refreserv/refreserv_multi_raidz.ksh |   10 +
 .../functional/removal/removal_condense_export.ksh |    1 +
 .../removal/removal_indirect_mapping_size.ksh      |   73 +
 .../removal/removal_multiple_indirection.ksh       |    4 +-
 .../tests/functional/removal/removal_with_add.ksh  |   10 +-
 .../functional/removal/removal_with_errors.ksh     |    5 +
 .../functional/removal/removal_with_ganging.ksh    |    5 +-
 .../functional/removal/removal_with_resilver.ksh   |   75 +
 .../tests/functional/removal/removal_with_zdb.ksh  |    3 -
 .../tests/functional/removal/removal_with_zil.ksh  |   71 +
 .../tests/functional/replacement/detach.ksh        |    6 +-
 .../replacement/rebuild_draid_speculative.ksh      |   79 +
 .../functional/replacement/rebuild_online_leaf.ksh |   94 +
 .../functional/reservation/reservation_023_pos.ksh |  132 ++
 .../functional/reservation/reservation_024_neg.ksh |  124 ++
 .../tests/functional/rootpool/rootpool_002_neg.ksh |    8 +-
 .../tests/functional/rootpool/rootpool_007_pos.ksh |    2 +
 .../tests/functional/rsend/embspill.dat.bz2        |  Bin 0 -> 67246 bytes
 .../zfs-tests/tests/functional/rsend/rsend.kshlib  |   17 +-
 .../tests/functional/rsend/rsend_014_pos.ksh       |    2 +-
 .../rsend/send-c_compressed_arc_disabled.ksh       |   68 +
 .../functional/rsend/send_embedded_large_block.ksh |  102 +
 .../functional/rsend/send_embedded_spill_block.ksh |   84 +
 .../rsend/send_realloc_dnode_interior.ksh          |   35 +-
 .../zfs-tests/tests/functional/slog/slog.kshlib    |   30 +
 .../functional/slog/slog_indirect_shared_error.ksh |  143 ++
 .../slog/slog_replay_fs_split_truncate.ksh         |   89 +
 .../functional/slog/slog_replay_fs_split_write.ksh |  130 ++
 .../functional/slog/slog_replay_indirect_eof.ksh   |  118 +
 .../functional/slog/slog_replay_indirect_order.ksh |  252 +++
 .../functional/slog/slog_replay_lwb_error.ksh      |  115 +
 .../tests/functional/slog/slog_replay_volume.ksh   |    3 +-
 .../slog/slog_replay_volume_split_boundary.ksh     |  159 ++
 .../slog/slog_replay_volume_split_write.ksh        |  134 ++
 .../tests/functional/snapdir/snapdir_fh_ctldir.ksh |   57 +
 .../functional/snapdir/snapdir_lookup_stale.ksh    |  129 ++
 .../functional/snapdir/snapdir_readdir_ino.ksh     |  130 ++
 .../tests/functional/snapshot/snapshot_002_pos.ksh |   10 +
 .../tests/functional/snapshot/snapshot_006_pos.ksh |   10 +
 .../functional/test_runner/test_runner_report.ksh  |   95 +
 .../functional/test_runner/test_runner_rerun.ksh   |  146 ++
 .../test_runner/test_runner_selection.ksh          |   95 +
 .../tests/functional/tmpfile/tmpfile_002_pos.c     |    1 +
 .../tests/functional/tmpfile/tmpfile_003_pos.c     |    1 +
 .../tests/functional/tmpfile/tmpfile_stat_mode.c   |    1 +
 .../tests/functional/trim/autotrim_config.ksh      |   18 +-
 .../tests/functional/trim/autotrim_integrity.ksh   |    4 +-
 .../functional/trim/autotrim_trim_integrity.ksh    |    4 +-
 .../zfs-tests/tests/functional/trim/cleanup.ksh    |    2 +
 .../zfs-tests/tests/functional/trim/setup.ksh      |    3 +
 .../zfs-tests/tests/functional/trim/trim.kshlib    |   22 +-
 .../tests/functional/trim/trim_config.ksh          |   26 +-
 .../tests/functional/trim/trim_integrity.ksh       |    4 +-
 .../functional/uncached/uncached_dontcache.ksh     |    4 +-
 .../tests/functional/uncached/uncached_noreuse.ksh |    4 +-
 .../user_namespace/user_namespace_002.ksh          |    2 +-
 .../user_namespace/user_namespace_003.ksh          |    2 +-
 .../functional/userquota/userquota_014_neg.ksh     |   71 +
 .../userquota/userspace_encrypted_unmounted.ksh    |   69 +
 .../userquota/userspace_send_encrypted_changes.ksh |  185 ++
 .../tests/functional/vdev_disk/page_alignment.c    |    1 +
 .../functional/zap_shrink/zap_shrink_002_pos.ksh   |  124 ++
 .../functional/zoned_uid/zoned_uid_001_pos.ksh     |   14 +-
 .../functional/zoned_uid/zoned_uid_005_neg.ksh     |   12 +
 .../functional/zoned_uid/zoned_uid_021_neg.ksh     |    7 +-
 .../functional/zoned_uid/zoned_uid_035_neg.ksh     |   71 +
 .../zstream/zstream_decompress_007_pos.ksh         |   64 +
 .../functional/zstream/zstream_raw_001_pos.ksh     |   39 +-
 .../functional/zstream/zstream_raw_002_pos.ksh     |  120 +
 .../zvol/zvol_misc/zvol_misc_rename_open.ksh       |   99 +
 .../zvol/zvol_misc/zvol_misc_rename_write.ksh      |  156 ++
 .../zvol/zvol_misc/zvol_misc_volmode_race.ksh      |  115 +
 .../zvol/zvol_misc/zvol_misc_write_zeroes.ksh      |  112 +
 .../functional/zvol/zvol_stress/zvol_stress.ksh    |    3 +-
 sys/contrib/openzfs/udev/vdev_id                   |   49 +-
 sys/modules/zfs/zfs_config.h                       |   46 +-
 sys/modules/zfs/zfs_gitrev.h                       |    2 +-
 710 files changed, 37280 insertions(+), 14796 deletions(-)

diff --cc cddl/lib/libspl/Makefile
index a8935a86be16,000000000000..3f90f0a6d87c
mode 100644,000000..100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@@ -1,64 -1,0 +1,61 @@@
 +.include <bsd.init.mk>
 +.include <bsd.compiler.mk>
 +
 +.PATH: ${ZFSTOP}/lib/libspl
 +.PATH: ${ZFSTOP}/include
 +
 +PACKAGE=	zfs
 +LIB_PACKAGE=
 +
 +LIB=	spl
 +LIBADD=
 +
 +SRCS = \
 +        assert.c \
 +	backtrace.c \
 +	condvar.c \
 +	kmem.c \
++	kmem_cache.c \
 +	libspl.c \
 +        list.c \
 +        mkdirp.c \
 +        mutex.c \
 +        os/freebsd/zone.c \
 +        page.c \
 +	procfs_list.c \
 +	random.c \
 +	rwlock.c \
 +	sid.c \
 +	taskq.c \
 +        timestamp.c \
 +        include/sys/list.h \
 +        include/sys/list_impl.h
 +
 +# These functions are not required when bootstrapping and the atomic code,
 +# among others, will not compile when building on macOS.
 +.if !defined(BOOTSTRAPPING)
 +SRCS += \
-         atomic.c \
 +	cred.c \
 +        getexecname.c \
 +	kstat.c \
 +	thread.c \
 +        tunables.c \
 +        os/freebsd/getexecname.c \
 +        os/freebsd/gethostid.c \
 +        os/freebsd/getextmntent.c \
 +        os/freebsd/mnttab.c
 +.endif
 +
 +WARNS?=	2
 +CSTD=	c99
 +CFLAGS+= -DIN_BASE
 +CFLAGS+= -I${ZFSTOP}/include
 +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
 +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
 +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 +CFLAGS+= -I${ZFSTOP}/module/icp/include
 +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
 +CFLAGS+= -DHAVE_ISSETUGID
 +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
- .if ${COMPILER_TYPE} == "clang"
- CFLAGS.atomic.c+=	-Wno-error=atomic-alignment
- .endif
 +
 +.include <bsd.lib.mk>
diff --cc cddl/lib/libzpool/Makefile
index 109bf51965d2,000000000000..196218e4cadf
mode 100644,000000..100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@@ -1,351 -1,0 +1,352 @@@
 +.PATH: ${ZFSTOP}/lib/libzpool
 +
 +# ZFS_COMMON_SRCS
 +.PATH: ${ZFSTOP}/module/zfs
 +.PATH: ${ZFSTOP}/module/zcommon
 +.PATH: ${ZFSTOP}/module/unicode
*** 11171 LINES SKIPPED ***