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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79FE3C98338 for ; Sun, 27 Sep 2026 22:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WiaBYjXRLb6y9BAoaOf25WPEOeH+jgG38rvKhwdaWIE=; b=3deSOKaV/UHcgj 3/pbFVzlZmILfAQ3t2l+aWq7aHwVqEqKkhWOEL5IRPIMSupjAUSJouMUPILW5ontk1yjtUInpN3DB N0hmVQZVsmoidY+HTtBZpaW34aQx0opaTMAlFNJyxZAO3HfrqtIPZVQJ6WDWFyUZOUpEst4KrtTTA Kfz+93Q5qhEq9HVFFo/aESAe7wSq3+sFcmraF0nKxAdgME0mN50JQrvm4JLO8qDyc79hhAgyh/XhR gqAfa5KhR32J7gKGNPBjc1eNJ7ZpQZATpL/8sSJs1UcECmklNUMWauK3KbVYVOBZNNihETsurRGKZ 0F8k2TmVjNKmCGoBDB7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xAxbt-0000000GwRW-3L5K; Sun, 27 Sep 2026 22:44:41 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xAxbr-0000000GwQl-42NB for linux-riscv@lists.infradead.org; Sun, 27 Sep 2026 22:44:40 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 58BB3601F7; Sun, 27 Sep 2026 22:44:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA6131F00893; Sun, 27 Sep 2026 22:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790549079; bh=RXcPSErStwz9YmSdLDmXCs6xzBZtyX+Xe4rdJW9EhsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XCe6pem3IEEms0LhO4ZC5dAjM168s9njWq7RKyQf5gEjSga3BeLnLrsA7qEQhHYKj wyY2EV22fKiCXLENCIOC2DrCmRvWWHJAGV+OtKwroWKsaXty7yVu16e/9fGcCe6e+6 lYJO8m+DIWnAUH6IwaNA1zAyA3Cuzpan3mt1/hPyB8NA4Uay+6gO3f8RN3bLPTPM9K +GScno032OW4WukqiJlaV7bSym/v9O1jJ4l0Rn+otH8Da3VyeP9J6v8ahvIrf9mo6A 0Dmh9OYCLAzBhnb9TcvC3uC8jHgHCBzROtr+Uh0CetslvxmuMPiqgd+2fdUc2PtXuu DVR1haEYRwAWw== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , Herbert Xu , x86@kernel.org, linux-riscv@lists.infradead.org, Eric Biggers Subject: [PATCH v2 01/20] crypto: aes - Fix undesired override of some optimized AES modes Date: Sun, 27 Sep 2026 15:42:52 -0700 Message-ID: <20260927224418.109759-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260927224418.109759-1-ebiggers@kernel.org> References: <20260927224418.109759-1-ebiggers@kernel.org> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The new library APIs for AES encryption modes were wired up to the traditional crypto API via crypto/aes.c. However, for now the kernel is still in a transitional state where various architectures still have architecture-optimized implementations of AES modes in arch/*/crypto/, wired up to the traditional crypto API only. Because of that, the crypto/aes.c algorithms were given a cra_priority of only 110 to prevent them from overriding arch/*/crypto/ in the traditional crypto API. However, because of how the traditional crypto API works, the cra_priority trick doesn't work in cases where the relevant algorithm isn't directly implemented by arch/*/crypto/ but rather is provided by a template instance using other code in arch/*/crypto/. For example, x86 doesn't have its own "ccm(aes)" but rather relies on the "ccm" template constructing it from the x86-optimized "ctr(aes)". The existence of the library-based "ccm(aes)" prevents that, even though its priority is lower than what the template would produce. Thus, "ccm(aes)" ends up using the slower single-block AES code. Therefore, skip wiring up the relevant library-based code to the traditional crypto API on architectures where this problem can occur, as determined by what exists in arch/*/crypto/ for each architecture. This is ugly, but it's also temporary: these conditions will go away as architecture-optimized implementations of AES modes are migrated into the library. But until then, we need to prevent performance regressions by ensuring that the optimized code continues to be used. Note: "xts(aes)" is left alone. Though the "xts" template can use "ecb(aes)" as an inner algorithm, in practice this isn't very efficient and a dedicated "xts(aes)" is already provided in all the important cases anyway. (This omission is also consistent with the fact that the library isn't planned to provide a similar ECB-to-XTS "adapter".) Fixes: 20df21a482aa ("crypto: aes - Add CBC and CBC-CTS support using library") Fixes: 8ca62072faa1 ("crypto: aes - Add GCM support using library") Fixes: f70ad727d1d6 ("crypto: aes - Add CCM support using library") Signed-off-by: Eric Biggers --- crypto/aes.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/crypto/aes.c b/crypto/aes.c index 94791f481e98..5046b887ac9a 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -637,7 +637,17 @@ static struct skcipher_alg skcipher_algs[] = { .decrypt = crypto_aes_cbc_decrypt, }, #endif -#if IS_ENABLED(CONFIG_CRYPTO_CTS) +#if IS_ENABLED(CONFIG_CRYPTO_CTS) && \ + /* + * Skip registering this when it might block a "better" implementation + * from being instantiated via the "cts" template wrapping an arch- + * optimized "cbc(aes)" that hasn't yet been migrated into the library. + */ \ + !(IS_ENABLED(CONFIG_ARM) || \ + IS_ENABLED(CONFIG_ARM64) || \ + IS_ENABLED(CONFIG_PPC) || \ + IS_ENABLED(CONFIG_S390) || \ + IS_ENABLED(CONFIG_SPARC)) { .base.cra_name = "cts(cbc(aes))", .base.cra_driver_name = "cts-cbc-aes-lib", @@ -980,7 +990,18 @@ static __maybe_unused int crypto_aes_ccm_decrypt(struct aead_request *req) } static struct aead_alg aead_algs[] = { -#if IS_ENABLED(CONFIG_CRYPTO_GCM) +#if IS_ENABLED(CONFIG_CRYPTO_GCM) && \ + /* + * Skip registering these when they might block "better" implementations + * from being instantiated via the corresponding templates using + * arch-optimized code that hasn't yet been migrated into the library. + */ \ + !(IS_ENABLED(CONFIG_ARM) || \ + IS_ENABLED(CONFIG_ARM64) || \ + IS_ENABLED(CONFIG_PPC) || \ + IS_ENABLED(CONFIG_RISCV) || \ + IS_ENABLED(CONFIG_S390) || \ + IS_ENABLED(CONFIG_SPARC)) { .base.cra_name = "gcm(aes)", .base.cra_driver_name = "gcm-aes-lib", @@ -1012,7 +1033,19 @@ static struct aead_alg aead_algs[] = { .chunksize = AES_BLOCK_SIZE, }, #endif /* CONFIG_CRYPTO_GCM */ -#if IS_ENABLED(CONFIG_CRYPTO_CCM) +#if IS_ENABLED(CONFIG_CRYPTO_CCM) && \ + /* + * Skip registering this when it might block a "better" implementation + * from being instantiated via the "ccm" template wrapping an arch- + * optimized "ctr(aes)" that hasn't yet been migrated into the library. + */ \ + !(IS_ENABLED(CONFIG_ARM) || \ + IS_ENABLED(CONFIG_ARM64) || \ + IS_ENABLED(CONFIG_PPC) || \ + IS_ENABLED(CONFIG_RISCV) || \ + IS_ENABLED(CONFIG_S390) || \ + IS_ENABLED(CONFIG_SPARC) || \ + IS_ENABLED(CONFIG_X86)) { .base.cra_name = "ccm(aes)", .base.cra_driver_name = "ccm-aes-lib", -- 2.55.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv