Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1531831 > unrolled thread

linux-next: build failure after merge of the crypto tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2016-11-29 02:00 +0100
Last post2016-11-29 10:10 +0100
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  linux-next: build failure after merge of the crypto tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-29 02:00 +0100
    Re: linux-next: build failure after merge of the crypto tree Herbert Xu <herbert@gondor.apana.org.au> - 2016-11-29 08:10 +0100
      Re: linux-next: build failure after merge of the crypto tree Herbert Xu <herbert@gondor.apana.org.au> - 2016-11-29 09:50 +0100
      Re: linux-next: build failure after merge of the crypto tree Horia Geantă <horia.geanta@nxp.com> - 2016-11-29 10:10 +0100

#1531831 — linux-next: build failure after merge of the crypto tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-11-29 02:00 +0100
Subjectlinux-next: build failure after merge of the crypto tree
Message-ID<sIEW5-Wo-3@gated-at.bofh.it>
Hi Herbert,

After merging the crypto tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-ce.ko] undefined!
ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-ce.ko] undefined!
ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-bs.ko] undefined!
ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-bs.ko] undefined!

Caused by commits

  da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
  211f41af534a ("crypto: aesbs - Convert to skcipher")

Missing dependencies?

I have used the crypto tree from next-20161128 for today.

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]


#1531957

FromHerbert Xu <herbert@gondor.apana.org.au>
Date2016-11-29 08:10 +0100
Message-ID<sIKI9-58W-13@gated-at.bofh.it>
In reply to#1531831
On Tue, Nov 29, 2016 at 11:55:29AM +1100, Stephen Rothwell wrote:
> Hi Herbert,
> 
> After merging the crypto tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-ce.ko] undefined!
> ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-ce.ko] undefined!
> ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-bs.ko] undefined!
> ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-bs.ko] undefined!
> 
> Caused by commits
> 
>   da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
>   211f41af534a ("crypto: aesbs - Convert to skcipher")
> 
> Missing dependencies?
> 
> I have used the crypto tree from next-20161128 for today.

Indeed.  This patch should fix the problem.

---8<---
Subject: crypto: arm/aes - Select SIMD in Kconfig

The skcipher conversion for ARM missed the select on CRYPTO_SIMD,
causing build failures if SIMD was not otherwise enabled.

Fixes: da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
Fixes: 211f41af534a ("crypto: aesbs - Convert to skcipher")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index 27ed1b1..8134888 100644
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -105,7 +105,7 @@ config CRYPTO_AES_ARM_CE
 	tristate "Accelerated AES using ARMv8 Crypto Extensions"
 	depends on KERNEL_MODE_NEON
 	select CRYPTO_ALGAPI
-	select CRYPTO_ABLK_HELPER
+	select CRYPTO_SIMD
 	help
 	  Use an implementation of AES in CBC, CTR and XTS modes that uses
 	  ARMv8 Crypto Extensions
diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 5f4a617..c5ce39c 100644
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -48,14 +48,14 @@ config CRYPTO_AES_ARM64_CE_BLK
 	depends on ARM64 && KERNEL_MODE_NEON
 	select CRYPTO_BLKCIPHER
 	select CRYPTO_AES_ARM64_CE
-	select CRYPTO_ABLK_HELPER
+	select CRYPTO_SIMD
 
 config CRYPTO_AES_ARM64_NEON_BLK
 	tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions"
 	depends on ARM64 && KERNEL_MODE_NEON
 	select CRYPTO_BLKCIPHER
 	select CRYPTO_AES
-	select CRYPTO_ABLK_HELPER
+	select CRYPTO_SIMD
 
 config CRYPTO_CRC32_ARM64
 	tristate "CRC32 and CRC32C using optional ARMv8 instructions"
-- 
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

[toc] | [prev] | [next] | [standalone]


#1531995

FromHerbert Xu <herbert@gondor.apana.org.au>
Date2016-11-29 09:50 +0100
Message-ID<sIMgV-5Y2-3@gated-at.bofh.it>
In reply to#1531957
On Tue, Nov 29, 2016 at 08:34:08AM +0000, Horia Geantă wrote:
>
> > Fixes: da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
> > Fixes: 211f41af534a ("crypto: aesbs - Convert to skcipher")
> The fix for this commit is missing.
> CRYPTO_AES_ARM_BS also needs to select CRYPTO_SIMD.

Thanks.  I'll add this patch on top:

---8<---
Subject: crypto: arm/aes - Add missing SIMD select for aesbs

This patch adds one more missing SIMD select for AES_ARM_BS.  It
also changes selects on ALGAPI to BLKCIPHER.

Fixes: 211f41af534a ("crypto: aesbs - Convert to skcipher")
Reported-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index 8134888..dd90e38 100644
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -88,9 +88,9 @@ config CRYPTO_AES_ARM
 config CRYPTO_AES_ARM_BS
 	tristate "Bit sliced AES using NEON instructions"
 	depends on KERNEL_MODE_NEON
-	select CRYPTO_ALGAPI
 	select CRYPTO_AES_ARM
-	select CRYPTO_ABLK_HELPER
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_SIMD
 	help
 	  Use a faster and more secure NEON based implementation of AES in CBC,
 	  CTR and XTS modes
@@ -104,7 +104,7 @@ config CRYPTO_AES_ARM_BS
 config CRYPTO_AES_ARM_CE
 	tristate "Accelerated AES using ARMv8 Crypto Extensions"
 	depends on KERNEL_MODE_NEON
-	select CRYPTO_ALGAPI
+	select CRYPTO_BLKCIPHER
 	select CRYPTO_SIMD
 	help
 	  Use an implementation of AES in CBC, CTR and XTS modes that uses
-- 
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

[toc] | [prev] | [next] | [standalone]


#1532010

FromHoria Geantă <horia.geanta@nxp.com>
Date2016-11-29 10:10 +0100
Message-ID<sIMgV-5Y2-5@gated-at.bofh.it>
In reply to#1531957
On 11/29/2016 10:09 AM, Herbert Xu wrote:
> On Tue, Nov 29, 2016 at 11:55:29AM +1100, Stephen Rothwell wrote:
>> Hi Herbert,
>>
>> After merging the crypto tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-ce.ko] undefined!
>> ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-ce.ko] undefined!
>> ERROR: "simd_skcipher_free" [arch/arm/crypto/aes-arm-bs.ko] undefined!
>> ERROR: "simd_skcipher_create_compat" [arch/arm/crypto/aes-arm-bs.ko] undefined!
>>
>> Caused by commits
>>
>>   da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
>>   211f41af534a ("crypto: aesbs - Convert to skcipher")
>>
>> Missing dependencies?
>>
>> I have used the crypto tree from next-20161128 for today.
> 
> Indeed.  This patch should fix the problem.
> 
> ---8<---
> Subject: crypto: arm/aes - Select SIMD in Kconfig
> 
> The skcipher conversion for ARM missed the select on CRYPTO_SIMD,
> causing build failures if SIMD was not otherwise enabled.
> 
> Fixes: da40e7a4ba4d ("crypto: aes-ce - Convert to skcipher")
> Fixes: 211f41af534a ("crypto: aesbs - Convert to skcipher")
The fix for this commit is missing.
CRYPTO_AES_ARM_BS also needs to select CRYPTO_SIMD.

> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
> index 27ed1b1..8134888 100644
> --- a/arch/arm/crypto/Kconfig
> +++ b/arch/arm/crypto/Kconfig
> @@ -105,7 +105,7 @@ config CRYPTO_AES_ARM_CE
>  	tristate "Accelerated AES using ARMv8 Crypto Extensions"
>  	depends on KERNEL_MODE_NEON
>  	select CRYPTO_ALGAPI
> -	select CRYPTO_ABLK_HELPER
> +	select CRYPTO_SIMD
>  	help
>  	  Use an implementation of AES in CBC, CTR and XTS modes that uses
>  	  ARMv8 Crypto Extensions
> diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
> index 5f4a617..c5ce39c 100644
> --- a/arch/arm64/crypto/Kconfig
> +++ b/arch/arm64/crypto/Kconfig
> @@ -48,14 +48,14 @@ config CRYPTO_AES_ARM64_CE_BLK
>  	depends on ARM64 && KERNEL_MODE_NEON
>  	select CRYPTO_BLKCIPHER
>  	select CRYPTO_AES_ARM64_CE
> -	select CRYPTO_ABLK_HELPER
> +	select CRYPTO_SIMD
>  
>  config CRYPTO_AES_ARM64_NEON_BLK
>  	tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions"
>  	depends on ARM64 && KERNEL_MODE_NEON
>  	select CRYPTO_BLKCIPHER
>  	select CRYPTO_AES
> -	select CRYPTO_ABLK_HELPER
> +	select CRYPTO_SIMD
The commit message should also refer to:
Fixes: d0ed0db149fce ("crypto: arm64/aes - Convert to skcipher")

Horia

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web