From nobody Thu Jun 30 23:22:33 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 41A9387A256 for ; Thu, 30 Jun 2022 23:22:43 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYvWQ2c5dz3lTH for ; Thu, 30 Jun 2022 23:22:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f48.google.com with SMTP id t17-20020a1c7711000000b003a0434b0af7so547550wmi.0 for ; Thu, 30 Jun 2022 16:22:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=hX0UnDk6Dh2WqbV3FiLBDz9q7P6COWMmPl9v49Piexw=; b=vzNQ5rsolSgtqHABErW019JTtmpiyQPYlyx1y0y7nDm4zseGKLHwDRHvf8UcRpmhpv 5CLtDWQq2gznnPrYEffpCpJDu3rfFMGWx9NSwR+j5hHG34rExMIkkeh8yO3RYw0v3INg D4yR05D2TU13wyoO685JB0Li3MrXivMYvMkaqetBMKXKRKOPG6TCi12OLOsWxlgPYBAX Fx6WZ9gCagKMGtu4Ja99JZQzB1vpbTkbBOC1uQ0pj/Qexa0fvdQxYcUri4UEywL8/I8M OY0Tk4QSvip1hZgUEsC2hDLHuZEqKQ/BeXp4NIapDzcqyVyDOBUzgnYsQZ5oDoQz4eit TJ2w== X-Gm-Message-State: AJIora+2y2yZiwonCcpDASYvZQ2V24lc2+eJ/NR5MveHK4uMyqTi0a3y FuHbxV65RM4++f75jOBATo9cNnD0WXirJA== X-Google-Smtp-Source: AGRyM1sF4x5sFwC3LiL6KOREM/lIEhu66Sxg4ojJy6KTKjjuvUrxGxHSLEVW/7fFUabPTXfsw56bLg== X-Received: by 2002:a05:600c:3491:b0:3a0:4d4a:2e2d with SMTP id a17-20020a05600c349100b003a04d4a2e2dmr15178641wmq.4.1656631355137; Thu, 30 Jun 2022 16:22:35 -0700 (PDT) Received: from smtpclient.apple (global-5-142.nat-2.net.cam.ac.uk. [131.111.5.142]) by smtp.gmail.com with ESMTPSA id 190-20020a1c19c7000000b003a04912351fsm8564107wmz.17.2022.06.30.16.22.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 16:22:33 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.80.82.1.1\)) Subject: Re: git: 1f1e2261e341 - main - zfs: merge openzfs/zfs@deb121309 From: Jessica Clarke In-Reply-To: <202206231550.25NFoBPQ012478@gitrepo.freebsd.org> Date: Fri, 1 Jul 2022 00:22:33 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <46C9AB26-0266-4E59-867F-3D57177E4AED@freebsd.org> References: <202206231550.25NFoBPQ012478@gitrepo.freebsd.org> To: Martin Matuska X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4LYvWQ2c5dz3lTH X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-1.79 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.58)[-0.582]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.70)[-0.704]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.48:from]; MLMMJ_DEST(0.00)[dev-commits-src-main]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.48:from]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 23 Jun 2022, at 16:50, Martin Matuska wrote: >=20 > The branch main has been updated by mm: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1f1e2261e341e6ca6862f82261066ef1= 705f0a7a >=20 > commit 1f1e2261e341e6ca6862f82261066ef1705f0a7a > Merge: a320e9dd51e6 deb1213098e2 > Author: Martin Matuska > AuthorDate: 2022-06-23 15:47:42 +0000 > Commit: Martin Matuska > CommitDate: 2022-06-23 15:49:33 +0000 >=20 > zfs: merge openzfs/zfs@deb121309 >=20 > 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 >=20 > Obtained from: OpenZFS > OpenZFS commit: deb1213098e2dc10e6eee5e5c57bb40584e096a6 >=20 > cddl/lib/libicp/Makefile | 29 +- > cddl/lib/libicp_rescue/Makefile | 29 +- > cddl/lib/libzpool/Makefile | 2 + > sys/contrib/openzfs/AUTHORS | 1 + > sys/contrib/openzfs/cmd/zfs/zfs_iter.c | 6 +- > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 68 +- > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 4 +- > sys/contrib/openzfs/cmd/ztest.c | 89 + > sys/contrib/openzfs/config/always-arch.m4 | 2 + > sys/contrib/openzfs/config/kernel-add-disk.m4 | 3 +- > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 32 + > sys/contrib/openzfs/config/kernel-user-ns-inum.m4 | 23 + > sys/contrib/openzfs/config/kernel.m4 | 2 + > .../contrib/dracut/90zfs/module-setup.sh.in | 3 +- > .../contrib/pyzfs/libzfs_core/_constants.py | 1 + > sys/contrib/openzfs/etc/Makefile.am | 3 + > .../etc/systemd/system/zfs-trim-monthly@.timer.in | 12 + > .../etc/systemd/system/zfs-trim-weekly@.timer.in | 12 + > .../etc/systemd/system/zfs-trim@.service.in | 15 + > sys/contrib/openzfs/include/Makefile.am | 2 + > sys/contrib/openzfs/include/libzfs.h | 10 + > .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 2 + > .../include/os/linux/kernel/linux/blkdev_compat.h | 111 + > .../include/os/linux/kernel/linux/simd_powerpc.h | 34 +- > .../include/os/linux/kernel/linux/vfs_compat.h | 16 - > sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 39 +- > .../openzfs/include/os/linux/spl/sys/zone.h | 31 +- > .../include/os/linux/zfs/sys/zfs_context_os.h | 5 + > sys/contrib/openzfs/include/sys/blake3.h | 125 + > sys/contrib/openzfs/include/sys/fs/zfs.h | 6 +- > sys/contrib/openzfs/include/sys/zfs_chksum.h | 48 + > sys/contrib/openzfs/include/sys/zfs_ioctl.h | 3 +- > sys/contrib/openzfs/include/sys/zio.h | 1 + > sys/contrib/openzfs/include/sys/zio_checksum.h | 12 +- > sys/contrib/openzfs/include/zfeature_common.h | 1 + > sys/contrib/openzfs/lib/libicp/Makefile.am | 25 +- > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 + > sys/contrib/openzfs/lib/libspl/include/sys/types.h | 2 +- > sys/contrib/openzfs/lib/libspl/include/zone.h | 12 +- > sys/contrib/openzfs/lib/libspl/os/linux/zone.c | 32 +- > sys/contrib/openzfs/lib/libuutil/libuutil.abi | 2 +- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 18 +- > sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 10 +- > sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 64 +- > sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 2 +- > sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 4 +- > sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 299 +- > sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 36 +- > sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 12 +- > .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 2 - > .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 2 +- > .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 71 + > .../openzfs/lib/libzfs_core/libzfs_core.abi | 2 +- > sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 + > sys/contrib/openzfs/man/Makefile.am | 2 + > sys/contrib/openzfs/man/man4/zfs.4 | 69 +- > sys/contrib/openzfs/man/man7/zfsprops.7 | 10 +- > sys/contrib/openzfs/man/man7/zpool-features.7 | 8 + > sys/contrib/openzfs/man/man8/zfs-unzone.8 | 1 + > sys/contrib/openzfs/man/man8/zfs-zone.8 | 116 + > sys/contrib/openzfs/man/man8/zpool-trim.8 | 21 + > sys/contrib/openzfs/module/Kbuild.in | 38 +- > sys/contrib/openzfs/module/Makefile.bsd | 34 +- > sys/contrib/openzfs/module/avl/avl.c | 24 +- > .../openzfs/module/icp/algs/blake3/blake3.c | 732 +++++ > .../module/icp/algs/blake3/blake3_generic.c | 202 ++ > .../openzfs/module/icp/algs/blake3/blake3_impl.c | 284 ++ > .../openzfs/module/icp/algs/blake3/blake3_impl.h | 213 ++ > .../openzfs/module/icp/algs/blake3/blake3_x86-64.c | 248 ++ > .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 2450 = ++++++++++++++++ > .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 2463 = ++++++++++++++++ > .../module/icp/asm-ppc64/blake3/b3_ppc64le_sse2.S | 2823 = ++++++++++++++++++ > .../module/icp/asm-ppc64/blake3/b3_ppc64le_sse41.S | 3064 = ++++++++++++++++++++ > .../module/icp/asm-x86_64/blake3/blake3_avx2.S | 1845 ++++++++++++ > .../module/icp/asm-x86_64/blake3/blake3_avx512.S | 2618 = +++++++++++++++++ > .../module/icp/asm-x86_64/blake3/blake3_sse2.S | 2323 = +++++++++++++++ > .../module/icp/asm-x86_64/blake3/blake3_sse41.S | 2058 = +++++++++++++ > .../openzfs/module/os/freebsd/zfs/crypto_os.c | 41 +- > .../openzfs/module/os/linux/spl/spl-generic.c | 6 + > sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 424 +++ > sys/contrib/openzfs/module/os/linux/zfs/policy.c | 2 +- > .../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 47 + > sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 154 +- > .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 20 + > .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 17 + > .../openzfs/module/os/linux/zfs/zpl_super.c | 1 + > .../openzfs/module/os/linux/zfs/zpl_xattr.c | 5 +- > sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 632 +++- > .../openzfs/module/zcommon/zfeature_common.c | 31 +- > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 8 +- > sys/contrib/openzfs/module/zfs/blake3_zfs.c | 117 + > sys/contrib/openzfs/module/zfs/dsl_prop.c | 10 +- > sys/contrib/openzfs/module/zfs/dsl_scan.c | 26 +- > sys/contrib/openzfs/module/zfs/spa_misc.c | 3 + > sys/contrib/openzfs/module/zfs/vdev.c | 6 +- > sys/contrib/openzfs/module/zfs/zcp_synctask.c | 2 +- > sys/contrib/openzfs/module/zfs/zfs_chksum.c | 323 +++ > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 14 +- > sys/contrib/openzfs/module/zfs/zio_checksum.c | 6 + > sys/contrib/openzfs/tests/runfiles/common.run | 10 +- > sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 6 +- > .../tests/zfs-tests/cmd/checksum/blake3_test.c | 575 ++++ > .../tests/zfs-tests/cmd/checksum/edonr_test.c | 3 - > .../tests/zfs-tests/cmd/checksum/sha2_test.c | 3 - > .../tests/zfs-tests/cmd/checksum/skein_test.c | 3 - > .../openzfs/tests/zfs-tests/include/commands.cfg | 5 + > .../openzfs/tests/zfs-tests/include/libtest.shlib | 45 +- > .../tests/zfs-tests/include/properties.shlib | 2 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + > .../openzfs/tests/zfs-tests/tests/Makefile.am | 9 + > .../tests/functional/checksum/default.cfg | 2 +- > .../tests/functional/checksum/run_blake3_test.ksh | 30 + > .../cli_root/zfs_set/checksum_001_pos.ksh | 2 +- > .../functional/cli_root/zpool_get/zpool_get.cfg | 1 + > .../user_namespace/user_namespace_001.ksh | 5 + > .../user_namespace/user_namespace_002.ksh | 115 + > .../user_namespace/user_namespace_003.ksh | 97 + > .../user_namespace/user_namespace_004.ksh | 67 + > .../tests/functional/zvol/zvol_common.shlib | 11 + > .../functional/zvol/zvol_misc/zvol_misc_fua.ksh | 96 + > .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 136 + > .../tests/functional/zvol/zvol_stress/cleanup.ksh | 36 + > .../tests/functional/zvol/zvol_stress/setup.ksh | 36 + > .../functional/zvol/zvol_stress/zvol_stress.ksh | 169 ++ > sys/modules/zfs/Makefile | 30 +- > sys/modules/zfs/zfs_config.h | 10 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 129 files changed, 25938 insertions(+), 516 deletions(-) >=20 > diff --cc cddl/lib/libicp/Makefile > index 6a8e979ea836,000000000000..5b316453af9a > mode 100644,000000..100644 > --- a/cddl/lib/libicp/Makefile > +++ b/cddl/lib/libicp/Makefile > @@@ -1,92 -1,0 +1,119 @@@ > +# $FreeBSD$ > + > +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp > + > +PACKAGE=3D utilities > +LIB=3D icp > +LIBADD=3D > + > + > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ASM_SOURCES_C =3D asm-x86_64/aes/aeskey.c > +ASM_SOURCES_AS =3D \ > + asm-x86_64/aes/aes_amd64.S \ > + asm-x86_64/aes/aes_aesni.S \ > + asm-x86_64/modes/gcm_pclmulqdq.S \ > + 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+=3D -D__amd64 -D_SYS_STACK_H -UHAVE_AES > ++.elif ${MACHINE_ARCH} =3D=3D "aarch64" > ++ASM_SOURCES_C =3D > ++ASM_SOURCES_AS =3D \ > ++ asm-aarch64/blake3/b3_aarch64_sse2.S \ > ++ asm-aarch64/blake3/b3_aarch64_sse41.S > ++.elif ${MACHINE_ARCH} =3D=3D "powerpc64" This should be powerpc64le, as it=E2=80=99s for little-endian not = big-endian. The powerpc64le build has been broken since this commit. Jess > ++ASM_SOURCES_C =3D > ++ASM_SOURCES_AS =3D \ > ++ asm-ppc64/blake3/b3_ppc64le_sse2.S \ > ++ asm-ppc64/blake3/b3_ppc64le_sse41.S > +.else > +ASM_SOURCES_C =3D > +ASM_SOURCES_AS =3D > +.endif > [...]