From nobody Sat Jul 4 09:15:46 2026 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 4gslN268PWz5pwW3 for ; Sat, 04 Jul 2026 09:15:46 +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 4gslN23GnMz3Rgp for ; Sat, 04 Jul 2026 09:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783156546; 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=xB8e8Y6sQcrx9f37dLxTNHb0zWzozwKtag5NyW8Rf8I=; b=l+DgwXEzR8oI+SRpv9g/aDDx8xxod3mkU2tc2hpOirYy8+DTsDVZj47H6aUDdoVTq6fIdQ sKuK8SBm+/q5dMlgFoH0x5r0vF846gboahO+AOVAKeqPRQRTjNQP9OB5Vu/CgfRr8GiYAZ PfFFhcAzCG1t4NxrwRfZrAT5ytiMu9y0m0MN0Nt+/TBhyBtzmCOPhqKF0V4TOXJhvz0o4V Asf1Vzl7AooUfbZVWJvfjJKlwUPS7F0kh55sqSRX8VgGJYpC8z6RqvFy765NrqOaBlpZQJ jFN3g6+j8B9r/yYbAhEmHUGdIwpYxfzzyVEEmQOc7MUGHgvR4kN/UValkGar6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783156546; a=rsa-sha256; cv=none; b=dU21fa0STil1iSYpFg1RZAT86RjatRMHYvwB25/6aOHhh5BAeoqrHniFIy2OcWRg/6TaRI r3Pp1t4CM1ex3PquOsQ/iI515Xmdl1rDWdFOv+eBnZqKYsiJ3s8ip9IGBZdRW+SUpMxJvM gD8XYWf6vVRO284bQQ85yopWm1MMzx5xz7T1qOoM+i7FDfN9ROclsmdE9UjIv81m6EjMl8 PIpUhNJH9cZpSIwnAws9pRitufmysHZNM2ObD4n7vmtfnprvPcNE/nvnsFHADk6StX/mpN h3FhjxOg4nyZDYxjOjVKbDQf+bGETXENRTsOueYEKHqK02JZ+AjPydmSN6r8CA== 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=1783156546; 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=xB8e8Y6sQcrx9f37dLxTNHb0zWzozwKtag5NyW8Rf8I=; b=qnKV3ZfUItSU5F8sbQhwefH7mHkFGelwTZ3lmQJkUBrn76oFKxp8Q8tEu7Wl8FTNogguxr 6WoKZLhnmkbby3DkzX138e/dTx82Nu+/NP0s9wlHZgufMMweLkE/BBqdLtMVnOxbJqTxHI GJpzKOMv977AwFK9dolpXuovd4i3O/noqUt2cACAH6hWCEXAxLl8a4BMVHU4P/CxAzjd/F LnNoBOfvk/97lyfJ96lJZHjlaliwP88DvYE3ZCYfGtILnKqTDKhkzDYSXvp/z4btOMMx6U KVIvKzxMwq5Xx3HInv4Ds2uo7h/m7pPOPDy0D0gKExQbrFF55USgLCMZQJYdPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gslN21lWqzBcG for ; Sat, 04 Jul 2026 09:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44898 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 04 Jul 2026 09:15:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: b77f6ae68941 - main - Revert "zfs: Wire sha512 offload to the build" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b77f6ae68941c0a1f624fe351becd3726bac1cee Auto-Submitted: auto-generated Date: Sat, 04 Jul 2026 09:15:46 +0000 Message-Id: <6a48cf42.44898.dececf@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b77f6ae68941c0a1f624fe351becd3726bac1cee commit b77f6ae68941c0a1f624fe351becd3726bac1cee Author: Alexander Motin AuthorDate: 2026-07-04 09:14:02 +0000 Commit: Alexander Motin CommitDate: 2026-07-04 09:14:02 +0000 Revert "zfs: Wire sha512 offload to the build" This reverts commit cd61eb4f6681b13d98b6a7be252500ad30f05f74. Some people report module load failure due to undefined symbol. I don't have those problems myself, so it might be a question of full rebuild. But I don't have time right now, so just revert. --- 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, 4 insertions(+), 17 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 81108f29f0bb..19a7b45f4b6a 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -212,7 +212,8 @@ 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_SHA512EXT + -DHAVE_TOOLCHAIN_AVX512BW \ + -DHAVE_TOOLCHAIN_VAES -DHAVE_TOOLCHAIN_VPCLMULQDQ .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 ced6ac1f9eab..c562fb0171d0 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,20 +191,6 @@ 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 436b090d9a00..a0ddbeb9ae68 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_SHA512EXT + -DHAVE_TOOLCHAIN_AVX512BW .endif .if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true" diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 32231d10a99a..44a63977f288 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_SHA512EXT + -DHAVE_TOOLCHAIN_AVX512BW .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \