Date: Sun, 15 Mar 2026 08:23:53 +0100 From: A FreeBSD User <freebsd@walstatt-de.de> To: Martin Matuska <mm@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e Message-ID: <20260315082420.01da7a33@thor.sb211.local> In-Reply-To: <20260315080826.6a07e638@thor.sb211.local> References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> <20260315080826.6a07e638@thor.sb211.local>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Am Tage des Herren Sun, 15 Mar 2026 08:07:59 +0100 A FreeBSD User <freebsd@walstatt-de.de> schrieb: > Am Tage des Herren Sat, 14 Mar 2026 13:26:23 +0000 > Martin Matuska <mm@FreeBSD.org> schrieb: > > > The branch main has been updated by mm: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8a62a2a5659d1839d8799b4274c04469d7f17c78 > > > > commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 > > Merge: f91464171d61 f8e5af53e92f > > Author: Martin Matuska <mm@FreeBSD.org> > > AuthorDate: 2026-03-14 12:14:56 +0000 > > Commit: Martin Matuska <mm@FreeBSD.org> > > CommitDate: 2026-03-14 12:14:56 +0000 > > > > zfs: merge openzfs/zfs@f8e5af53e > > > > Notable upstream pull request merges: > > #17358 4975430cf Add vdev property to disable vdev scheduler > > #18031 c77f17b75 Add snapshots_changed_nsecs dataset property > > #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly created > > datasets > > #18089 -multiple Zstd: Update bundled library to version 1.5.7 > > #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the > > snapshot > > #18093 -multiple L2ARC: Rework write throttling with DWPD rate limiting > > and parallel writes > > #18095 2dbd6af5e Rename several printf attributes declarations to > > __printf__ > > #18096 8605bdfdd FreeBSD: unbreak compilation on i386 > > #18105 794f1587d When receiving a stream with the large block flag, > > activate feature > > #18115 765929cb4 DDT: Add locking for table ZAP destruction > > #18118 09e4e01e9 Fix history logging for `zpool create -t` > > #18119 2f1f25217 icp: emit .note.GNU-stack section for all ELF targets > > #18131 3fffe4e70 Fix --enable-invariants on FreeBSD > > #18133 d2f5cb3a5 Move range_tree, btree, highbit64 to common code > > #18136 54b141fab FreeBSD: Remove references to DEBUG_VFS_LOCKS > > #18138 cdf89f413 Flush RRD only when TXGs contain data > > #18139 a157ef62a Make sure we can still write data to txg > > #18140 cd895f0e5 remove thread unsafe debug code causing FreeBSD double > > free panic > > #18144 4f180e095 Fix activating large_microzap on receive > > #18146 35b2d3970 Lock db_mtx around arc_release() in couple places > > #18154 b36472052 nvpair: chase FreeBSD xdrproc_t definition > > #18160 21bbe7cb6 Improve caching for dbuf prefetches > > #18177 -multiple Multihost Improvements > > #18179 2646bd558 Allow rewrite skip cloned and snapshotted blocks > > #18180 aa29455dd Restrict cloning with different properties > > #18184 040ba7a7c libzfs: improve error message for zpool create with > > ENXIO > > #18188 1412bdc6c zfs_vnops_os.c: Move a vput() to after > > zfs_setattr_dir() > > #18198 cc184fe98 Fix `send:raw` permission for send `-w -I` > > #18208 ba970eb20 Cleanup allocation class selection > > #18212 0f9564e85 Simplify dnode_level_is_l2cacheable() > > #18214 370570890 Remove parent ZIO from dbuf_prefetch() > > #18218 bfb276e55 freebsd: Fix TIMESPEC_OVERFLOW for PowerPC > > #18222 d06a1d9ac Fix available space accounting for special/dedup > > #18225 d48967728 ICP: AES-GCM VAES-AVX2: fix typos and document > > source files > > #18226 c8a72a27e ICP: AES-GCM assembly: remove unused Gmul functions > > #18230 -multiple Fix zdb --key crash for unencrypted datasets, and > > teach tests to understand this better > > #18233 -multiple icp: add SHA-512 implementation using Intel SHA512 > > extension > > #18245 991fc56fa Introduce dedupused/dedupsaved pool properties > > #18251 6a717f31e Improve misleading error messages for > > ZPOOL_STATUS_CORRUPT_POOL > > #18254 7744f0496 SIMD: libspl: test the correct CPUID bit for AVX512VL > > #18255 6495dafd5 range_tree: use zfs_panic_recover() for > > partial-overlap remov > > #18256 3408332d7 zhack: Fix importing large allocation profiles on > > small pools > > #18258 f8457fbdc Fix deadlock on dmu_tx_assign() from vdev_rebuild() > > #18263 f8e5af53e Fix redundant declaration of dsl_pool_t > > > > Obtained from: OpenZFS > > OpenZFS commit: f8e5af53e92fa7c03393fbd4922cb9c1d0c15920 > > > > cddl/lib/libzfs/Makefile | 36 +- > > cddl/lib/libzpool/Makefile | 7 +- > > stand/libsa/zfs/Makefile.inc | 6 +- > > stand/libsa/zfs/xxhash.c | 24 + > > sys/conf/files | 7 +- > > .../.github/workflows/scripts/qemu-1-setup.sh | 110 +- > > .../.github/workflows/scripts/qemu-2-start.sh | 53 +- > > .../.github/workflows/scripts/qemu-3-deps-vm.sh | 50 +- > > .../.github/workflows/scripts/qemu-5-setup.sh | 22 +- > > .../workflows/scripts/qemu-6-lustre-tests-vm.sh | 51 + > > .../.github/workflows/scripts/qemu-6-tests.sh | 132 +- > > .../.github/workflows/scripts/qemu-8-summary.sh | 32 + > > .../.github/workflows/scripts/qemu-test-repo-vm.sh | 27 +- > > .../.github/workflows/zfs-qemu-packages.yml | 15 +- > > sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 16 +- > > sys/contrib/openzfs/.mailmap | 10 + > > sys/contrib/openzfs/AUTHORS | 14 + > > sys/contrib/openzfs/META | 2 +- > > sys/contrib/openzfs/Makefile.am | 2 + > > sys/contrib/openzfs/autogen.sh | 1 + > > sys/contrib/openzfs/cmd/Makefile.am | 5 +- > > sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zdb/Makefile.am | 5 +- > > sys/contrib/openzfs/cmd/zdb/zdb.c | 53 +- > > sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + > > .../zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + > > sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 89 +- > > sys/contrib/openzfs/cmd/zhack.c | 166 +- > > sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 16 +- > > sys/contrib/openzfs/cmd/zpool/zpool_util.c | 26 - > > sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 - > > sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/ztest.c | 7 +- > > sys/contrib/openzfs/config/CppCheck.am | 1 + > > sys/contrib/openzfs/config/Rules.am | 1 + > > sys/contrib/openzfs/config/Shellcheck.am | 1 + > > sys/contrib/openzfs/config/Substfiles.am | 1 + > > sys/contrib/openzfs/config/always-arch.m4 | 1 + > > .../openzfs/config/always-compiler-options.m4 | 1 + > > sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + > > sys/contrib/openzfs/config/always-parallel.m4 | 1 + > > sys/contrib/openzfs/config/always-python.m4 | 1 + > > sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + > > sys/contrib/openzfs/config/always-sed.m4 | 1 + > > sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + > > sys/contrib/openzfs/config/always-system.m4 | 1 + > > sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + > > sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + > > sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + > > sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + > > sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + > > sys/contrib/openzfs/config/deb.am | 1 + > > sys/contrib/openzfs/config/find_system_library.m4 | 1 + > > sys/contrib/openzfs/config/gettext.m4 | 1 + > > sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + > > sys/contrib/openzfs/config/iconv.m4 | 1 + > > .../openzfs/config/kernel-access-ok-type.m4 | 1 + > > sys/contrib/openzfs/config/kernel-acl.m4 | 32 + > > sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + > > sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + > > sys/contrib/openzfs/config/kernel-automount.m4 | 1 + > > sys/contrib/openzfs/config/kernel-bio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + > > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + > > sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + > > .../config/kernel-block-device-operations.m4 | 1 + > > .../openzfs/config/kernel-commit-metadata.m4 | 1 + > > .../openzfs/config/kernel-config-defined.m4 | 1 + > > .../config/kernel-copy-from-user-inatomic.m4 | 1 + > > .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + > > .../openzfs/config/kernel-declare-event-class.m4 | 1 + > > .../openzfs/config/kernel-dentry-operations.m4 | 1 + > > .../openzfs/config/kernel-discard-granularity.m4 | 1 + > > sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + > > sys/contrib/openzfs/config/kernel-file.m4 | 1 + > > sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + > > .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + > > .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + > > .../openzfs/config/kernel-follow-down-one.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + > > sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fs-context.m4 | 33 + > > sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - > > sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + > > .../openzfs/config/kernel-generic_fadvise.m4 | 1 + > > .../openzfs/config/kernel-generic_fillattr.m4 | 1 + > > .../openzfs/config/kernel-generic_io_acct.m4 | 1 + > > sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + > > sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + > > sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + > > sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + > > .../openzfs/config/kernel-inode-permission.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-state.m4 | 24 + > > sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + > > .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + > > .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + > > .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + > > .../openzfs/config/kernel-kmap-local-page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + > > .../openzfs/config/kernel-make-request-fn.m4 | 1 + > > sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 28 + > > sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + > > sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + > > sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + > > .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + > > .../config/kernel-pagemap-readahead-page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + > > sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + > > .../openzfs/config/kernel-pin-user-pages.m4 | 1 + > > .../openzfs/config/kernel-proc-operations.m4 | 1 + > > sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + > > .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + > > sys/contrib/openzfs/config/kernel-rename.m4 | 1 + > > .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sched.m4 | 1 + > > .../openzfs/config/kernel-security-inode-init.m4 | 1 + > > sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + > > .../openzfs/config/kernel-setattr-prepare.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + > > sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + > > sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + > > sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + > > sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + > > sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + > > sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + > > sys/contrib/openzfs/config/kernel-timer.m4 | 1 + > > sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + > > .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + > > .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + > > .../openzfs/config/kernel-truncate-setsize.m4 | 1 + > > sys/contrib/openzfs/config/kernel-types.m4 | 1 + > > sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + > > .../openzfs/config/kernel-vfs-file_range.m4 | 1 + > > .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + > > .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + > > .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + > > .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + > > .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + > > sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + > > sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + > > sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + > > sys/contrib/openzfs/config/kernel.m4 | 9 +- > > sys/contrib/openzfs/config/lib-ld.m4 | 1 + > > sys/contrib/openzfs/config/lib-link.m4 | 1 + > > sys/contrib/openzfs/config/lib-prefix.m4 | 1 + > > sys/contrib/openzfs/config/mount-helper.m4 | 1 + > > sys/contrib/openzfs/config/nls.m4 | 1 + > > sys/contrib/openzfs/config/pkg.m4 | 1 + > > sys/contrib/openzfs/config/po.m4 | 1 + > > sys/contrib/openzfs/config/progtest.m4 | 1 + > > sys/contrib/openzfs/config/rpm.am | 1 + > > sys/contrib/openzfs/config/tgz.am | 1 + > > sys/contrib/openzfs/config/toolchain-simd.m4 | 23 + > > sys/contrib/openzfs/config/user-aio.h.m4 | 1 + > > sys/contrib/openzfs/config/user-backtrace.m4 | 1 + > > sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + > > sys/contrib/openzfs/config/user-dracut.m4 | 1 + > > sys/contrib/openzfs/config/user-gettext.m4 | 1 + > > sys/contrib/openzfs/config/user-largefile.m4 | 1 + > > sys/contrib/openzfs/config/user-libaio.m4 | 1 + > > sys/contrib/openzfs/config/user-libatomic.m4 | 1 + > > sys/contrib/openzfs/config/user-libblkid.m4 | 1 + > > sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + > > sys/contrib/openzfs/config/user-libexec.m4 | 1 + > > sys/contrib/openzfs/config/user-libfetch.m4 | 1 + > > sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + > > sys/contrib/openzfs/config/user-libudev.m4 | 1 + > > sys/contrib/openzfs/config/user-libunwind.m4 | 1 + > > sys/contrib/openzfs/config/user-libuuid.m4 | 1 + > > sys/contrib/openzfs/config/user-makedev.m4 | 1 + > > sys/contrib/openzfs/config/user-pam.m4 | 1 + > > sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + > > sys/contrib/openzfs/config/user-statx.m4 | 1 + > > sys/contrib/openzfs/config/user-systemd.m4 | 1 + > > sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + > > sys/contrib/openzfs/config/user-udev.m4 | 1 + > > sys/contrib/openzfs/config/user-zlib.m4 | 1 + > > sys/contrib/openzfs/config/user.m4 | 1 + > > sys/contrib/openzfs/config/zfs-build.m4 | 3 +- > > sys/contrib/openzfs/config/zfs-meta.m4 | 1 + > > sys/contrib/openzfs/contrib/Makefile.am | 1 + > > .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + > > .../contrib/debian/openzfs-libpam-zfs.install | 1 + > > .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- > > sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + > > .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + > > .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 278 +- > > sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + > > .../openzfs/contrib/pyzfs/docs/source/index.rst | 3 +- > > .../openzfs/contrib/pyzfs/libzfs_core/__init__.py | 10 - > > .../pyzfs/libzfs_core/_error_translation.py | 58 - > > .../contrib/pyzfs/libzfs_core/_libzfs_core.py | 350 +- > > .../pyzfs/libzfs_core/bindings/libzfs_core.py | 4 - > > .../pyzfs/libzfs_core/test/test_libzfs_core.py | 337 - > > sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + > > sys/contrib/openzfs/copy-builtin | 5 +- > > sys/contrib/openzfs/etc/Makefile.am | 1 + > > sys/contrib/openzfs/include/Makefile.am | 1 + > > sys/contrib/openzfs/include/libzfs.h | 10 +- > > sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + > > .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + > > sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + > > .../include/os/linux/kernel/linux/dcache_compat.h | 19 +- > > .../include/os/linux/kernel/linux/simd_x86.h | 14 + > > .../include/os/linux/kernel/linux/vfs_compat.h | 8 + > > .../include/os/linux/kernel/linux/xattr_compat.h | 17 + > > .../openzfs/include/os/linux/spl/sys/kmem.h | 5 +- > > sys/contrib/openzfs/include/sys/arc.h | 2 - > > sys/contrib/openzfs/include/sys/arc_impl.h | 38 + > > sys/contrib/openzfs/include/sys/btree.h | 9 +- > > sys/contrib/openzfs/include/sys/ddt.h | 5 + > > sys/contrib/openzfs/include/sys/dmu.h | 1 + > > sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + > > sys/contrib/openzfs/include/sys/fs/zfs.h | 24 +- > > sys/contrib/openzfs/include/sys/metaslab.h | 4 +- > > sys/contrib/openzfs/include/sys/metaslab_impl.h | 8 +- > > sys/contrib/openzfs/include/sys/mmp.h | 5 + > > sys/contrib/openzfs/include/sys/spa.h | 1 + > > sys/contrib/openzfs/include/sys/spa_impl.h | 4 + > > sys/contrib/openzfs/include/sys/uberblock_impl.h | 22 +- > > sys/contrib/openzfs/include/sys/vdev.h | 2 + > > sys/contrib/openzfs/include/sys/vdev_impl.h | 2 + > > sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +- > > sys/contrib/openzfs/lib/Makefile.am | 31 +- > > sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libbtree/Makefile.am | 6 + > > sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + > > sys/contrib/openzfs/lib/librange_tree/Makefile.am | 9 + > > sys/contrib/openzfs/lib/libshare/Makefile.am | 27 - > > sys/contrib/openzfs/lib/libshare/libshare_impl.h | 48 - > > sys/contrib/openzfs/lib/libshare/nfs.h | 38 - > > sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 +- > > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 +- > > .../openzfs/lib/libspl/include/sys/sysmacros.h | 29 +- > > sys/contrib/openzfs/lib/libunicode/Makefile.am | 6 - > > sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzfs/Makefile.am | 18 +- > > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 450 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 13 + > > sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 3 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 7 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 16 +- > > .../{libshare/libshare.c => libzfs/libzfs_share.c} | 3 +- > > .../include/libshare.h => libzfs/libzfs_share.h} | 80 +- > > .../{libshare/nfs.c => libzfs/libzfs_share_nfs.c} | 5 +- > > .../nfs.c => libzfs/os/freebsd/libzfs_share_nfs.c} | 5 +- > > .../smb.c => libzfs/os/freebsd/libzfs_share_smb.c} | 4 +- > > .../nfs.c => libzfs/os/linux/libzfs_share_nfs.c} | 4 +- > > .../smb.c => libzfs/os/linux/libzfs_share_smb.c} | 24 +- > > sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + > > .../openzfs/lib/libzfs_core/libzfs_core.abi | 11 +- > > sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzpool/Makefile.am | 14 +- > > .../openzfs/lib/libzpool/include/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzpool/kernel.c | 28 - > > sys/contrib/openzfs/lib/libzstd/Makefile.am | 7 + > > sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + > > sys/contrib/openzfs/man/Makefile.am | 2 + > > sys/contrib/openzfs/man/man4/zfs.4 | 36 +- > > sys/contrib/openzfs/man/man7/vdevprops.7 | 17 + > > sys/contrib/openzfs/man/man7/zfsprops.7 | 9 + > > sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 14 + > > sys/contrib/openzfs/man/man7/zpoolprops.7 | 15 + > > sys/contrib/openzfs/man/man8/pam_zfs_key.8 | 221 + > > sys/contrib/openzfs/man/man8/zfs-clone.8 | 4 +- > > sys/contrib/openzfs/man/man8/zfs-create.8 | 2 +- > > sys/contrib/openzfs/man/man8/zfs-load-key.8 | 4 + > > sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 + > > sys/contrib/openzfs/man/man8/zfs-rename.8 | 2 +- > > sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 19 +- > > sys/contrib/openzfs/man/man8/zfs.8 | 1 + > > sys/contrib/openzfs/module/Kbuild.in | 26 +- > > sys/contrib/openzfs/module/Makefile.bsd | 13 +- > > sys/contrib/openzfs/module/Makefile.in | 5 +- > > sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 1 + > > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 18 + > > .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 44 +- > > .../module/icp/asm-x86_64/modes/ghash-x86_64.S | 64 - > > .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 321 +- > > .../icp/include/modes/gcm_asm_rename_funcs.h} | 30 +- > > sys/contrib/openzfs/module/nvpair/nvpair.c | 4 +- > > .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 19 + > > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 + > > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +- > > .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 - > > .../openzfs/module/os/linux/spl/spl-atomic.c | 36 - > > .../openzfs/module/os/linux/spl/spl-generic.c | 258 - > > .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 8 +- > > sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 4 +- > > .../openzfs/module/os/linux/spl/spl-kstat.c | 3 - > > .../openzfs/module/os/linux/spl/spl-math-compat.c | 275 + > > .../openzfs/module/os/linux/spl/spl-trace.c | 2 - > > sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 16 + > > .../openzfs/module/os/linux/zfs/vdev_disk.c | 7 + > > .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 21 +- > > .../openzfs/module/os/linux/zfs/zpl_export.c | 87 +- > > sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 4 + > > .../openzfs/module/os/linux/zfs/zpl_inode.c | 26 + > > .../openzfs/module/os/linux/zfs/zpl_super.c | 63 + > > sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 + > > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 10 +- > > sys/contrib/openzfs/module/zcommon/zpool_prop.c | 17 + > > sys/contrib/openzfs/module/zfs/arc.c | 1347 ++-- > > sys/contrib/openzfs/module/zfs/btree.c | 17 +- > > sys/contrib/openzfs/module/zfs/dataset_kstats.c | 2 +- > > sys/contrib/openzfs/module/zfs/dbuf.c | 26 +- > > sys/contrib/openzfs/module/zfs/ddt.c | 95 +- > > sys/contrib/openzfs/module/zfs/ddt_log.c | 4 +- > > sys/contrib/openzfs/module/zfs/ddt_stats.c | 15 + > > sys/contrib/openzfs/module/zfs/dmu.c | 4 +- > > sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 + > > sys/contrib/openzfs/module/zfs/dmu_recv.c | 46 +- > > sys/contrib/openzfs/module/zfs/dmu_tx.c | 7 +- > > sys/contrib/openzfs/module/zfs/dsl_dataset.c | 8 +- > > sys/contrib/openzfs/module/zfs/metaslab.c | 72 +- > > sys/contrib/openzfs/module/zfs/mmp.c | 158 +- > > sys/contrib/openzfs/module/zfs/range_tree.c | 22 +- > > sys/contrib/openzfs/module/zfs/sa.c | 15 +- > > sys/contrib/openzfs/module/zfs/spa.c | 791 ++- > > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 5 +- > > sys/contrib/openzfs/module/zfs/spa_misc.c | 75 +- > > .../openzfs/module/{unicode => zfs}/u8_textprep.c | 0 > > sys/contrib/openzfs/module/zfs/vdev.c | 18 +- > > sys/contrib/openzfs/module/zfs/vdev_file.c | 3 + > > sys/contrib/openzfs/module/zfs/vdev_label.c | 10 +- > > sys/contrib/openzfs/module/zfs/vdev_queue.c | 40 + > > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 20 +- > > sys/contrib/openzfs/module/zfs/zcp_get.c | 8 + > > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 16 +- > > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 83 +- > > sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- > > sys/contrib/openzfs/module/zstd/README.md | 44 +- > > .../module/zstd/include/zstd_compat_wrapper.h | 271 +- > > .../openzfs/module/zstd/lib/common/allocations.h | 56 + > > sys/contrib/openzfs/module/zstd/lib/common/bits.h | 206 + > > .../openzfs/module/zstd/lib/common/bitstream.h | 210 +- > > .../openzfs/module/zstd/lib/common/compiler.h | 372 +- > > sys/contrib/openzfs/module/zstd/lib/common/cpu.h | 40 +- > > sys/contrib/openzfs/module/zstd/lib/common/debug.h | 57 +- > > .../module/zstd/lib/common/entropy_common.c | 220 +- > > .../openzfs/module/zstd/lib/common/error_private.c | 13 +- > > .../openzfs/module/zstd/lib/common/error_private.h | 104 +- > > sys/contrib/openzfs/module/zstd/lib/common/fse.h | 143 +- > > .../module/zstd/lib/common/fse_decompress.c | 206 +- > > sys/contrib/openzfs/module/zstd/lib/common/huf.h | 287 +- > > sys/contrib/openzfs/module/zstd/lib/common/mem.h | 284 +- > > sys/contrib/openzfs/module/zstd/lib/common/pool.c | 81 +- > > sys/contrib/openzfs/module/zstd/lib/common/pool.h | 25 +- > > .../module/zstd/lib/common/portability_macros.h | 172 + > > .../openzfs/module/zstd/lib/common/xxhash.c | 865 --- > > .../openzfs/module/zstd/lib/common/xxhash.h | 7199 +++++++++++++++++++- > > .../openzfs/module/zstd/lib/common/zstd_common.c | 44 +- > > .../openzfs/module/zstd/lib/common/zstd_deps.h | 124 + > > .../openzfs/module/zstd/lib/common/zstd_internal.h | 345 +- > > .../openzfs/module/zstd/lib/common/zstd_trace.h | 157 + > > .../openzfs/module/zstd/lib/compress/clevels.h | 135 + > > .../module/zstd/lib/compress/fse_compress.c | 249 +- > > .../openzfs/module/zstd/lib/compress/hist.c | 66 +- > > .../openzfs/module/zstd/lib/compress/hist.h | 11 +- > > .../module/zstd/lib/compress/huf_compress.c | 1240 +++- > > .../module/zstd/lib/compress/zstd_compress.c | 5917 ++++++++++++---- > > .../zstd/lib/compress/zstd_compress_internal.h | 1017 ++- > > .../zstd/lib/compress/zstd_compress_literals.c | 163 +- > > .../zstd/lib/compress/zstd_compress_literals.h | 22 +- > > .../zstd/lib/compress/zstd_compress_sequences.c | 75 +- > > .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- > > .../zstd/lib/compress/zstd_compress_superblock.c | 693 +- > > .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- > > .../openzfs/module/zstd/lib/compress/zstd_cwksp.h | 484 +- > > .../module/zstd/lib/compress/zstd_double_fast.c | 611 +- > > .../module/zstd/lib/compress/zstd_double_fast.h | 32 +- > > .../openzfs/module/zstd/lib/compress/zstd_fast.c | 1039 ++- > > .../openzfs/module/zstd/lib/compress/zstd_fast.h | 21 +- > > .../openzfs/module/zstd/lib/compress/zstd_lazy.c | 1665 ++++- > > .../openzfs/module/zstd/lib/compress/zstd_lazy.h | 184 +- > > .../openzfs/module/zstd/lib/compress/zstd_ldm.c | 608 +- > > .../openzfs/module/zstd/lib/compress/zstd_ldm.h | 27 +- > > .../module/zstd/lib/compress/zstd_ldm_geartab.h | 107 + > > .../openzfs/module/zstd/lib/compress/zstd_opt.c | 1004 ++- > > .../openzfs/module/zstd/lib/compress/zstd_opt.h | 58 +- > > .../module/zstd/lib/compress/zstd_preSplit.c | 239 + > > .../module/zstd/lib/compress/zstd_preSplit.h | 34 + > > .../module/zstd/lib/decompress/huf_decompress.c | 1858 +++-- > > .../zstd/lib/decompress/huf_decompress_amd64.S | 603 ++ > > .../module/zstd/lib/decompress/zstd_ddict.c | 24 +- > > .../module/zstd/lib/decompress/zstd_ddict.h | 4 +- > > .../module/zstd/lib/decompress/zstd_decompress.c | 897 ++- > > .../zstd/lib/decompress/zstd_decompress_block.c | 1565 +++-- > > .../zstd/lib/decompress/zstd_decompress_block.h | 24 +- > > .../zstd/lib/decompress/zstd_decompress_internal.h | 79 +- > > sys/contrib/openzfs/module/zstd/lib/zstd.h | 1848 ++++- > > .../module/zstd/lib/{common => }/zstd_errors.h | 45 +- > > sys/contrib/openzfs/module/zstd/zfs_zstd.c | 35 +- > > sys/contrib/openzfs/module/zstd/zstd-in.c | 93 +- > > sys/contrib/openzfs/rpm/Makefile.am | 1 + > > sys/contrib/openzfs/scripts/Makefile.am | 1 + > > sys/contrib/openzfs/scripts/objtool-wrapper.in | 4 +- > > sys/contrib/openzfs/scripts/spdxcheck.pl | 25 +- > > sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- > > sys/contrib/openzfs/tests/Makefile.am | 1 + > > sys/contrib/openzfs/tests/runfiles/common.run | 15 +- > > sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- > > sys/contrib/openzfs/tests/runfiles/sanity.run | 3 +- > > .../openzfs/tests/test-runner/bin/zts-report.py.in | 4 - > > sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + > > .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 2 +- > > .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 2 +- > > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- > > .../tests/zfs-tests/cmd/checksum/sha2_test.c | 39 +- > > .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 2 +- > > sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 + > > .../openzfs/tests/zfs-tests/include/commands.cfg | 5 +- > > .../openzfs/tests/zfs-tests/include/libtest.shlib | 54 +- > > .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- > > .../openzfs/tests/zfs-tests/tests/Makefile.am | 18 + > > .../bclone/bclone_crossfs_corner_cases.ksh | 9 + > > .../bclone/bclone_crossfs_corner_cases_limited.ksh | 9 + > > .../functional/bclone/bclone_crossfs_data.ksh | 7 + > > .../functional/bclone/bclone_crossfs_embedded.ksh | 7 + > > .../functional/bclone/bclone_diffprops_all.ksh | 28 +- > > .../bclone/bclone_diffprops_checksum.ksh | 18 +- > > .../bclone/bclone_diffprops_compress.ksh | 16 +- > > .../functional/bclone/bclone_diffprops_copies.ksh | 18 +- > > .../bclone/bclone_diffprops_recordsize.ksh | 18 +- > > .../tests/functional/bclone/bclone_prop_sync.ksh | 12 +- > > .../bclone/bclone_samefs_corner_cases.ksh | 7 + > > .../bclone/bclone_samefs_corner_cases_limited.ksh | 7 + > > .../tests/functional/bclone/bclone_samefs_data.ksh | 6 + > > .../functional/bclone/bclone_samefs_embedded.ksh | 6 + > > .../functional/block_cloning/block_cloning.kshlib | 24 - > > .../block_cloning_after_device_removal.ksh | 61 + > > .../tests/functional/cache/cache_012_pos.ksh | 5 + > > .../cli_root/zfs_clone/zfs_clone_nomount.ksh | 66 + > > .../zfs_rewrite/zfs_rewrite_skip_clone.ksh | 83 + > > .../zfs_rewrite/zfs_rewrite_skip_snapshot.ksh | 74 + > > .../zpool_create/zpool_create_tempname.ksh | 2 + > > .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + > > .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + > > .../cli_root/zpool_get/zpool_get_parsable.cfg | 4 +- > > .../cli_root/zpool_set/vdev_set_scheduler.ksh | 93 + > > .../zfs_send_delegation_user/zfs_send_usertest.ksh | 11 +- > > .../functional/events/zed_synchronous_zedlet.ksh | 6 +- > > .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 3 +- > > .../functional/l2arc/l2arc_dwpd_ratelimit_pos.ksh | 138 + > > .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh | 169 + > > .../l2arc/l2arc_multidev_scaling_pos.ksh | 162 + > > .../l2arc/l2arc_multidev_throughput_pos.ksh | 133 + > > .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + > > .../tests/functional/lease/lease_setlease.ksh | 44 + > > .../zfs-tests/tests/functional/lease/setup.ksh | 27 + > > .../tests/zfs-tests/tests/functional/mmp/mmp.cfg | 6 +- > > .../zfs-tests/tests/functional/mmp/mmp.kshlib | 47 +- > > .../tests/functional/mmp/mmp_active_import.ksh | 42 +- > > .../tests/functional/mmp/mmp_concurrent_import.ksh | 133 + > > .../tests/functional/mmp/mmp_exported_import.ksh | 16 +- > > .../zfs-tests/tests/functional/mmp/mmp_hostid.ksh | 8 +- > > .../tests/functional/mmp/mmp_inactive_import.ksh | 20 +- > > .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh | 4 +- > > .../tests/functional/mmp/mmp_on_thread.ksh | 4 +- > > .../tests/functional/mmp/mmp_on_uberblocks.ksh | 14 +- > > .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh | 3 +- > > .../tests/functional/mmp/mmp_reset_interval.ksh | 8 +- > > .../functional/mmp/mmp_write_distribution.ksh | 2 +- > > .../tests/functional/mmp/mmp_write_uberblocks.ksh | 4 +- > > .../tests/functional/mmp/multihost_history.ksh | 2 + > > .../tests/functional/mount/mount_loopback.ksh | 3 +- > > .../zfs-tests/tests/functional/pam/pam_basic.ksh | 58 + > > .../tests/functional/pam/pam_change_unmounted.ksh | 13 +- > > .../tests/functional/pam/pam_nounmount.ksh | 14 +- > > .../tests/zfs-tests/tests/functional/pam/setup.ksh | 11 + > > .../tests/functional/pam/utilities.kshlib.in | 6 + > > .../rsend/send_large_blocks_incremental.ksh | 83 + > > .../functional/rsend/send_large_blocks_initial.ksh | 86 + > > .../rsend/send_large_microzap_incremental.ksh | 91 + > > .../rsend/send_large_microzap_transitive.ksh | 100 + > > .../tests/functional/snapshot/snapshot_018_pos.ksh | 52 +- > > .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 5 +- > > sys/contrib/openzfs/udev/Makefile.am | 1 + > > sys/modules/dtrace/fasttrap/Makefile | 2 +- > > sys/modules/zfs/Makefile | 8 +- > > sys/modules/zfs/zfs_config.h | 24 +- > > sys/modules/zfs/zfs_gitrev.h | 2 +- > > 513 files changed, 34137 insertions(+), 10963 deletions(-) > > > > diff --cc cddl/lib/libzfs/Makefile > > index a034118a6f5b,000000000000..8f364d2c2bb1 > > mode 100644,000000..100644 > > --- a/cddl/lib/libzfs/Makefile > > +++ b/cddl/lib/libzfs/Makefile > > @@@ -1,109 -1,0 +1,105 @@@ > > +.PATH: ${ZFSTOP}/module/icp > > +.PATH: ${ZFSTOP}/module/zcommon > > +.PATH: ${ZFSTOP}/lib/libzfs > > +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd > > - .PATH: ${ZFSTOP}/lib/libshare > > +.PATH: ${ZFSTOP}/include > > +.PATH: ${ZFSTOP}/module/zstd > > +.PATH: ${ZFSTOP}/module/zstd/lib > > + > > +PACKAGE= zfs > > +LIB_PACKAGE= > > + > > +LIB= zfs > > +LIBADD= \ > > + avl \ > > + bsdxml \ > > + crypto \ > > + geom \ > > + m \ > > + md \ > > + nvpair \ > > + pthread \ > > + rt \ > > + umem \ > > + util \ > > + z \ > > + zfs_core \ > > + zutil > > + > > +INCS= libzfs.h > > +USER_C = \ > > - libzfs_changelist.c \ > > - libzfs_config.c \ > > - libzfs_crypto.c \ > > - libzfs_dataset.c \ > > - libzfs_diff.c \ > > - libzfs_import.c \ > > - libzfs_iter.c \ > > - libzfs_mount.c \ > > - libzfs_pool.c \ > > - libzfs_sendrecv.c \ > > - libzfs_status.c \ > > - libzfs_util.c > > ++ libzfs_changelist.c \ > > ++ libzfs_config.c \ > > ++ libzfs_crypto.c \ > > ++ libzfs_dataset.c \ > > ++ libzfs_diff.c \ > > ++ libzfs_import.c \ > > ++ libzfs_iter.c \ > > ++ libzfs_mount.c \ > > ++ libzfs_pool.c \ > > ++ libzfs_sendrecv.c \ > > ++ libzfs_share.c \ > > ++ libzfs_share_nfs.c \ > > ++ libzfs_status.c \ > > ++ libzfs_util.c \ > > ++ os/freebsd/libzfs_share_nfs.c \ > > ++ os/freebsd/libzfs_share_smb.c > > + > > +# FreeBSD > > +USER_C += \ > > + libzfs_compat.c \ > > + libzfs_zmount.c > > + > > - # libshare > > - USER_C += \ > > - libshare.c \ > > - nfs.c \ > > - os/freebsd/nfs.c \ > > - os/freebsd/smb.c > > - > > +KERNEL_C = \ > > + cityhash.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_valstr.c \ > > + zpool_prop.c \ > > + zprop_common.c > > + > > +ARCH_C = > > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > > +ARCH_C += zfs_fletcher_intel.c \ > > + zfs_fletcher_sse.c > > +CFLAGS += -DHAVE_SSE2 > > +.endif > > +.if ${MACHINE_ARCH} == "amd64" > > +ARCH_C += zfs_fletcher_avx512.c > > +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F > > +.endif > > +.if ${MACHINE_CPUARCH} == "aarch64" > > +ARCH_C += zfs_fletcher_aarch64_neon.c > > +.endif > > + > > +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) > > + > > +WARNS?= 2 > > +SHLIB_MAJOR= 4 > > +CSTD= c99 > > +CFLAGS+= -DIN_BASE > > +CFLAGS+= -I${ZFSTOP}/include > > +CFLAGS+= -I${ZFSTOP}/include/os/freebsd > > +CFLAGS+= -I${ZFSTOP}/lib/libspl/include > > +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd > > +CFLAGS+= -I${ZFSTOP}/lib/libshare > > +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include > > +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include > > +CFLAGS+= -I${SRCTOP}/sys > > +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+= -DHAVE_EXECVPE > > +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > > +CFLAGS+= -DSYSCONFDIR=\"/etc\" > > +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" > > +CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\" > > + > > +.include <bsd.lib.mk> > > diff --cc cddl/lib/libzpool/Makefile > > index ade864790f1c,000000000000..74a5f6ccb438 > > mode 100644,000000..100644 > > --- a/cddl/lib/libzpool/Makefile > > +++ b/cddl/lib/libzpool/Makefile > > @@@ -1,343 -1,0 +1,342 @@@ > > +.PATH: ${ZFSTOP}/lib/libzpool > > + > > +# 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 > > + > > +.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" > > +# Don't waste GOT entries on small data. > > +PICFLAG= -fPIC > > +.endif > > + > > +PACKAGE= zfs > > +LIB_PACKAGE= > > + > > +LIB= zpool > > + > > +USER_C = \ > > + arc_os.c \ > > + kernel.c \ > > + util.c \ > > + zfs_debug.c > > + > > +.PATH: ${ZFSTOP}/module/os/linux/zfs > > + > > +KERNEL_C = \ > > + simd_stat.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 \ > > + blake3_zfs.c \ > > + blkptr.c \ > > + bplist.c \ > > + bpobj.c \ > > + bptree.c \ > > + bqueue.c \ > > + btree.c \ > > + brt.c \ > > + cityhash.c \ > > + dbuf.c \ > > + dbuf_stats.c \ > > + ddt.c \ > > + ddt_log.c \ > > + ddt_stats.c \ > > + ddt_zap.c \ > > + dmu.c \ > > + dmu_diff.c \ > > + dmu_direct.c \ > > + dmu_object.c \ > > + dmu_objset.c \ > > + dmu_recv.c \ > > + dmu_redact.c \ > > + dmu_send.c \ > > + dmu_traverse.c \ > > + dmu_tx.c \ > > + dmu_zfetch.c \ > > + dnode.c \ > > + dnode_sync.c \ > > + dsl_bookmark.c \ > > + dsl_dataset.c \ > > + dsl_deadlist.c \ > > + dsl_deleg.c \ > > + dsl_dir.c \ > > + dsl_crypt.c \ > > + dsl_pool.c \ > > + dsl_prop.c \ > > + dsl_scan.c \ > > + dsl_synctask.c \ > > + dsl_destroy.c \ > > + dsl_userhold.c \ > > + edonr_zfs.c \ > > + entropy_common.c \ > > + error_private.c \ > > + fm.c \ > > + fse_compress.c \ > > + fse_decompress.c \ > > + gzip.c \ > > + hist.c \ > > + hkdf.c \ > > + huf_compress.c \ > > + huf_decompress.c \ > > + lzjb.c \ > > + lz4.c \ > > + lz4_zfs.c \ > > + metaslab.c \ > > + mmp.c \ > > + multilist.c \ > > + objlist.c \ > > + pathname.c \ > > + pool.c \ > > + range_tree.c \ > > + refcount.c \ > > + rrwlock.c \ > > + sa.c \ > > + sha2_zfs.c \ > > + skein_zfs.c \ > > + spa.c \ > > + spa_checkpoint.c \ > > + spa_config.c \ > > + spa_errlog.c \ > > + spa_history.c \ > > + spa_log_spacemap.c \ > > + spa_misc.c \ > > + spa_stats.c \ > > + space_map.c \ > > + space_reftree.c \ > > + txg.c \ > > ++ u8_textprep.c \ > > + trace.c \ > > + uberblock.c \ > > + unique.c \ > > + vdev.c \ > > + vdev_draid.c \ > > + vdev_draid_rand.c \ > > + vdev_file.c \ > > + vdev_indirect_births.c \ > > + vdev_indirect.c \ > > + vdev_indirect_mapping.c \ > > + vdev_initialize.c \ > > + vdev_label.c \ > > + vdev_label_os.c \ > > + vdev_mirror.c \ > > + vdev_missing.c \ > > + vdev_queue.c \ > > + vdev_raidz.c \ > > + vdev_raidz_math_aarch64_neon.c \ > > + vdev_raidz_math_aarch64_neonx2.c \ > > + vdev_raidz_math_avx2.c \ > > + vdev_raidz_math_avx512bw.c \ > > + vdev_raidz_math_avx512f.c \ > > + vdev_raidz_math.c \ > > + vdev_raidz_math_scalar.c \ > > + vdev_rebuild.c \ > > + vdev_removal.c \ > > + vdev_root.c \ > > + vdev_trim.c \ > > - xxhash.c \ > > + zap.c \ > > + zap_leaf.c \ > > + zap_micro.c \ > > + zcp.c \ > > + zcp_get.c \ > > + zcp_global.c \ > > + zcp_iter.c \ > > + zcp_set.c \ > > + zcp_synctask.c \ > > + zfeature.c \ > > + zfs_byteswap.c \ > > + zfs_chksum.c \ > > + zfs_crrd.c \ > > + zfs_debug_common.c \ > > + zfs_fm.c \ > > + zfs_fuid.c \ > > + zfs_impl.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 \ > > ++ zstd_preSplit.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 > > - > > - SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > > ++SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C} > > + > > *** 15577 LINES SKIPPED *** > > > > buildworld failure after commit, immintrin.h not found error: > > [...] > In file included from /usr/src/sys/contrib/openzfs/module/zstd/lib/common/fse.h:230: > /usr/src/sys/contrib/openzfs/module/zstd/lib/common/bitstream.h:38:14: fatal error: > 'immintrin.h' file not found 38 | # include <immintrin.h> /* support for bextr > (experimental)/bzhi */ > > Kind regards, > oh > > Correction: buildkernel fails. ZFS is, btw, built statically into the kernel. -- A FreeBSD user [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCabZepAAKCRCxzvs8Oqok r0Q7AQDbCfolWwG8r7FQOR7aG0zatbuPuA3cWwiPiAfogdl+FAEAjl2pcO4P4geO dyqKAxjSBCDwI19ALM66gKXt7MEB0gA= =XJGM -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20260315082420.01da7a33>