Date: Wed, 19 Nov 2025 07:47:14 +0000 From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 709465f2c4f1 - stable/14 - zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 Message-ID: <691d7602.2e615.4803bdc7@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=709465f2c4f12fe9b820ca8097de9021bff0c84b commit 709465f2c4f12fe9b820ca8097de9021bff0c84b Merge: 18391412cecf 079ba86d7157 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2025-11-18 23:29:00 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2025-11-18 23:29:00 +0000 zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.9 Notable upstream pull request merges: #16025 fdc683e86 dnode_next_offset: backtrack if lower level does not match #16197 67ea51710 Several improvements to ARC shrinking #16401 10208765e Soften pruning threshold on not evictable metadata #17434 1ced0ff5d Reduce zfs_dmu_offset_next_sync penalty #17542 2910b5f5c enforce arc_dnode_limit #17561 3a8e23d0f Skip dbuf_evict_one() from dbuf_evict_notify() for reclaim thread #17758 5e10fb6d7 Add interface to interface spa_get_worst_case_min_alloc() function #17563 91f3622a2 Faster checksum benchmark on system boot #17765 6a02c0994 zvol: Fix blk-mq sync #17780 3167b0db1 Fix 'zpool add' safety check corner cases #17904 6e4acd789 zstd: disable intrinsics #17915 5a77c19c8 BRT: Fix ranges to blocks conversion math Obtained from: OpenZFS OpenZFS commit: 079ba86d71571bf997ff688da061d8c4aa2fd052 OpenZFS tag: zfs-2.2.9 .../.github/ISSUE_TEMPLATE/feature_request.md | 2 +- .../openzfs/.github/PULL_REQUEST_TEMPLATE.md | 5 - sys/contrib/openzfs/.github/codeql-cpp.yml | 1 + .../cpp/dslDatasetHoldReleMismatch.ql | 34 ++++ .../.github/workflows/scripts/generate-ci-type.py | 12 +- .../.github/workflows/scripts/qemu-1-setup.sh | 10 ++ .../.github/workflows/scripts/qemu-2-start.sh | 178 ++++++++++++------- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 16 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 23 ++- .../.github/workflows/scripts/qemu-5-setup.sh | 39 ++++- .../.github/workflows/scripts/qemu-6-tests.sh | 8 +- .../.github/workflows/zfs-qemu-packages.yml | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 75 ++++---- sys/contrib/openzfs/.github/workflows/zloop.yml | 24 +-- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 47 ++++- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 +++- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 26 +-- sys/contrib/openzfs/config/ax_python_devel.m4 | 4 +- .../openzfs/config/kernel-dentry-operations.m4 | 10 +- sys/contrib/openzfs/config/kernel-objtool.m4 | 17 ++ .../config/kernel-pagemap-readahead-page.m4 | 23 +++ ...kernel-readpages.m4 => kernel-vfs-readpages.m4} | 0 sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 24 +++ sys/contrib/openzfs/config/kernel.m4 | 4 + sys/contrib/openzfs/config/user-statx.m4 | 34 ++++ sys/contrib/openzfs/config/user.m4 | 1 + sys/contrib/openzfs/config/zfs-build.m4 | 136 +++++++++----- sys/contrib/openzfs/configure.ac | 2 + sys/contrib/openzfs/contrib/debian/rules.in | 6 +- sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 3 +- sys/contrib/openzfs/contrib/intel_qat/readme.md | 2 +- .../pyzfs/libzfs_core/test/test_libzfs_core.py | 2 +- sys/contrib/openzfs/etc/init.d/README.md | 2 +- .../openzfs/include/os/freebsd/spl/sys/misc.h | 5 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/blkdev_compat.h | 18 -- .../include/os/linux/kernel/linux/dcache_compat.h | 26 --- .../include/os/linux/kernel/linux/pagemap_compat.h | 36 ++++ .../openzfs/include/os/linux/spl/sys/misc.h | 6 + sys/contrib/openzfs/include/sys/arc_impl.h | 6 +- sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/spa_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 5 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/stat.h | 5 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 ++++ .../openzfs/lib/libspl/os/linux/getmntany.c | 36 +++- sys/contrib/openzfs/man/man4/zfs.4 | 7 + sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 40 ++--- sys/contrib/openzfs/module/Makefile.in | 1 + .../openzfs/module/os/freebsd/spl/spl_misc.c | 9 + sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 13 +- .../openzfs/module/os/linux/spl/spl-thread.c | 12 ++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 88 +++++----- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 65 +++++++ .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 56 +++++- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 102 ++++++++--- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 68 +++++-- sys/contrib/openzfs/module/zfs/arc.c | 152 +++++++++------- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +- sys/contrib/openzfs/module/zfs/dmu.c | 16 +- sys/contrib/openzfs/module/zfs/dnode.c | 65 +++++-- sys/contrib/openzfs/module/zfs/spa_config.c | 2 + sys/contrib/openzfs/module/zfs/spa_misc.c | 15 ++ sys/contrib/openzfs/module/zfs/vdev.c | 15 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 2 + sys/contrib/openzfs/module/zfs/zfs_chksum.c | 69 +++++--- .../openzfs/module/zstd/include/aarch64_compat.h | 37 ---- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/scripts/.gitignore | 1 + sys/contrib/openzfs/scripts/objtool-wrapper.in | 36 ++++ sys/contrib/openzfs/scripts/zfs-tests.sh | 9 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- .../tests/test-runner/bin/test-runner.py.in | 61 +++++++ .../openzfs/tests/zfs-tests/tests/Makefile.am | 4 +- .../tests/functional/acl/off/posixmode.ksh | 2 +- .../tests/functional/arc/dbufstats_001_pos.ksh | 4 +- .../tests/functional/arc/dbufstats_002_pos.ksh | 2 +- .../cli_root/zfs_send/zfs_send_007_pos.ksh | 4 +- .../functional/cli_root/zpool_add/zpool_add.kshlib | 42 +++++ ...l_add_010_pos.ksh => zpool_add_warn_create.ksh} | 100 ++--------- .../cli_root/zpool_add/zpool_add_warn_degraded.ksh | 195 +++++++++++++++++++++ .../cli_root/zpool_add/zpool_add_warn_removal.ksh | 117 +++++++++++++ .../zpool_import/zpool_import_rename_001_pos.ksh | 2 +- .../functional/redacted_send/redacted_panic.ksh | 2 +- .../tests/functional/snapshot/snapshot_002_pos.ksh | 2 +- .../tests/functional/snapshot/snapshot_006_pos.ksh | 2 +- .../user_namespace/user_namespace_004.ksh | 2 +- .../functional/zvol/zvol_misc/zvol_misc_fua.ksh | 44 ++++- .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 11 +- .../functional/zvol/zvol_stress/zvol_stress.ksh | 2 +- 97 files changed, 1864 insertions(+), 661 deletions(-) diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql index 000000000000,fb5dae35092f..fb5dae35092f mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql +++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql diff --cc sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 index 000000000000,30f3d56682fb..30f3d56682fb mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 +++ b/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 diff --cc sys/contrib/openzfs/config/kernel-vfs-writepage.m4 index 000000000000,d438e85b457c..d438e85b457c mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 +++ b/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 diff --cc sys/contrib/openzfs/config/user-statx.m4 index 000000000000,0315f93e0c20..0315f93e0c20 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-statx.m4 +++ b/sys/contrib/openzfs/config/user-statx.m4 diff --cc sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h index 000000000000,a0465ede0105..a0465ede0105 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h +++ b/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/scripts/objtool-wrapper.in index 000000000000,0451f8718233..0451f8718233 mode 000000,100644..100644 --- a/sys/contrib/openzfs/scripts/objtool-wrapper.in +++ b/sys/contrib/openzfs/scripts/objtool-wrapper.in diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh index 000000000000,ded9cb3c68f8..ded9cb3c68f8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh index 000000000000,56feaf1f9965..56feaf1f9965 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.kshhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?691d7602.2e615.4803bdc7>