[PATCH 1/2] crypto: arm/aes-ce - build for v8 architecture explicitly

[PATCH 1/2] crypto: arm/aes-ce - build for v8 architecture explicitly

[Ard Biesheuvel]

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

The NEON/Crypto Extensions based AES implementation for 32-bit ARM
can be built in a kernel that targets ARMv6 CPUs and higher, even
though the actual code will not be able to run on that generation,
but it allows for a portable image to be generated that can will
use the special instructions only when they are available.

Since those instructions are part of a FPU profile rather than a
CPU profile, we don't override the architecture in the assembler
code, and most of the scalar code is simple enough to be ARMv6
compatible. However, that changes with commit c61b1607ed4fbbf2,
which introduces calls to the movw/movt instructions, which are
v7+ only.

So override the architecture in the .S file to armv8-a, which
matches the architecture specification in the crypto-neon-fp-armv8
FPU specificier that we already using. Note that using armv7-a
here may trigger an issue with the upcoming Clang 10 release,
which no longer permits .arch/.fpu combinations it views as
incompatible.

Reported-by: kbuild test robot <lkp@intel.com>
Fixes: c61b1607ed4fbbf2("crypto: arm/aes-ce - implement ciphertext stealing ...")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm/crypto/aes-ce-core.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/crypto/aes-ce-core.S b/arch/arm/crypto/aes-ce-core.S
index b978cdf133af..4d1707388d94 100644
--- a/arch/arm/crypto/aes-ce-core.S
+++ b/arch/arm/crypto/aes-ce-core.S
@@ -9,6 +9,7 @@
 #include <asm/assembler.h>
 
 	.text
+	.arch		armv8-a
 	.fpu		crypto-neon-fp-armv8
 	.align		3
 
-- 
2.17.1

[PATCH 2/2] crypto: arm/aes-ce - add dependency on AES library

[Ard Biesheuvel]

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

The ARM accelerated AES driver depends on the new AES library for
its non-SIMD fallback so express this in its Kconfig declaration.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm/crypto/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index b24df84a1d7a..043b0b18bf7e 100644
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -98,6 +98,7 @@ config CRYPTO_AES_ARM_CE
 	tristate "Accelerated AES using ARMv8 Crypto Extensions"
 	depends on KERNEL_MODE_NEON
 	select CRYPTO_BLKCIPHER
+	select CRYPTO_LIB_AES
 	select CRYPTO_SIMD
 	help
 	  Use an implementation of AES in CBC, CTR and XTS modes that uses
-- 
2.17.1

Re: [PATCH 1/2] crypto: arm/aes-ce - build for v8 architecture explicitly

[Herbert Xu]

On Tue, Sep 17, 2019 at 09:50:00AM +0100, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> The NEON/Crypto Extensions based AES implementation for 32-bit ARM
> can be built in a kernel that targets ARMv6 CPUs and higher, even
> though the actual code will not be able to run on that generation,
> but it allows for a portable image to be generated that can will
> use the special instructions only when they are available.
> 
> Since those instructions are part of a FPU profile rather than a
> CPU profile, we don't override the architecture in the assembler
> code, and most of the scalar code is simple enough to be ARMv6
> compatible. However, that changes with commit c61b1607ed4fbbf2,
> which introduces calls to the movw/movt instructions, which are
> v7+ only.
> 
> So override the architecture in the .S file to armv8-a, which
> matches the architecture specification in the crypto-neon-fp-armv8
> FPU specificier that we already using. Note that using armv7-a
> here may trigger an issue with the upcoming Clang 10 release,
> which no longer permits .arch/.fpu combinations it views as
> incompatible.
> 
> Reported-by: kbuild test robot <lkp@intel.com>
> Fixes: c61b1607ed4fbbf2("crypto: arm/aes-ce - implement ciphertext stealing ...")
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  arch/arm/crypto/aes-ce-core.S | 1 +
>  1 file changed, 1 insertion(+)

All applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt