From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A979BC38145 for ; Tue, 6 Sep 2022 22:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbiIFWMe (ORCPT ); Tue, 6 Sep 2022 18:12:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbiIFWMc (ORCPT ); Tue, 6 Sep 2022 18:12:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A70889F0D4; Tue, 6 Sep 2022 15:12:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 48479615B0; Tue, 6 Sep 2022 22:12:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EDA6C433C1; Tue, 6 Sep 2022 22:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662502350; bh=YLor/aNRqp6Ff9o1HUmyK/bQsNc6c5Q+mE1K1VOmqBk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TFGcimLmrqBAShEGqbUXWvHVTCjY5gvJXjNwfW4HiMg+FVpHHMJn0ovDTHjI+IP90 +C4bdFBMXs8h+R344F9i8e6BbQ3EjzL/criSDPIEq1k9h0EaEa45+TcIc3cojMUvAJ 8ZXD6BMBhdNa6ka00KuHwbr1T83kAwK/bcUWg7vBYcXWTPufoBflv5GfTLgNZ6p/Ov Sv0/BrQZk9QcEkHzsfJGBPwPM4Zq2PNj2yXhlVv/7hGDohgUSjWE7JaBIixLSoDJah ztYz774d8UNL/qUfkcAUHUk0903HQRn5Mvq/C2W4so+T7jXj7VRnrKUlkI2B9obZSz J1jQZCpFdJiJw== Date: Tue, 6 Sep 2022 15:12:28 -0700 From: Eric Biggers To: Stephen Rothwell Cc: Andrew Morton , Herbert Xu , Linux Crypto List , Alexander Potapenko , Linux Kernel Mailing List , Linux Next Mailing List , Robert Elliott Subject: Re: linux-next: manual merge of the mm tree with the crypto tree Message-ID: References: <20220906202017.5093fd23@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220906202017.5093fd23@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.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