From nobody Thu Jul 2 18:02:33 2026 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 4grl8n6fx0z6gL6D for ; Thu, 02 Jul 2026 18:02:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4grl8n57wvz3Q67 for ; Thu, 02 Jul 2026 18:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783015353; 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=W0Wi0TK2pHY3oqBJPRlEsSNBLSeiAbTjlMvxbRyUY18=; b=oZDKeR0BDuonNnfK/VnYpxX9z2QMAPuM/BB6OQh5OnyvxVmZrePOLinm8jfE+uwiLRsWNP NdgQhwMHbe4zP5ViAUyP204Mcc5eiWsORpSLokZ5W4y3R9Ul7UBZn0wevqX7WbZD7J5KMZ F7DMaXKaSdvKxZ5e6NUqxiQtyctWnRGwBohlCQ3KTpQ11971JlKPEp/r8qH9alFUHW1+xf iTz4+3VXqqdrkzGjQHbLSp1NfW638hxQ2xR8pbXwhXVg1VGdRxjOvonKqWBsgbgajXvD2g JHQ68cmEBSOWstEjZiQDcpXAa6qIDkmUhoTEKQc/HhRbzxadmK2Ul1xCPLPb3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783015353; a=rsa-sha256; cv=none; b=mB7M6p24qJh4mo6Xiwr5CCyGu8HFKiMVan/IIqC8DC9UWm7BJuqZU2Rmx6NXZPpKn6X6IL bLAxu4Pnpqa9yH5EV8fn1n6Wn6SQaQ0aaMN5VUZkJzjjRKtxQixCsG6+6p5nDSA2RlysGJ 58b6TNLzEi9diQzhDunwd5kmZGosW1ftFmnwXQ7fj6IFCngu9CmCr65E3+mSG3hMp74Is8 bccU/8pYZPuf7n2VoZfuQt44vrNPuzLTrsv0e4+sLYlwaY18nliXgfgrqyg0yNBdlpI4XQ qmPYPj1N1E/L9AbPMbZbGrtZ5CG49q+r/eREgW02WvBK14jRJ0kmG9sS72E3FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783015353; 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=W0Wi0TK2pHY3oqBJPRlEsSNBLSeiAbTjlMvxbRyUY18=; b=igkykAjpgLTNFwzXLIB5HZ4jHYyGUpSyO7i0kIKYaqGVMz2oJ+jC9GKiQwcLu/2Zr+McJX kz/rtRjg6OxTHn00EZAHhf4xNeuGM8wkG8lTjHRv6UT4qB3YoMVit37mfG7ky3G7WRfjcU y+7wWZg8Y8ay7B6+i0oqXs31BSeS/v+kLXtABhxBqsizz7gv/ky9tVhCW+PXe8qrAoTDto 87Mw60E2alVnlcFoYGQDrOOIJ7xaanI1ud+PEgRL2kbdSP0Wls2b8V6JdZJikWFa4nIstm c9Ky+Oj5aMYGKTVfgvg5Wkt0PvO6ErGpNPb6ArUwvamwo1d3RrMzpbaO8fRMVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grl8n3jytz1BPv for ; Thu, 02 Jul 2026 18:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 18:02:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: cd61eb4f6681 - main - zfs: Wire sha512 offload to the build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd61eb4f6681b13d98b6a7be252500ad30f05f74 Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 18:02:33 +0000 Message-Id: <6a46a7b9.25c03.7da045a1@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=cd61eb4f6681b13d98b6a7be252500ad30f05f74 commit cd61eb4f6681b13d98b6a7be252500ad30f05f74 Author: Alexander Motin AuthorDate: 2026-07-02 17:58:12 +0000 Commit: Alexander Motin CommitDate: 2026-07-02 17:58:12 +0000 zfs: Wire sha512 offload to the build FreeBSD main just got the CPUID_STDEXT4_SHA512 define. OpenZFS PR #18732 --- sys/conf/kern.pre.mk | 3 +-- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h | 14 ++++++++++++++ sys/contrib/openzfs/module/Makefile.bsd | 2 +- sys/modules/zfs/Makefile | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 19a7b45f4b6a..81108f29f0bb 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -212,8 +212,7 @@ ZFS_CFLAGS+= -I$S/contrib/openzfs/module/icp/include \ ZFS_CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \ -DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \ -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \ - -DHAVE_TOOLCHAIN_AVX512BW \ - -DHAVE_TOOLCHAIN_VAES -DHAVE_TOOLCHAIN_VPCLMULQDQ + -DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h index c562fb0171d0..ced6ac1f9eab 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h @@ -191,6 +191,20 @@ zfs_shani_available(void) return (has_shani && __ymm_enabled()); } +/* + * Check if SHA-512 extension is available + */ +static inline boolean_t +zfs_sha512ext_available(void) +{ +#if defined(CPUID_STDEXT4_SHA512) + return ((cpu_stdext_feature4 & CPUID_STDEXT4_SHA512) != 0 && + __ymm_enabled()); +#else + return (B_FALSE); +#endif +} + /* * AVX-512 family of instruction sets: * diff --git a/sys/contrib/openzfs/module/Makefile.bsd b/sys/contrib/openzfs/module/Makefile.bsd index a0ddbeb9ae68..436b090d9a00 100644 --- a/sys/contrib/openzfs/module/Makefile.bsd +++ b/sys/contrib/openzfs/module/Makefile.bsd @@ -50,7 +50,7 @@ CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \ CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \ -DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \ -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \ - -DHAVE_TOOLCHAIN_AVX512BW + -DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT .endif .if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true" diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 44a63977f288..32231d10a99a 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -42,7 +42,7 @@ CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \ CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \ -DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \ -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \ - -DHAVE_TOOLCHAIN_AVX512BW + -DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \