Re: linux-next: manual merge of the mm tree with the crypto tree

[Eric Biggers <ebiggers@kernel.org>]

On Tue, Sep 06, 2022 at 08:20:17PM +1000, Stephen Rothwell wrote:
> diff --git a/arch/x86/crypto/Kconfig b/arch/x86/crypto/Kconfig
> index 9bb0f7939c6b..856f5d8ca65f 100644
> --- a/arch/x86/crypto/Kconfig
> +++ b/arch/x86/crypto/Kconfig
> @@ -5,6 +5,7 @@ menu "Accelerated Cryptographic Algorithms for CPU (x86)"
>  config CRYPTO_CURVE25519_X86
>  	tristate "Public key crypto: Curve25519 (ADX)"
>  	depends on X86 && 64BIT
> +	depends on !KMSAN # avoid false positives from assembly
>  	select CRYPTO_LIB_CURVE25519_GENERIC
>  	select CRYPTO_ARCH_HAVE_LIB_CURVE25519
>  	help
> @@ -16,6 +17,7 @@ config CRYPTO_CURVE25519_X86
>  config CRYPTO_AES_NI_INTEL
>  	tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XTR, XTS, GCM (AES-NI)"
>  	depends on X86
> +	depends on !KMSAN # avoid false positives from assembly
>  	select CRYPTO_AEAD
>  	select CRYPTO_LIB_AES
>  	select CRYPTO_ALGAPI
> @@ -32,6 +34,7 @@ config CRYPTO_AES_NI_INTEL
>  config CRYPTO_BLOWFISH_X86_64
>  	tristate "Ciphers: Blowfish, modes: ECB, CBC"
>  	depends on X86 && 64BIT
> +	depends on !KMSAN # avoid false positives from assembly
>  	select CRYPTO_SKCIPHER
>  	select CRYPTO_BLOWFISH_COMMON
>  	imply CRYPTO_CTR
> @@ -44,6 +47,7 @@ config CRYPTO_BLOWFISH_X86_64
>  config CRYPTO_CAMELLIA_X86_64
>  	tristate "Ciphers: Camellia with modes: ECB, CBC"
>  	depends on X86 && 64BIT
> +	depends on !KMSAN # avoid false positives from assembly
>  	select CRYPTO_SKCIPHER
>  	imply CRYPTO_CTR
>  	help
> @@ -55,6 +59,7 @@ config CRYPTO_CAMELLIA_X86_64
>  config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
>  	tristate "Ciphers: Camellia with modes: ECB, CBC (AES-NI/AVX)"
>  	depends on X86 && 64BIT
> +	depends on !KMSAN # avoid false positives from assembly
>  	select CRYPTO_SKCIPHER
>  	select CRYPTO_CAMELLIA_X86_64
>  	select CRYPTO_SIMD

Are there any options in arch/x86/crypto/Kconfig that *don't* need a dependency
on !KMSAN?  If not, this could be done in a much simpler way.

- Eric