git: c7046f76c2c0 - main - zfs: merge openzfs/zfs@c629f0bf6

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Wed, 21 Sep 2022 12:54:56 UTC
The branch main has been updated by mm:

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

commit c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23
Merge: 440217b0af5f c629f0bf62e3
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-09-21 12:17:13 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-09-21 12:17:13 +0000

    zfs: merge openzfs/zfs@c629f0bf6
    
    Notable upstream pull request merges:
      #13725 Fix BLAKE3 tuneable and module loading on Linux and FreeBSD
      #13756 FreeBSD: Organize sysctls
      #13773 FreeBSD: add kqfilter support for zvol cdev
      #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
      #13799 Revert "Avoid panic with recordsize > 128k, raw sending and
             no large_blocks"
      #13802 Add zfs.sync.snapshot_rename
      #13831 zfs_enter rework
      #13855 zfs recv hangs if max recordsize is less than received
             recordsize
    
    Obtained from:  OpenZFS
    OpenZFS commit: c629f0bf62e351355716f9870d6c2e377584b016

 cddl/lib/libuutil/Makefile                         |   1 -
 cddl/lib/libzpool/Makefile                         |   1 -
 stand/libsa/zfs/blake3_impl_hack.c                 |  11 +-
 sys/conf/files                                     |   2 +-
 .../.github/workflows/zfs-tests-functional.yml     |   2 +-
 .../openzfs/.github/workflows/zfs-tests-sanity.yml |   2 +-
 sys/contrib/openzfs/.github/workflows/zloop.yml    |   2 +-
 sys/contrib/openzfs/cmd/Makefile.am                |   7 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |  87 ++--
 sys/contrib/openzfs/cmd/zed/agents/fmd_api.c       |   2 +-
 sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c       | 157 +++++-
 sys/contrib/openzfs/cmd/zed/zed_conf.c             |   4 +-
 sys/contrib/openzfs/cmd/zed/zed_disk_event.c       |  18 +-
 sys/contrib/openzfs/cmd/zed/zed_exec.c             |   2 +-
 sys/contrib/openzfs/cmd/zfs/zfs_main.c             |   3 +
 sys/contrib/openzfs/cmd/zilstat.in                 | 467 +++++++++++++++++
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |   8 +-
 sys/contrib/openzfs/cmd/ztest.c                    |   5 +-
 sys/contrib/openzfs/config/kernel-fadvise.m4       |  23 +
 .../openzfs/config/kernel-generic_fadvise.m4       |  27 +
 sys/contrib/openzfs/config/kernel-xattr-handler.m4 |  29 +-
 sys/contrib/openzfs/config/kernel.m4               |   4 +
 sys/contrib/openzfs/contrib/coverity/model.c       | 422 +++++++++++++++
 .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c      |   5 +-
 .../etc/systemd/system/zfs-share.service.in        |   2 +-
 sys/contrib/openzfs/include/Makefile.am            |   1 -
 sys/contrib/openzfs/include/libuutil.h             |  33 --
 sys/contrib/openzfs/include/libzfs.h               |   4 +-
 sys/contrib/openzfs/include/os/freebsd/Makefile.am |   2 +-
 .../openzfs/include/os/freebsd/linux/compiler.h    |   1 -
 .../openzfs/include/os/freebsd/spl/sys/atomic.h    |   4 +-
 .../openzfs/include/os/freebsd/spl/sys/disp.h      |   2 +
 .../openzfs/include/os/freebsd/spl/sys/extdirent.h |  71 ---
 .../openzfs/include/os/freebsd/spl/sys/mod_os.h    |  31 +-
 .../openzfs/include/os/freebsd/spl/sys/simd.h      |   8 +-
 .../include/os/freebsd/spl/sys/simd_powerpc.h      |  90 ++++
 .../openzfs/include/os/freebsd/spl/sys/simd_x86.h  |  50 +-
 .../openzfs/include/os/freebsd/spl/sys/timer.h     |   2 -
 .../openzfs/include/os/freebsd/spl/sys/vfs.h       |   4 -
 .../include/os/freebsd/spl/sys/vnode_impl.h        |  13 -
 .../openzfs/include/os/freebsd/zfs/sys/arc_os.h    |  34 ++
 .../include/os/freebsd/zfs/sys/freebsd_event.h     |  37 ++
 .../include/os/freebsd/zfs/sys/zfs_context_os.h    |   2 -
 .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h     |   6 -
 .../include/os/freebsd/zfs/sys/zfs_znode_impl.h    |  35 +-
 .../include/os/linux/kernel/linux/simd_powerpc.h   |  77 ++-
 .../include/os/linux/kernel/linux/xattr_compat.h   |  14 +
 .../openzfs/include/os/linux/spl/sys/disp.h        |   4 +-
 .../openzfs/include/os/linux/spl/sys/vmsystm.h     |   3 +
 .../include/os/linux/zfs/sys/zfs_vfsops_os.h       |   3 -
 .../include/os/linux/zfs/sys/zfs_znode_impl.h      |  60 +--
 sys/contrib/openzfs/include/sys/blake3.h           |  23 +-
 sys/contrib/openzfs/include/sys/bqueue.h           |  14 +-
 sys/contrib/openzfs/include/sys/dmu.h              |   4 +-
 sys/contrib/openzfs/include/sys/dsl_dataset.h      |  12 +-
 sys/contrib/openzfs/include/sys/dsl_dir.h          |   1 +
 sys/contrib/openzfs/include/sys/fs/zfs.h           |   6 +-
 sys/contrib/openzfs/include/sys/spa_boot.h         |  42 --
 sys/contrib/openzfs/include/sys/sysevent/dev.h     |   3 +
 sys/contrib/openzfs/include/sys/vdev_impl.h        |   1 +
 sys/contrib/openzfs/include/sys/vdev_raidz_impl.h  |   2 +-
 sys/contrib/openzfs/include/sys/zfs_context.h      |   5 +-
 sys/contrib/openzfs/include/sys/zfs_znode.h        |  23 +
 sys/contrib/openzfs/lib/libshare/libshare.c        |  12 +-
 sys/contrib/openzfs/lib/libshare/libshare_impl.h   |   3 +-
 sys/contrib/openzfs/lib/libshare/nfs.c             |  12 +
 sys/contrib/openzfs/lib/libshare/nfs.h             |   2 +
 sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c  |   9 +-
 sys/contrib/openzfs/lib/libshare/os/linux/nfs.c    |  11 +-
 sys/contrib/openzfs/lib/libspl/atomic.c            |   6 +
 sys/contrib/openzfs/lib/libspl/include/atomic.h    |   7 +
 sys/contrib/openzfs/lib/libspl/include/libshare.h  |   3 +-
 sys/contrib/openzfs/lib/libspl/include/sys/simd.h  |  87 ++--
 sys/contrib/openzfs/lib/libuutil/Makefile.am       |   1 -
 sys/contrib/openzfs/lib/libuutil/libuutil.abi      |  73 ---
 sys/contrib/openzfs/lib/libuutil/uu_pname.c        | 202 --------
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          |  55 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_mount.c      |  12 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |   4 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |  10 -
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |   8 +-
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |   1 -
 .../lib/libzutil/os/linux/zutil_device_path_os.c   |   1 -
 sys/contrib/openzfs/lib/libzutil/zutil_import.c    |   2 +
 sys/contrib/openzfs/man/man4/zfs.4                 |  35 +-
 sys/contrib/openzfs/man/man7/zpoolprops.7          |   2 +-
 sys/contrib/openzfs/man/man8/zfs-program.8         |  13 +
 sys/contrib/openzfs/module/Kbuild.in               |   1 -
 sys/contrib/openzfs/module/Makefile.bsd            |   2 +-
 .../openzfs/module/icp/algs/blake3/blake3.c        |  14 +-
 .../module/icp/algs/blake3/blake3_generic.c        |   2 +-
 .../openzfs/module/icp/algs/blake3/blake3_impl.c   | 354 ++++++++-----
 .../openzfs/module/icp/algs/blake3/blake3_impl.h   |  14 +-
 .../openzfs/module/icp/algs/blake3/blake3_x86-64.c |  12 +-
 .../openzfs/module/icp/core/kcf_mech_tabs.c        |   2 +-
 .../openzfs/module/icp/core/kcf_prov_tabs.c        |   2 +-
 .../openzfs/module/icp/include/sys/crypto/impl.h   |  42 +-
 .../module/icp/include/sys/crypto/sched_impl.h     |   7 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c |  41 +-
 .../openzfs/module/os/freebsd/zfs/event_os.c       |  65 +++
 .../openzfs/module/os/freebsd/zfs/kmod_core.c      |  13 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c |   3 +-
 .../openzfs/module/os/freebsd/zfs/sysctl_os.c      | 569 +++++++++++++--------
 .../openzfs/module/os/freebsd/zfs/vdev_geom.c      |   3 +-
 .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c     |  14 +-
 .../openzfs/module/os/freebsd/zfs/zfs_dir.c        |   1 -
 .../openzfs/module/os/freebsd/zfs/zfs_file_os.c    |   4 +
 .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c     |  75 +--
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   | 460 ++++++++---------
 .../openzfs/module/os/freebsd/zfs/zvol_os.c        |  64 +++
 .../openzfs/module/os/linux/spl/spl-generic.c      |  12 +-
 .../openzfs/module/os/linux/spl/spl-kmem-cache.c   |   3 +
 .../openzfs/module/os/linux/spl/spl-taskq.c        |   6 +-
 sys/contrib/openzfs/module/os/linux/spl/spl-tsd.c  |   2 +-
 sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c |   2 +-
 sys/contrib/openzfs/module/os/linux/spl/spl-zone.c |   2 +-
 sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c  |   5 +-
 .../openzfs/module/os/linux/zfs/zfs_ctldir.c       |  44 +-
 .../openzfs/module/os/linux/zfs/zfs_vfsops.c       |  42 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     | 300 +++++------
 .../openzfs/module/os/linux/zfs/zpl_ctldir.c       |  30 +-
 sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c |  80 ++-
 .../openzfs/module/os/linux/zfs/zpl_super.c        |   6 +-
 .../openzfs/module/os/linux/zfs/zpl_xattr.c        |  21 +-
 sys/contrib/openzfs/module/zfs/arc.c               |  13 +-
 sys/contrib/openzfs/module/zfs/bqueue.c            |  23 +-
 sys/contrib/openzfs/module/zfs/btree.c             |  12 +-
 sys/contrib/openzfs/module/zfs/dbuf.c              |   8 +-
 sys/contrib/openzfs/module/zfs/dmu_objset.c        |  10 -
 sys/contrib/openzfs/module/zfs/dmu_redact.c        |   4 +-
 sys/contrib/openzfs/module/zfs/dmu_send.c          |   4 -
 sys/contrib/openzfs/module/zfs/dnode.c             |   6 +-
 sys/contrib/openzfs/module/zfs/dsl_dataset.c       |  59 +--
 sys/contrib/openzfs/module/zfs/dsl_dir.c           |   4 +-
 sys/contrib/openzfs/module/zfs/dsl_scan.c          |  15 -
 sys/contrib/openzfs/module/zfs/fm.c                |   2 +-
 sys/contrib/openzfs/module/zfs/spa.c               |   1 -
 sys/contrib/openzfs/module/zfs/spa_boot.c          |  50 --
 sys/contrib/openzfs/module/zfs/spa_checkpoint.c    |   2 +-
 sys/contrib/openzfs/module/zfs/spa_log_spacemap.c  |   2 +-
 sys/contrib/openzfs/module/zfs/vdev.c              |  36 +-
 sys/contrib/openzfs/module/zfs/vdev_draid.c        |  12 +-
 sys/contrib/openzfs/module/zfs/vdev_mirror.c       |  10 +-
 sys/contrib/openzfs/module/zfs/vdev_raidz.c        |  10 +-
 .../openzfs/module/zfs/vdev_raidz_math_impl.h      |   6 +-
 sys/contrib/openzfs/module/zfs/zcp_synctask.c      |  37 ++
 sys/contrib/openzfs/module/zfs/zfs_chksum.c        |  20 +-
 sys/contrib/openzfs/module/zfs/zfs_ioctl.c         |  17 +-
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |  68 +--
 sys/contrib/openzfs/rpm/generic/zfs.spec.in        |   4 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |   3 +-
 sys/contrib/openzfs/tests/runfiles/linux.run       |   4 +
 sys/contrib/openzfs/tests/runfiles/sanity.run      |   3 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore |   1 +
 .../openzfs/tests/zfs-tests/cmd/Makefile.am        |   3 +
 .../tests/zfs-tests/cmd/checksum/blake3_test.c     |  12 +-
 .../tests/zfs-tests/cmd/file/file_fadvise.c        |  97 ++++
 .../openzfs/tests/zfs-tests/include/commands.cfg   |   2 +
 .../openzfs/tests/zfs-tests/include/libtest.shlib  |   2 +-
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |   2 +
 .../openzfs/tests/zfs-tests/tests/Makefile.am      |   6 +
 .../synctask_core/tst.snapshot_rename.ksh          |  41 ++
 .../synctask_core/tst.snapshot_rename.zcp          |  27 +
 .../tests/functional/checksum/filetest_002_pos.ksh |   2 +-
 .../functional/cli_root/zpool_add/add-o_ashift.ksh |   5 +-
 .../functional/cli_user/misc/zilstat_001_pos.ksh   |  37 ++
 .../zfs-tests/tests/functional/fadvise/cleanup.ksh |  28 +
 .../functional/fadvise/fadvise_sequential.ksh      |  80 +++
 .../zfs-tests/tests/functional/fadvise/setup.ksh   |  30 ++
 .../tests/functional/fault/auto_spare_002_pos.ksh  |   2 +-
 .../functional/rsend/send_encrypted_props.ksh      |   8 +
 .../user_namespace/user_namespace_002.ksh          |   2 +-
 .../user_namespace/user_namespace_003.ksh          |   2 +-
 .../functional/zvol/zvol_stress/zvol_stress.ksh    |   1 +
 sys/modules/zfs/Makefile                           |   2 +-
 sys/modules/zfs/zfs_config.h                       |  13 +-
 sys/modules/zfs/zfs_gitrev.h                       |   2 +-
 177 files changed, 3825 insertions(+), 1937 deletions(-)

diff --cc cddl/lib/libuutil/Makefile
index 169b8d8afe01,000000000000..fdbac6de2748
mode 100644,000000..100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@@ -1,27 -1,0 +1,26 @@@
 +# $FreeBSD$
 +
 +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
 +
 +PACKAGE=	runtime
 +LIB=	uutil
 +SRCS=\
 +	uu_alloc.c \
 +	uu_avl.c \
 +	uu_ident.c \
 +	uu_list.c \
 +	uu_misc.c \
- 	uu_pname.c \
 +	uu_string.c
 +
 +WARNS?=	2
 +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+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 +
 +LIBADD= avl spl
 +
 +.include <bsd.lib.mk>
diff --cc cddl/lib/libzpool/Makefile
index 92f1bda6d82a,000000000000..b9ef6575c99a
mode 100644,000000..100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@@ -1,333 -1,0 +1,332 @@@
 +# $FreeBSD$
 +
 +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
 +
 +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 \
 +	btree.c \
 +	bqueue.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 \
 +	sha256.c \
 +	skein_zfs.c \
 +	spa.c \
- 	spa_boot.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_cache.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_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
 +
 +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 stand/libsa/zfs/blake3_impl_hack.c
index 709ce510dad6,000000000000..bc958b961a08
mode 100644,000000..100644
--- a/stand/libsa/zfs/blake3_impl_hack.c
+++ b/stand/libsa/zfs/blake3_impl_hack.c
@@@ -1,28 -1,0 +1,35 @@@
 +/*
 + * Copyright 2022, Netflix, Inc
 + *
 + * SPDX-License-Identifier: BSD-2-Clause
 + */
 +
 +/*
 + * Hack for aarch64... There's no way to tell it omit the SIMD
 + * versions, so we fake it here.
 + */
++#ifndef isspace
++static __inline int isspace(int c)
++{
++    return c == ' ' || (c >= 0x9 && c <= 0xd);
++}
++#endif
++
 +#include "blake3_impl.c"
 +
 +static inline boolean_t blake3_is_not_supported(void)
 +{
 +	return (B_FALSE);
 +}
 +
- const blake3_impl_ops_t blake3_sse2_impl = {
++const blake3_ops_t blake3_sse2_impl = {
 +	.is_supported = blake3_is_not_supported,
 +	.degree = 4,
 +	.name = "fakesse2"
 +};
 +
- const blake3_impl_ops_t blake3_sse41_impl = {
++const blake3_ops_t blake3_sse41_impl = {
 +	.is_supported = blake3_is_not_supported,
 +	.degree = 4,
 +	.name = "fakesse41"
 +};
diff --cc sys/conf/files
index 725e140dca19,000000000000..b7da3626111d
mode 100644,000000..100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@@ -1,5231 -1,0 +1,5231 @@@
 +# $FreeBSD$
 +#
 +# The long compile-with and dependency lines are required because of
 +# limitations in config: backslash-newline doesn't work in strings, and
 +# dependency lines other than the first are silently ignored.
 +#
 +acpi_quirks.h			optional acpi				   \
 +	dependency	"$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 +	compile-with	"${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"acpi_quirks.h"
 +bhnd_nvram_map.h		optional bhnd				   \
 +	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 +	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"bhnd_nvram_map.h"
 +bhnd_nvram_map_data.h		optional bhnd				   \
 +	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 +	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -d" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"bhnd_nvram_map_data.h"
 +fdt_static_dtb.h		optional fdt fdt_dtb_static \
 +	compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}'" \
 +	dependency	"${FDT_DTS_FILE:T:R}.dtb" \
 +	no-obj no-implicit-rule before-depend \
 +	clean		"fdt_static_dtb.h"
 +feeder_eq_gen.h			optional sound				   \
 +	dependency	"$S/tools/sound/feeder_eq_mkfilter.awk"		   \
 +	compile-with	"${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"feeder_eq_gen.h"
 +feeder_rate_gen.h		optional sound				   \
 +	dependency	"$S/tools/sound/feeder_rate_mkfilter.awk"	   \
 +	compile-with	"${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"feeder_rate_gen.h"
 +font.h				optional	sc_dflt_font		\
 +	compile-with	"uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"									\
 +	no-obj no-implicit-rule before-depend				\
 +	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 +snd_fxdiv_gen.h			optional sound				   \
 +	dependency	"$S/tools/sound/snd_fxdiv_gen.awk"		   \
 +	compile-with	"${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"snd_fxdiv_gen.h"
 +miidevs.h			optional miibus | mii			   \
 +	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
 +	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"miidevs.h"
 +kbdmuxmap.h			optional	kbdmux_dflt_keymap 	   \
 +	compile-with	"${KEYMAP} -L ${KBDMUX_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
 +	no-obj no-implicit-rule before-depend				\
 +	clean		"kbdmuxmap.h"
 +teken_state.h		optional sc | vt				   \
 +	dependency	"$S/teken/gensequences $S/teken/sequences" \
 +	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"teken_state.h"
 +ukbdmap.h			optional	ukbd_dflt_keymap	\
 +	compile-with	"${KEYMAP} -L ${UKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
 +	no-obj no-implicit-rule before-depend				\
 +	clean		"ukbdmap.h"
 +usbdevs.h			optional usb | hid			   \
 +	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 +	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"usbdevs.h"
 +usbdevs_data.h			optional usb				   \
 +	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 +	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"usbdevs_data.h"
 +sdiodevs.h			optional mmccam				   \
 +	dependency	"$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
 +	compile-with	"${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -h" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"sdiodevs.h"
 +sdiodevs_data.h			optional mmccam				   \
 +	dependency	"$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
 +	compile-with	"${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -d" \
 +	no-obj no-implicit-rule before-depend				   \
 +	clean		"sdiodevs_data.h"
 +cam/cam.c			optional scbus
 +cam/cam_compat.c		optional scbus
 +cam/cam_iosched.c		optional scbus
 +cam/cam_periph.c		optional scbus
 +cam/cam_queue.c			optional scbus
 +cam/cam_sim.c			optional scbus
 +cam/cam_xpt.c			optional scbus
 +cam/ata/ata_all.c		optional scbus
 +cam/ata/ata_xpt.c		optional scbus
 +cam/ata/ata_pmp.c		optional scbus
 +cam/nvme/nvme_all.c		optional scbus
 +cam/nvme/nvme_da.c		optional nda | da
 +cam/nvme/nvme_xpt.c		optional scbus
 +cam/scsi/scsi_xpt.c		optional scbus
 +cam/scsi/scsi_all.c		optional scbus
 +cam/scsi/scsi_cd.c		optional cd
 +cam/scsi/scsi_ch.c		optional ch
 +cam/ata/ata_da.c		optional ada | da
 +cam/ctl/ctl.c			optional ctl
 +cam/ctl/ctl_backend.c		optional ctl
 +cam/ctl/ctl_backend_block.c	optional ctl
 +cam/ctl/ctl_backend_ramdisk.c	optional ctl
 +cam/ctl/ctl_cmd_table.c		optional ctl
 +cam/ctl/ctl_frontend.c		optional ctl
 +cam/ctl/ctl_frontend_cam_sim.c	optional ctl
 +cam/ctl/ctl_frontend_ioctl.c	optional ctl
 +cam/ctl/ctl_frontend_iscsi.c	optional ctl cfiscsi
 +cam/ctl/ctl_ha.c		optional ctl
 +cam/ctl/ctl_scsi_all.c		optional ctl
 +cam/ctl/ctl_tpc.c		optional ctl
 +cam/ctl/ctl_tpc_local.c		optional ctl
 +cam/ctl/ctl_error.c		optional ctl
 +cam/ctl/ctl_util.c		optional ctl
 +cam/ctl/scsi_ctl.c		optional ctl
 +cam/mmc/mmc_xpt.c		optional scbus mmccam
 +cam/mmc/mmc_sim.c		optional scbus mmccam
 +cam/mmc/mmc_sim_if.m		optional scbus mmccam
 +cam/mmc/mmc_da.c		optional scbus mmccam da
 +cam/scsi/scsi_da.c		optional da
 +cam/scsi/scsi_pass.c		optional pass
 +cam/scsi/scsi_pt.c		optional pt
 +cam/scsi/scsi_sa.c		optional sa
 +cam/scsi/scsi_enc.c		optional ses
 +cam/scsi/scsi_enc_ses.c		optional ses
 +cam/scsi/scsi_enc_safte.c	optional ses
 +cam/scsi/scsi_sg.c		optional sg
 +cam/scsi/scsi_targ_bh.c		optional targbh
 +cam/scsi/scsi_target.c		optional targ
 +cam/scsi/smp_all.c		optional scbus
 +
 +# shared between zfs and dtrace
 +cddl/compat/opensolaris/kern/opensolaris.c		optional dtrace compile-with "${CDDL_C}"
 +cddl/compat/opensolaris/kern/opensolaris_proc.c		optional zfs | dtrace compile-with "${CDDL_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_misc.c		optional zfs | dtrace compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_cmn_err.c		optional zfs | dtrace compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_taskq.c		optional zfs | dtrace compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_kmem.c		optional zfs | dtrace compile-with "${ZFS_C}"
 +
 +#zfs solaris portability layer
 +contrib/openzfs/module/os/freebsd/spl/acl_common.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/callb.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/list.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_acl.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_dtrace.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_kstat.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_policy.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_string.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_sunddi.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_uio.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_vfs.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_vm.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_zone.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_procfs_list.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/spl/spl_zlib.c		optional zfs compile-with "${ZFS_C}"
 +
 +
 +# zfs specific
 +
 +#zfs avl
 +contrib/openzfs/module/avl/avl.c				optional zfs compile-with "${ZFS_C}"
 +
 +# zfs lua support
 +contrib/openzfs/module/lua/lapi.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lauxlib.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lbaselib.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lcode.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lcompat.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lcorolib.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lctype.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/ldebug.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/ldo.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lfunc.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lgc.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/llex.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lmem.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lobject.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lopcodes.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lparser.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lstate.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lstring.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lstrlib.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/ltable.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/ltablib.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/ltm.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lvm.c			optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/lua/lzio.c			optional zfs compile-with "${ZFS_C}"
 +
 +# zfs nvpair support
 +contrib/openzfs/module/nvpair/fnvpair.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/nvpair/nvpair.c		optional zfs compile-with "${ZFS_RPC_C}"
 +contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c	optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/nvpair/nvpair_alloc_spl.c	optional zfs compile-with "${ZFS_C}"
 +
 +#zfs platform compatibility code
 +contrib/openzfs/module/os/freebsd/zfs/abd_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/arc_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/crypto_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/dmu_os.c		optional zfs compile-with "${ZFS_C}"
++contrib/openzfs/module/os/freebsd/zfs/event_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/hkdf.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/kmod_core.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/spa_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c		optional zfs compile-with "${ZFS_C}  -include $S/modules/zfs/zfs_config.h"
 +contrib/openzfs/module/os/freebsd/zfs/vdev_file.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/vdev_geom.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_acl.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_debug.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_dir.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_file_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_compat.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/os/freebsd/zfs/zvol_os.c		optional zfs compile-with "${ZFS_C}"
 +
 +#zfs unicode support
 +contrib/openzfs/module/unicode/uconv.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/unicode/u8_textprep.c		optional zfs compile-with "${ZFS_C}"
 +
 +#zfs checksums / zcommon
 +contrib/openzfs/module/zcommon/cityhash.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfeature_common.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_comutil.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_deleg.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_fletcher.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_fletcher_superscalar.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_fletcher_superscalar4.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_namecheck.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zfs_prop.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zpool_prop.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zcommon/zprop_common.c		optional zfs compile-with "${ZFS_C}"
 +
 +# zfs edon-r hash support
 +contrib/openzfs/module/icp/algs/edonr/edonr.c		optional zfs compile-with "${ZFS_C}"
 +
 +# zfs blake3 hash support
 +contrib/openzfs/module/icp/algs/blake3/blake3.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/icp/algs/blake3/blake3_generic.c	optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/icp/algs/blake3/blake3_impl.c	optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/icp/algs/blake3/blake3_x86-64.c	optional zfs compile-with "${ZFS_C}"
 +
 +#zfs core common code
 +contrib/openzfs/module/zfs/abd.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/aggsum.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/arc.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/blake3_zfs.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/blkptr.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/bplist.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/bpobj.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/bptree.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/btree.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/bqueue.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dbuf.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dbuf_stats.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dataset_kstats.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/ddt.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/ddt_zap.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_diff.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_object.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_objset.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_recv.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_redact.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_send.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_traverse.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_tx.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dmu_zfetch.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dnode.c		optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" \
 +	warning "kernel contains CDDL licensed ZFS filesystem"
 +contrib/openzfs/module/zfs/dnode_sync.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_bookmark.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_crypt.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_dataset.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_deadlist.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_deleg.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_destroy.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_dir.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_pool.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_prop.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_scan.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_synctask.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/dsl_userhold.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/edonr_zfs.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/fm.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/gzip.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/lzjb.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/lz4.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/lz4_zfs.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/metaslab.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/mmp.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/multilist.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/objlist.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/pathname.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/range_tree.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/refcount.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/rrwlock.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/sa.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/sha256.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/skein_zfs.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa.c		optional zfs compile-with "${ZFS_C}"
- contrib/openzfs/module/zfs/spa_boot.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_checkpoint.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_config.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_errlog.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_history.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_log_spacemap.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_misc.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/spa_stats.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/space_map.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/space_reftree.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/txg.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/uberblock.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/unique.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_cache.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_draid.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_draid_rand.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_indirect.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_indirect_births.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_indirect_mapping.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_initialize.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_label.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_mirror.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_missing.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_queue.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_raidz.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_raidz_math.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_raidz_math_scalar.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_rebuild.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_removal.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_root.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/vdev_trim.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zap.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zap_leaf.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zap_micro.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp_get.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp_global.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp_iter.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp_set.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zcp_synctask.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfeature.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfs_byteswap.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfs_chksum.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfs_fm.c		optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}"
 +contrib/openzfs/module/zfs/zfs_fuid.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfs_ioctl.c		optional zfs compile-with "${ZFS_C}"
 +contrib/openzfs/module/zfs/zfs_log.c		optional zfs compile-with "${ZFS_C}"
*** 6664 LINES SKIPPED ***