Diffusion FreeBSD src repository 1f1e2261e341

zfs: merge openzfs/zfs@deb121309
1f1e2261e341
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@deb121309

Notable upstream pull request merges:

#12918 Introduce BLAKE3 checksums as an OpenZFS feature
#13553 Reduce ZIO io_lock contention on sorted scrub
#13537 Improve sorted scan memory accounting
#13540 AVL: Remove obsolete branching optimizations
#13563 FreeBSD: Improve crypto_dispatch() handling

Obtained from: OpenZFS
OpenZFS commit: deb1213098e2dc10e6eee5e5c57bb40584e096a6

Details

Provenance

mm	Authored on Jun 23 2022, 3:47 PM

Parents

rGa320e9dd51e6: bsdinstall: improve zfsboots ability to handle datasets under a BE
rGdeb1213098e2: Fix memory allocation issue for BLAKE3 context

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG1f1e2261e341: zfs: merge openzfs/zfs@deb121309 (authored by mm).Jun 23 2022, 3:49 PM

mm mentioned this in rGd1aefbc04c84: zfs: fix static module build broken in 1f1e2261e.Jun 23 2022, 5:47 PM

jrtc27 mentioned this in rG9921563f43a9: libicp: Fix build for powerpc64le.Jul 1 2022, 12:33 AM

jrtc27 mentioned this in rGb0a8333a883b: libicp_rescue: Fix build for powerpc64le.Jul 1 2022, 3:31 AM

Merged Changes

deb1213098e2 Fix memory allocation issue for BLAKE3 context
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
b17663f571bf Remove install of zfs-load-module.service for dracut
Author
Matthew Thode <mthode@mthode.org>
Browse Repository
No Builds
No Audits
d51f4ea5f957 FreeBSD: Improve crypto_dispatch() handling
Author
mav
Browse Repository
No Builds
No Audits
f60973998593 expose snapshot count via stat(2) of .zfs/snapshot (#13559)
Author
andrew
Browse Repository
No Builds
No Audits
10891b37fa8f libzfs: Prevent overridding of error code
Author
ixhamza <106930537+ixhamza@users.noreply.github.com>
Browse Repository
No Builds
No Audits
dd8671459f59 Reduce ZIO io_lock contention on sorted scrub
Author
mav
Browse Repository
No Builds
No Audits
bc00d2c711c5 Add support for ARCH=um for x86 sub-architectures
Author
crass <development@efficientek.com>
Browse Repository
No Builds
No Audits
988431966639 Fix clang 13 compilation errors
Author
Damian Szuberski <szuberskidamian@gmail.com>
Browse Repository
No Builds
No Audits
4ff7a8fa2f1e Replace ZPROP_INVAL with ZPROP_USERPROP where it means a user property
Author
allanjude
Browse Repository
No Builds
No Audits
9e605cf15504 spl: Use a clearer name for the user namespace fd
Author
freqlabs
Browse Repository
No Builds
No Audits
def1a401f44a libzfs: zfs_userns: Don't leak the namespace fd
Author
freqlabs
Browse Repository
No Builds
No Audits
482505fd4219 Add weekly and monthly systemd timers for trimming
Author
Julian Brunner <julian.brunner@gmail.com>
Browse Repository
No Builds
No Audits
87b46d63b283 Improve sorted scan memory accounting
Author
mav
Browse Repository
No Builds
No Audits
4ed5e25074ff Add Linux namespace delegation support
Author
will
Browse Repository
No Builds
No Audits
a1aa8f14c864 Revert parts of 938cfeb0f27303721081223816d4f251ffeb1767
Author
allanjude
Browse Repository
No Builds
No Audits
fc5200aa9b34 AVL: Remove obsolete branching optimizations
Author
mav
Browse Repository
No Builds
No Audits
cdeb98a116a3 libzfs: Rename msg bufs to errbuf for consistency
Author
freqlabs
Browse Repository
No Builds
No Audits
d68a2bfa994d libzfs: Define the defecto standard errbuf size
Author
freqlabs
Browse Repository
No Builds
No Audits
6f73d02168ea zvol: Support blk-mq for better performance
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
985c33b132f6 Introduce BLAKE3 checksums as an OpenZFS feature
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits

Changes (136)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

cddl/

lib/

libicp/

libicp_rescue/

libzpool/

sys/

contrib/

openzfs/

cmd/

zfs/

zpool/

config/

kernel-add-disk.m4

kernel-blk-queue.m4

kernel-user-ns-inum.m4

contrib/

dracut/

90zfs/

module-setup.sh.in

pyzfs/

libzfs_core/

etc/

systemd/

system/

zfs-trim-monthly@.timer.in

zfs-trim-weekly@.timer.in

zfs-trim@.service.in

include/

os/

freebsd/

spl/

sys/

linux/

kernel/

linux/

blkdev_compat.h

spl/

sys/

zfs/

sys/

zfs_context_os.h

sys/

fs/

zfeature_common.h

	include/	sys/	zfs_chksum.h/
	lib/	libspl/	include/


	zone.h

lib/

libicp/

libspl/

include/

sys/

os/

linux/

libuutil/

libzfs/

libzfs_crypto.c

libzfs_dataset.c

libzfs_sendrecv.c

os/

freebsd/

libzfs_compat.c

linux/

libzfs_pool_os.c

libzfs_util_os.c

libzfs_core/

libzfs_core.abi

libzpool/

man/

man4/

man7/

zpool-features.7

man8/

module/

avl/

icp/

algs/

blake3/

blake3_generic.c

blake3_x86-64.c

b3_aarch64_sse2.S

b3_aarch64_sse41.S

b3_ppc64le_sse2.S

b3_ppc64le_sse41.S

asm-x86_64/

blake3/

blake3_avx512.S

os/

freebsd/

zfs/

linux/

spl/

zfs/

zcommon/

zfeature_common.c

zfs/

tests/

runfiles/

zfs-tests/

cmd/

checksum/

include/

properties.shlib

tests/

functional/

checksum/

run_blake3_test.ksh

cli_root/

zfs_set/

checksum_001_pos.ksh

zpool_get/

user_namespace/

user_namespace_001.ksh

user_namespace_002.ksh

user_namespace_003.ksh

user_namespace_004.ksh

zvol/

zvol_common.shlib

zvol_misc/

zvol_misc_fua.ksh

zvol_misc_trim.ksh

zvol_stress.ksh

	zvol/	zvol_stress/
		checksum/

	cleanup.ksh
	default.cfg

	setup.ksh
	default.cfg

modules/

zfs/

rG1f1e2261e341

cddl/lib/libicp/Makefile

cddl/lib/libicp_rescue/Makefile

cddl/lib/libzpool/Makefile

sys/contrib/openzfs/AUTHORS

sys/contrib/openzfs/cmd/zfs/zfs_iter.c

sys/contrib/openzfs/cmd/zfs/zfs_main.c

sys/contrib/openzfs/cmd/zpool/zpool_main.c

sys/contrib/openzfs/cmd/ztest.c

sys/contrib/openzfs/config/always-arch.m4

sys/contrib/openzfs/config/kernel-add-disk.m4

sys/contrib/openzfs/config/kernel-blk-queue.m4

sys/contrib/openzfs/config/kernel-user-ns-inum.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in

sys/contrib/openzfs/contrib/pyzfs/libzfs_core/_constants.py

sys/contrib/openzfs/etc/Makefile.am

sys/contrib/openzfs/etc/systemd/system/zfs-trim-monthly@.timer.in

sys/contrib/openzfs/etc/systemd/system/zfs-trim-weekly@.timer.in

sys/contrib/openzfs/etc/systemd/system/zfs-trim@.service.in

sys/contrib/openzfs/include/Makefile.am

sys/contrib/openzfs/include/libzfs.h

sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h

sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h

sys/contrib/openzfs/include/os/linux/kernel/linux/simd_powerpc.h

sys/contrib/openzfs/include/os/linux/kernel/linux/vfs_compat.h

sys/contrib/openzfs/include/os/linux/spl/sys/uio.h

sys/contrib/openzfs/include/os/linux/spl/sys/zone.h

sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_context_os.h

sys/contrib/openzfs/include/sys/blake3.h

sys/contrib/openzfs/include/sys/fs/zfs.h

sys/contrib/openzfs/include/sys/zfs_chksum.h

sys/contrib/openzfs/include/sys/zfs_ioctl.h

sys/contrib/openzfs/include/sys/zio.h

sys/contrib/openzfs/include/sys/zio_checksum.h

sys/contrib/openzfs/include/zfeature_common.h

sys/contrib/openzfs/lib/libicp/Makefile.am

sys/contrib/openzfs/lib/libspl/include/sys/simd.h

sys/contrib/openzfs/lib/libspl/include/sys/types.h

sys/contrib/openzfs/lib/libspl/include/zone.h

sys/contrib/openzfs/lib/libspl/os/linux/zone.c

sys/contrib/openzfs/lib/libuutil/libuutil.abi

sys/contrib/openzfs/lib/libzfs/libzfs.abi

sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c

sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c

sys/contrib/openzfs/lib/libzfs/libzfs_diff.c

sys/contrib/openzfs/lib/libzfs/libzfs_impl.h

sys/contrib/openzfs/lib/libzfs/libzfs_pool.c

sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c

sys/contrib/openzfs/lib/libzfs/libzfs_util.c

sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c

sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_pool_os.c

sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_util_os.c

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi

sys/contrib/openzfs/lib/libzpool/Makefile.am

sys/contrib/openzfs/man/Makefile.am

sys/contrib/openzfs/man/man4/zfs.4

sys/contrib/openzfs/man/man7/zfsprops.7

sys/contrib/openzfs/man/man7/zpool-features.7

sys/contrib/openzfs/man/man8/zfs-unzone.8

sys/contrib/openzfs/man/man8/zfs-zone.8

sys/contrib/openzfs/man/man8/zpool-trim.8

sys/contrib/openzfs/module/Kbuild.in

sys/contrib/openzfs/module/Makefile.bsd

sys/contrib/openzfs/module/avl/avl.c

sys/contrib/openzfs/module/icp/algs/blake3/blake3.c

sys/contrib/openzfs/module/icp/algs/blake3/blake3_generic.c

sys/contrib/openzfs/module/icp/algs/blake3/blake3_impl.c

sys/contrib/openzfs/module/icp/algs/blake3/blake3_impl.h

sys/contrib/openzfs/module/icp/algs/blake3/blake3_x86-64.c

sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S

sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S

sys/contrib/openzfs/module/icp/asm-ppc64/blake3/b3_ppc64le_sse2.S

sys/contrib/openzfs/module/icp/asm-ppc64/blake3/b3_ppc64le_sse41.S

sys/contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx2.S

sys/contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx512.S

sys/contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse2.S

sys/contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse41.S

sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c

sys/contrib/openzfs/module/os/linux/spl/spl-generic.c

sys/contrib/openzfs/module/os/linux/spl/spl-zone.c

sys/contrib/openzfs/module/os/linux/zfs/policy.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_ctldir.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_xattr.c

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

sys/contrib/openzfs/module/zcommon/zfeature_common.c

sys/contrib/openzfs/module/zcommon/zfs_prop.c

sys/contrib/openzfs/module/zfs/blake3_zfs.c

sys/contrib/openzfs/module/zfs/dsl_prop.c

sys/contrib/openzfs/module/zfs/dsl_scan.c

sys/contrib/openzfs/module/zfs/spa_misc.c

sys/contrib/openzfs/module/zfs/vdev.c

sys/contrib/openzfs/module/zfs/zcp_synctask.c

sys/contrib/openzfs/module/zfs/zfs_chksum.c

sys/contrib/openzfs/module/zfs/zfs_ioctl.c

sys/contrib/openzfs/module/zfs/zio_checksum.c

sys/contrib/openzfs/tests/runfiles/common.run

sys/contrib/openzfs/tests/runfiles/linux.run

sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore

sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/cmd/checksum/blake3_test.c

sys/contrib/openzfs/tests/zfs-tests/cmd/checksum/edonr_test.c

sys/contrib/openzfs/tests/zfs-tests/cmd/checksum/sha2_test.c

sys/contrib/openzfs/tests/zfs-tests/cmd/checksum/skein_test.c

sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg

sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib

sys/contrib/openzfs/tests/zfs-tests/include/properties.shlib

sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg

sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/checksum/default.cfg

sys/contrib/openzfs/tests/zfs-tests/tests/functional/checksum/run_blake3_test.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/checksum_001_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg

sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_001.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_002.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_003.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_common.shlib

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/cleanup.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/setup.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_stress/zvol_stress.ksh

sys/modules/zfs/Makefile

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h