From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 708C6218ABC; Sun, 20 Apr 2025 19:27:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745177260; cv=none; b=Q+eR0UViV8w7bIxzqP2z1S5gPQnxgPkEYp7tAgdJM7lhoNGjWmqUEMygXJLVEDiBiM2rliYy+vxeVQnuyKk1hhxjEDVYnMQ+iLo6nm3QBXUPsHpUNsWKLRcCM5NA+98okgLnnMYsCxfVfW96HLnGo1HT9IjkCSVsjEoXr4ZPWBU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745177260; c=relaxed/simple; bh=qwubLRmYWTY89E3AJnlutYUREOIU1w2leDnXcCjVCNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S0L45ZYYyMUBytEQU70RmDF7YFwa7Wcgz6fhaD6tfYIiNI9JJ7+XdtRWLwgefq1TC3dGtbKo+frdTblRQy+Lb/OvGn8tR7bLOuOerzLcCUh95ywvRQDqaKfYYOmHW/VaqXz89JTZzfLg/wgC4bInpFkkpp9mCr+frUNiOZy4644= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PxoY21zh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PxoY21zh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 940B6C4CEEE; Sun, 20 Apr 2025 19:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745177259; bh=qwubLRmYWTY89E3AJnlutYUREOIU1w2leDnXcCjVCNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PxoY21zhWDA83kgmqgyYVf3zPZRPUbhnNwc5deADyd4PsivzUvZ8yjjol3QDCYZPI NZsyVEAlcG6K3YtI6gYYgYeZeBrk73vPUWkFXx1zi1Dio2S3+kUinvvpaHa5PCcMHg RKl4WwDeTzDUXP2IA+I65LszxxJ0RaMpZmH1bRysagYjhhgWqnTtQtLFY0aCn8fIBf sXGpcX09Z/RPKMzzJNoz48Ko6Xc+e8cXuqGxu8RsXr6zYywlMGTom7Ij8rZzZt30HO mX0cbGokvuYUBjGKneIUmL3pfxRMPTQQ2gPEcLLgXkaMC/xNI5a9LP620ZgfOxbfHq V8OAB+L4Eyyww== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, x86@kernel.org, "Jason A . Donenfeld" , Ard Biesheuvel Subject: [PATCH v2 06/13] crypto: arm64 - move library functions to arch/arm64/lib/crypto/ Date: Sun, 20 Apr 2025 12:26:02 -0700 Message-ID: <20250420192609.295075-7-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250420192609.295075-1-ebiggers@kernel.org> References: <20250420192609.295075-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Eric Biggers Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the arm64 ChaCha and Poly1305 library functions into a new directory arch/arm64/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/. Signed-off-by: Eric Biggers --- arch/arm64/crypto/Kconfig | 13 ------------- arch/arm64/crypto/Makefile | 9 +-------- arch/arm64/lib/Makefile | 3 +++ arch/arm64/lib/crypto/.gitignore | 2 ++ arch/arm64/lib/crypto/Kconfig | 14 ++++++++++++++ arch/arm64/lib/crypto/Makefile | 16 ++++++++++++++++ arch/arm64/{ => lib}/crypto/chacha-neon-core.S | 0 arch/arm64/{ => lib}/crypto/chacha-neon-glue.c | 0 arch/arm64/{ => lib}/crypto/poly1305-armv8.pl | 0 arch/arm64/{ => lib}/crypto/poly1305-glue.c | 0 lib/crypto/Kconfig | 3 +++ 11 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 arch/arm64/lib/crypto/.gitignore create mode 100644 arch/arm64/lib/crypto/Kconfig create mode 100644 arch/arm64/lib/crypto/Makefile rename arch/arm64/{ => lib}/crypto/chacha-neon-core.S (100%) rename arch/arm64/{ => lib}/crypto/chacha-neon-glue.c (100%) rename arch/arm64/{ => lib}/crypto/poly1305-armv8.pl (100%) rename arch/arm64/{ => lib}/crypto/poly1305-glue.c (100%) diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index 704d0b7e1d137..55a7d87a67690 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -23,16 +23,10 @@ config CRYPTO_NHPOLY1305_NEON NHPoly1305 hash function (Adiantum) Architecture: arm64 using: - NEON (Advanced SIMD) extensions -config CRYPTO_POLY1305_NEON - tristate - depends on KERNEL_MODE_NEON - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_SHA1_ARM64_CE tristate "Hash functions: SHA-1 (ARMv8 Crypto Extensions)" depends on KERNEL_MODE_NEON select CRYPTO_HASH select CRYPTO_SHA1 @@ -178,17 +172,10 @@ config CRYPTO_AES_ARM64_NEON_BLK and IEEE 1619) Architecture: arm64 using: - NEON (Advanced SIMD) extensions -config CRYPTO_CHACHA20_NEON - tristate - depends on KERNEL_MODE_NEON - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - config CRYPTO_AES_ARM64_BS tristate "Ciphers: AES, modes: ECB/CBC/CTR/XCTR/XTS modes (bit-sliced NEON)" depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER select CRYPTO_AES_ARM64_NEON_BLK diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile index e7139c4768ce4..089ae3ddde810 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -60,17 +60,10 @@ obj-$(CONFIG_CRYPTO_SHA256_ARM64) += sha256-arm64.o sha256-arm64-y := sha256-glue.o sha256-core.o obj-$(CONFIG_CRYPTO_SHA512_ARM64) += sha512-arm64.o sha512-arm64-y := sha512-glue.o sha512-core.o -obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o -chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o - -obj-$(CONFIG_CRYPTO_POLY1305_NEON) += poly1305-neon.o -poly1305-neon-y := poly1305-core.o poly1305-glue.o -AFLAGS_poly1305-core.o += -Dpoly1305_init=poly1305_init_arm64 - obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o obj-$(CONFIG_CRYPTO_AES_ARM64) += aes-arm64.o aes-arm64-y := aes-cipher-core.o aes-cipher-glue.o @@ -85,6 +78,6 @@ $(obj)/%-core.S: $(src)/%-armv8.pl $(call cmd,perlasm) $(obj)/sha256-core.S: $(src)/sha512-armv8.pl $(call cmd,perlasm) -clean-files += poly1305-core.S sha256-core.S sha512-core.S +clean-files += sha256-core.S sha512-core.S diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 4d49dff721a84..25be7825f28d8 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -1,6 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 + +obj-y += crypto/ + lib-y := clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_page.o \ clear_page.o csum.o insn.o memchr.o memcpy.o \ memset.o memcmp.o strcmp.o strncmp.o strlen.o \ strnlen.o strchr.o strrchr.o tishift.o diff --git a/arch/arm64/lib/crypto/.gitignore b/arch/arm64/lib/crypto/.gitignore new file mode 100644 index 0000000000000..0d47d4f21c6de --- /dev/null +++ b/arch/arm64/lib/crypto/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S diff --git a/arch/arm64/lib/crypto/Kconfig b/arch/arm64/lib/crypto/Kconfig new file mode 100644 index 0000000000000..169311547efe3 --- /dev/null +++ b/arch/arm64/lib/crypto/Kconfig @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA20_NEON + tristate + depends on KERNEL_MODE_NEON + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_NEON + tristate + depends on KERNEL_MODE_NEON + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305 diff --git a/arch/arm64/lib/crypto/Makefile b/arch/arm64/lib/crypto/Makefile new file mode 100644 index 0000000000000..ac624c3effdaf --- /dev/null +++ b/arch/arm64/lib/crypto/Makefile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o +chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o + +obj-$(CONFIG_CRYPTO_POLY1305_NEON) += poly1305-neon.o +poly1305-neon-y := poly1305-core.o poly1305-glue.o +AFLAGS_poly1305-core.o += -Dpoly1305_init=poly1305_init_arm64 + +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $(<) void $(@) + +$(obj)/%-core.S: $(src)/%-armv8.pl + $(call cmd,perlasm) + +clean-files += poly1305-core.S diff --git a/arch/arm64/crypto/chacha-neon-core.S b/arch/arm64/lib/crypto/chacha-neon-core.S similarity index 100% rename from arch/arm64/crypto/chacha-neon-core.S rename to arch/arm64/lib/crypto/chacha-neon-core.S diff --git a/arch/arm64/crypto/chacha-neon-glue.c b/arch/arm64/lib/crypto/chacha-neon-glue.c similarity index 100% rename from arch/arm64/crypto/chacha-neon-glue.c rename to arch/arm64/lib/crypto/chacha-neon-glue.c diff --git a/arch/arm64/crypto/poly1305-armv8.pl b/arch/arm64/lib/crypto/poly1305-armv8.pl similarity index 100% rename from arch/arm64/crypto/poly1305-armv8.pl rename to arch/arm64/lib/crypto/poly1305-armv8.pl diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/lib/crypto/poly1305-glue.c similarity index 100% rename from arch/arm64/crypto/poly1305-glue.c rename to arch/arm64/lib/crypto/poly1305-glue.c diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index 59135009e4f02..7395234d654b7 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -157,8 +157,11 @@ config CRYPTO_LIB_SM3 if !KMSAN # avoid false positives from assembly if ARM source "arch/arm/lib/crypto/Kconfig" endif +if ARM64 +source "arch/arm64/lib/crypto/Kconfig" +endif endif endmenu -- 2.49.0