diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-06-23 18:47:42 +0300 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-06-23 18:49:33 +0300 |
| commit | 1f1e2261e341e6ca6862f82261066ef1705f0a7a (patch) | |
| tree | a716a986e2b73d9496b08386e621059ac76e0e0e /cddl | |
| parent | a320e9dd51e6e58715a1390f2e00790a94017dfb (diff) | |
| parent | deb1213098e2dc10e6eee5e5c57bb40584e096a6 (diff) | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libicp/Makefile | 29 | ||||
| -rw-r--r-- | cddl/lib/libicp_rescue/Makefile | 29 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
3 files changed, 58 insertions, 2 deletions
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 6a8e979ea836..5b316453af9a 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -16,9 +16,23 @@ ASM_SOURCES_AS = \ asm-x86_64/modes/aesni-gcm-x86_64.S \ asm-x86_64/modes/ghash-x86_64.S \ asm-x86_64/sha2/sha256_impl.S \ - asm-x86_64/sha2/sha512_impl.S + asm-x86_64/sha2/sha512_impl.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ + asm-aarch64/blake3/b3_aarch64_sse41.S +.elif ${MACHINE_ARCH} == "powerpc64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ + asm-ppc64/blake3/b3_ppc64le_sse41.S .else ASM_SOURCES_C = ASM_SOURCES_AS = @@ -35,6 +49,10 @@ KERNEL_C = \ algs/aes/aes_impl_x86-64.c \ algs/aes/aes_impl.c \ algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ + algs/blake3/blake3_x86-64.c \ algs/edonr/edonr.c \ algs/modes/modes.c \ algs/modes/cbc.c \ @@ -88,5 +106,14 @@ CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE + .include <bsd.lib.mk> diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index d3e69d276d17..3fd098bc86ed 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -15,9 +15,23 @@ ASM_SOURCES_AS = \ asm-x86_64/modes/gcm_pclmulqdq.S \ asm-x86_64/modes/aesni-gcm-x86_64.S \ asm-x86_64/sha2/sha256_impl.S \ - asm-x86_64/sha2/sha512_impl.S + asm-x86_64/sha2/sha512_impl.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ + asm-aarch64/blake3/b3_aarch64_sse41.S +.elif ${MACHINE_ARCH} == "powerpc64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ + asm-ppc64/blake3/b3_ppc64le_sse41.S .else ASM_SOURCES_C = ASM_SOURCES_AS = @@ -34,6 +48,10 @@ KERNEL_C = \ algs/aes/aes_impl_x86-64.c \ algs/aes/aes_impl.c \ algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ + algs/blake3/blake3_x86-64.c \ algs/edonr/edonr.c \ algs/modes/modes.c \ algs/modes/cbc.c \ @@ -81,5 +99,14 @@ CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE + .include <bsd.lib.mk> diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 69700ec51407..92f1bda6d82a 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -56,6 +56,7 @@ KERNEL_C = \ aggsum.c \ arc.c \ arc_os.c \ + blake3_zfs.c \ blkptr.c \ bplist.c \ bpobj.c \ @@ -169,6 +170,7 @@ KERNEL_C = \ zcp_synctask.c \ zfeature.c \ zfs_byteswap.c \ + zfs_chksum.c \ zfs_debug.c \ zfs_fm.c \ zfs_fuid.c \ |