From nobody Thu Jun 23 17:46:36 2022 X-Original-To: dev-commits-src-all@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 5FD68870CFB; Thu, 23 Jun 2022 17:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTSNs1wpJz3HTF; Thu, 23 Jun 2022 17:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656006397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U77Okp1SuySJ+uHpRclyVfsWRqHGxCNAuHheSdhOBOw=; b=PWFBUNaYDcEojCLi4NzY7As6zSMFPFlaFnSFprA+xKgRUZSh98UK3uI+3H/wdDCIMZj0JI gmcPo5eCcfkwnaSqXJ6PkZnt3MsaVTpwrVyxbod9cweEqall8xRHpCX+BAO7oI9vClE3eT 240V09gC1an82s+baKhk0rn3dO0aF/UE8xBjb57bc3BDJmDZgfx1SrlFybDRjTZYiDl/m3 J+XnPsrhioy6SGFaTPviZPkN1MamcUs2d5UGcJ6AY2knwbQ3fzHyVM7fx1O8ozfRwqTRWX 1R7vqw7bJWZUXqTBezMw607VAPxNgMlZv6WwihfyFIMlk9CSKukRQRnv2/jWWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E2541F854; Thu, 23 Jun 2022 17:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25NHka30073547; Thu, 23 Jun 2022 17:46:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NHkaiV073546; Thu, 23 Jun 2022 17:46:36 GMT (envelope-from git) Date: Thu, 23 Jun 2022 17:46:36 GMT Message-Id: <202206231746.25NHkaiV073546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: d1aefbc04c84 - main - zfs: fix static module build broken in 1f1e2261e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1aefbc04c84476fba06ff40e30464e0948b5ccf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656006397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U77Okp1SuySJ+uHpRclyVfsWRqHGxCNAuHheSdhOBOw=; b=kxYwXMyZvkyVnX+KNzxChR1Z2tl/GR4dEFgCrD8fwQtiXl53MsIFUsYwZew9Y8SOfVlAfm 6STBnPQuW66uXkotRPPUvp9u8KoxEnCRPHM0CepkK1khAjY1omhjsgn+sXpimTJniIwIEP La/U2F1gI7+1Xwz9lcPSbS/WjC2RcBijtUQXY+xgdZWkXRzpOWch5WJxKZIFYe0f35kRUe Lr6NlVlOhOubss3AOPpiVyRSihvH2BqDoXyy5ROfR8QNyA/UNe3aL5Gn5LFKkkPhvJgbsu h63Tp9FsUb6AqyqHscXJrfkfEcjoPzGMWtGDiP7vjEJKEfSpXPfVinrqkLnJeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656006397; a=rsa-sha256; cv=none; b=MNdlM7IpASkMQf9+0/SJAG7m+U89j1JtEFj/Z4EBVf38bDyrSLRsZ4KZyAA4l9VlG3yjls kRDS+W6Ndi/fF21m6p7z3xV6JTohHntLeuvpyNvZJEQiuEWicXk0FayzYB2HP1Mwad9Qna nhlvF9u/Zx+IHckoa9Twd0f464HGzhwEpNl0601+p7kPMDUW658SCczpP45kRfJw7Nrcuo GMfoIMZ4Vy0CkxyR3iqtOAwTIYZps+NABmv6IBbBnfYHLYmgswz7OVdEKfayCn7iG62iUd osCXaKsq+ELiNsTVM83X6PEYsqPUxssTncSirLop9ypbC990OKdcdoqlxhUNwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d1aefbc04c84476fba06ff40e30464e0948b5ccf commit d1aefbc04c84476fba06ff40e30464e0948b5ccf Author: Martin Matuska AuthorDate: 2022-06-23 17:42:55 +0000 Commit: Martin Matuska CommitDate: 2022-06-23 17:44:38 +0000 zfs: fix static module build broken in 1f1e2261e --- sys/conf/files | 8 ++++++++ sys/conf/files.amd64 | 5 +++++ sys/conf/files.arm64 | 3 +++ sys/conf/files.powerpc | 2 ++ sys/conf/kern.pre.mk | 4 ++-- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index e2e0ca9759db..e23e23fb4fad 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -241,10 +241,17 @@ contrib/openzfs/module/zcommon/zprop_common.c optional zfs compile-with "${ZFS_ # zfs edon-r hash support contrib/openzfs/module/icp/algs/edonr/edonr.c optional zfs compile-with "${ZFS_C}" +# zfs blake3 hash support +contrib/openzfs/module/icp/algs/blake3/blake3.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/blake3/blake3_generic.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/blake3/blake3_impl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/blake3/blake3_x86-64.c optional zfs compile-with "${ZFS_C}" + #zfs core common code contrib/openzfs/module/zfs/abd.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/aggsum.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/arc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/blake3_zfs.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/blkptr.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/bplist.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/bpobj.c optional zfs compile-with "${ZFS_C}" @@ -342,6 +349,7 @@ contrib/openzfs/module/zfs/zcp_set.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zcp_synctask.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zfeature.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zfs_byteswap.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_chksum.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zfs_fm.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zfs_fuid.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/zfs_ioctl.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 7843933c6cd6..c6e32998567e 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -406,6 +406,11 @@ x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci x86/xen/pv.c optional xenhvm +contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx2.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx512.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse2.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_sse41.S optional zfs compile-with "${ZFS_S}" + contrib/openzfs/module/zcommon/zfs_fletcher_avx512.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_intel.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_sse.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index acd6ca08de70..52eb4de5fef3 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -156,6 +156,9 @@ cddl/dev/dtrace/aarch64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/aarch64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/fbt/aarch64/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" +contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S optional zfs compile-with "${ZFS_S}" + ## ## ASoC support ## diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index eacce785f914..17c6bf278b40 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -10,6 +10,8 @@ # # There is only an asm version on ppc64. +contrib/openzfs/module/icp/asm-ppc64/blake3/b3_ppc64le_sse2.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-ppc64/blake3/b3_ppc64le_sse41.S optional zfs compile-with "${ZFS_S}" cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe compile-with "${ZFS_C}" cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 337da3dd822d..75f5128c52d2 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -245,8 +245,8 @@ ZFS_CFLAGS+= ${CDDL_CFLAGS} -DBUILDING_ZFS -DHAVE_UIO_ZEROCOPY \ -DIN_FREEBSD_BASE .if ${MACHINE_ARCH} == "amd64" -ZFS_CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F \ - -DHAVE_SSSE3 -DHAVE_AVX512BW +ZFS_CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ + -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \