From nobody Wed Aug 20 13:42:57 2025 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 4c6SM60qXQz64xkl; Wed, 20 Aug 2025 13:42:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6SM60KnBz3WBL; Wed, 20 Aug 2025 13:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697378; 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=uK3HCT9gWTTnyypc4nfqZKCBaqxew/LRoh8pl06TwII=; b=AAjrFBGvyDi+zEcbqTzj17TRxlEwna9HyLPRqmymUJtFThTzM8Ktk+sI8ZY0FL/llCUQci n2b2qG8fbdsa28krxblTHpi0+ve9o13g/en6DuqAilHh84Sw5iEXenFE8py1gzaUmazzkd mD99XO3IyWq3MQyJMxVp6utmF5c3GXc16OWIxwHvzOzruaDULibcVPdtoGGi3CBxyyabpp V1rDCjLzcd4TGdJs42lVRCx24obcyH+75pAISdhH9iCoa1RS5OTzkZiDYoGeG343AsmsV9 AJoWNydCfYb3Zy7Se9K71bpVc2YOWMG4+V3KrgTnvBe5Mxqd0NSwBlGQ5OzfdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755697378; 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=uK3HCT9gWTTnyypc4nfqZKCBaqxew/LRoh8pl06TwII=; b=VkF7QxqiZd4++l7uFcO4/9vqIMTRQ6tQz8K/sNuCN6VyLYWQcxICOEXvIpeuS1xXykZPsO aeALrA5dE9/G8pEkqZcHExvpW4TPu9hA/UB3orPaxILzm4/Zlpaf07ylLpkYg2xGJa5XPr zwc+iNWprpqZCP2LK0BB62gkZskk3gcNufu0MCMH+xF2YYwtI9JIGdbrGGgsDRKr2LQzRe 8sGjD5y6zdmaZg6v+y1e4l9nkJZPt09NeWecvYWi0BtYX9O2uYIe9fHT/NbAHQkTHp8K7i WH661w6XB8tk8LTXAXgMgAkAsOKX2aD2RzWBowm4lw7bSR86gyyMtFO9K2kYuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755697378; a=rsa-sha256; cv=none; b=t09gAhalA4G/t5J3F7fwTL2aGuQsZFBWB/sCcgqxZM7NOJgawjUUpf+vE3zHptHjhVfj2O 9BfbBMsVoXsHoFZv1lfCoLr9i1Yf64nfQTFiQRRTy72GKQ19UenrDcYJ2PYVDVFmkOdfNW t3FGurBdMpd1Ve6MEHJfP6UAyGGbrN9WYomEbH9kecuwZuumSrpLle9afwS1LHQch4dCvd 1XhHHJMkSggLm/WvU+WOzhHwvn5N5/rtQyA2yMZoKPf8qznDQIam7H7vY2MNB7DUiiPSeX /HqlbcefHCIxkX/fYlJNctbUDN7fe4MMkrnCU+ZZtDhf3PL8qf8lW6Xr2cit/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c6SM5711Bz1ZN; Wed, 20 Aug 2025 13:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KDgvST096877; Wed, 20 Aug 2025 13:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KDgvVE096874; Wed, 20 Aug 2025 13:42:57 GMT (envelope-from git) Date: Wed, 20 Aug 2025 13:42:57 GMT Message-Id: <202508201342.57KDgvVE096874@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: 94ca18c18bb0 - main - zfs: fix build issues from 53a2e2635 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 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: 94ca18c18bb0d231c66f146704d9233da48bc84e Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=94ca18c18bb0d231c66f146704d9233da48bc84e commit 94ca18c18bb0d231c66f146704d9233da48bc84e Author: Martin Matuska AuthorDate: 2025-08-20 12:57:36 +0000 Commit: Martin Matuska CommitDate: 2025-08-20 13:42:33 +0000 zfs: fix build issues from 53a2e2635 Add aesni-gcm-avx2-vaes.S to libicp, libicp_rescue and module build This was somehow not catched by my make universe --- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libicp_rescue/Makefile | 2 ++ sys/conf/files.amd64 | 3 +++ sys/modules/zfs/Makefile | 6 +++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index f097e7e6ff58..8e801246215f 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -11,6 +11,7 @@ ASM_SOURCES_AS = \ 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/aesni-gcm-avx2-vaes.S \ asm-x86_64/modes/ghash-x86_64.S \ asm-x86_64/sha2/sha256-x86_64.S \ asm-x86_64/sha2/sha512-x86_64.S \ @@ -112,6 +113,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE CFLAGS.aes_aesni.S+= -DLOCORE CFLAGS.gcm_pclmulqdq.S+= -DLOCORE CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256-x86_64.S+= -DLOCORE CFLAGS.sha512-x86_64.S+= -DLOCORE diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 3a8b6746fe61..0a5a81f4ab7f 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -11,6 +11,7 @@ ASM_SOURCES_AS = \ 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/aesni-gcm-avx2-vaes.S \ asm-x86_64/sha2/sha256-x86_64.S \ asm-x86_64/sha2/sha512-x86_64.S \ asm-x86_64/blake3/blake3_avx2.S \ @@ -109,6 +110,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE CFLAGS.aes_aesni.S+= -DLOCORE CFLAGS.gcm_pclmulqdq.S+= -DLOCORE CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256-x86_64.S+= -DLOCORE CFLAGS.sha512-x86_64.S+= -DLOCORE diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 80548320c3fc..9b6ba03b78df 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -419,6 +419,9 @@ contrib/openzfs/module/icp/asm-x86_64/blake3/blake3_avx512.S optional zfs com 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}" +# zfs AVX2 implementation of aes-gcm from BoringSSL +contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S optional zfs compile-with "${ZFS_S}" + # zfs sha2 hash support zfs-sha256-x86_64.o optional zfs \ dependency "$S/contrib/openzfs/module/icp/asm-x86_64/sha2/sha256-x86_64.S" \ diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 0dc85e3fa684..ec531ed646a7 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -15,6 +15,7 @@ KMOD= zfs ${SRCDIR}/icp/asm-ppc64/sha2 \ ${SRCDIR}/icp/asm-ppc64/blake3 \ ${SRCDIR}/icp/asm-x86_64/blake3 \ + ${SRCDIR}/icp/asm-x86_64/modes \ ${SRCDIR}/icp/asm-x86_64/sha2 \ ${SRCDIR}/os/freebsd/spl \ ${SRCDIR}/os/freebsd/zfs \ @@ -41,7 +42,7 @@ CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ - -DHAVE_VAES HAVE_VPCLMULQDQ + -DHAVE_VAES -DHAVE_VPCLMULQDQ .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ @@ -83,6 +84,9 @@ SRCS+= blake3_avx2.S \ blake3_avx512.S \ blake3_sse2.S \ blake3_sse41.S + +#icp/asm-x86_64/modes +SRCS+= aesni-gcm-avx2-vaes.S .endif #icp/algs/sha2