crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

[PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Tianjia Zhang 4 years, 1 month ago

Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
moved the sm4 library implementation from the lib/crypto directory to
the crypto directory and configured the name as CRYPTO_SM4. The arm64
SM4 NEON/CE implementation depends on this and needs to be modified
uniformly.

Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 arch/arm64/crypto/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 4fe7037d2347..ac85682c013c 100644
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -57,13 +57,13 @@ config CRYPTO_SM4_ARM64_CE_BLK
 	tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions"
 	depends on KERNEL_MODE_NEON
 	select CRYPTO_SKCIPHER
-	select CRYPTO_LIB_SM4
+	select CRYPTO_SM4
 
 config CRYPTO_SM4_ARM64_NEON_BLK
 	tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions"
 	depends on KERNEL_MODE_NEON
 	select CRYPTO_SKCIPHER
-	select CRYPTO_LIB_SM4
+	select CRYPTO_SM4
 
 config CRYPTO_GHASH_ARM64_CE
 	tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
-- 
2.24.3 (Apple Git-128)

Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Herbert Xu 4 years ago

On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.
> 
> Fixes: 4f1aef9b806f ("crypto: arm64/sm4 - add ARMv8 NEON implementation")
> Fixes: 5b33e0ec881c ("crypto: arm64/sm4 - add ARMv8 Crypto Extensions implementation")
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
>  arch/arm64/crypto/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Patch 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

Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Will Deacon 4 years ago

On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> moved the sm4 library implementation from the lib/crypto directory to
> the crypto directory and configured the name as CRYPTO_SM4. The arm64
> SM4 NEON/CE implementation depends on this and needs to be modified
> uniformly.

d2825fa9365d doesn't appear in my tree -- is this something in linux-next?

Will

Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Jason A. Donenfeld 4 years ago

Hi Will,

On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > moved the sm4 library implementation from the lib/crypto directory to
> > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > SM4 NEON/CE implementation depends on this and needs to be modified
> > uniformly.
> 
> d2825fa9365d doesn't appear in my tree -- is this something in linux-next?

This is in Herbert's tree for next:
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d

Jason

Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Will Deacon 4 years ago

On Wed, Apr 13, 2022 at 01:48:53PM +0200, Jason A. Donenfeld wrote:
> On Wed, Apr 13, 2022 at 11:22:09AM +0100, Will Deacon wrote:
> > On Mon, Apr 11, 2022 at 11:13:13AM +0800, Tianjia Zhang wrote:
> > > Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory")
> > > moved the sm4 library implementation from the lib/crypto directory to
> > > the crypto directory and configured the name as CRYPTO_SM4. The arm64
> > > SM4 NEON/CE implementation depends on this and needs to be modified
> > > uniformly.
> > 
> > d2825fa9365d doesn't appear in my tree -- is this something in linux-next?
> 
> This is in Herbert's tree for next:
> https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=d2825fa9365d

Cheers, then I'll leave this fix for Herbert to pick up.

Will

Re: [PATCH] crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation

Posted by Herbert Xu 4 years ago

On Thu, Apr 14, 2022 at 10:34:45AM +0100, Will Deacon wrote:
>
> Cheers, then I'll leave this fix for Herbert to pick up.

Sorry, I think it was my merge error that created this bug
in the first place.  I'll pick up the fix.

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