From patchwork Fri Apr 18 02:59:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 882689 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EACF6269839 for ; Fri, 18 Apr 2025 02:59:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945195; cv=none; b=RArloQbOW5b5yKwfADtQyzW4Ig0l4lwy9KkJknjjLcMc4Lb807Kct6xsH/GwAb6jKsOTpdULhtvnrjwlQ9TRQ5pshqRZYIszdZtZH0GYsJcCT67uQwue125gIB3aJsbnHEswrwpTldWtBMW7Ac+gHAj5Wgtc66Nn/SCN9+Bmc2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945195; c=relaxed/simple; bh=aj7iwrEy9Elxa7xsvH4BzZih7fRgyX3JZ4i9wpM7X2w=; h=Date:Message-Id:In-Reply-To:References:From:Subject:To; b=rNoMB5jyW9SUGg8hWyXDruq7RG7eKYyIzYASmCdTP4e1e53A9uTl3HVXfGA87MvApWiSaYti5fWUStiGnobxMS67tZAZ+5/NyR4cwatFgQ3FStC/NSYw+g/wTtQuoVi24oyKJnDvYgvinA5cf431+9MQdNZBYF+rR0CZGq7/4gA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b=dn7+IySi; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b="dn7+IySi" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=To:Subject:From:References:In-Reply-To:Message-Id:Date:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0kqRMywYfo5lO5nH4iqtFmMithplzjI2yVpEq0p61Yw=; b=dn7+IySi0O6nwZYvDpVeSCcZQX ZeDJhj73TIZIc8jnwoQ/5KhtHWX/C6tqA/thmKq1rCa5U3T6dA5Sac11HuYae4XLptBPcPx7g9TbE MAsMsOkcthax/sAfjb4sBnYiEyjaXmfc4A/SHrVrpm2SxlSbM/lfysvBYROdqA462FRpoo28f1Gns X14qqJgLX1Oz1vzcC/gZY0wrkFnTT1n4T/0wCGZ94P/IRuFUTIQFAYk/EFfX9Y+JrEVsmcTDU2aAr m7BJPxgeJyGVuzzm+6JducoF8rTuIS1/+p8kjwp2e5W/9/lHx1/Mi8EBQ6KNo/Hc89mMtqnOau/bJ gVasPqJQ==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1u5bxG-00Ge91-1Y; Fri, 18 Apr 2025 10:59:51 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 18 Apr 2025 10:59:50 +0800 Date: Fri, 18 Apr 2025 10:59:50 +0800 Message-Id: In-Reply-To: References: From: Herbert Xu Subject: [v2 PATCH 31/67] crypto: arm/sha256-ce - Use API partial block handling To: Linux Crypto Mailing List Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Use the Crypto API partial block handling. Also remove the unnecessary SIMD fallback path. Signed-off-by: Herbert Xu --- arch/arm/crypto/sha2-ce-glue.c | 52 ++++++++++------------------------ 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/arch/arm/crypto/sha2-ce-glue.c b/arch/arm/crypto/sha2-ce-glue.c index aeac45bfbf9f..1e9d16f79678 100644 --- a/arch/arm/crypto/sha2-ce-glue.c +++ b/arch/arm/crypto/sha2-ce-glue.c @@ -5,91 +5,69 @@ * Copyright (C) 2015 Linaro Ltd */ +#include #include -#include #include #include #include -#include +#include #include -#include -#include -#include -#include - -#include "sha256_glue.h" - MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash using ARMv8 Crypto Extensions"); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); -asmlinkage void sha2_ce_transform(struct sha256_state *sst, u8 const *src, - int blocks); +asmlinkage void sha2_ce_transform(struct crypto_sha256_state *sst, + u8 const *src, int blocks); static int sha2_ce_update(struct shash_desc *desc, const u8 *data, unsigned int len) { - struct sha256_state *sctx = shash_desc_ctx(desc); - - if (!crypto_simd_usable() || - (sctx->count % SHA256_BLOCK_SIZE) + len < SHA256_BLOCK_SIZE) - return crypto_sha256_arm_update(desc, data, len); + int remain; kernel_neon_begin(); - sha256_base_do_update(desc, data, len, - (sha256_block_fn *)sha2_ce_transform); + remain = sha256_base_do_update_blocks(desc, data, len, + sha2_ce_transform); kernel_neon_end(); - - return 0; + return remain; } static int sha2_ce_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { - if (!crypto_simd_usable()) - return crypto_sha256_arm_finup(desc, data, len, out); - kernel_neon_begin(); - if (len) - sha256_base_do_update(desc, data, len, - (sha256_block_fn *)sha2_ce_transform); - sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform); + sha256_base_do_finup(desc, data, len, sha2_ce_transform); kernel_neon_end(); - return sha256_base_finish(desc, out); } -static int sha2_ce_final(struct shash_desc *desc, u8 *out) -{ - return sha2_ce_finup(desc, NULL, 0, out); -} - static struct shash_alg algs[] = { { .init = sha224_base_init, .update = sha2_ce_update, - .final = sha2_ce_final, .finup = sha2_ce_finup, - .descsize = sizeof(struct sha256_state), + .descsize = sizeof(struct crypto_sha256_state), .digestsize = SHA224_DIGEST_SIZE, .base = { .cra_name = "sha224", .cra_driver_name = "sha224-ce", .cra_priority = 300, + .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY | + CRYPTO_AHASH_ALG_FINUP_MAX, .cra_blocksize = SHA256_BLOCK_SIZE, .cra_module = THIS_MODULE, } }, { .init = sha256_base_init, .update = sha2_ce_update, - .final = sha2_ce_final, .finup = sha2_ce_finup, - .descsize = sizeof(struct sha256_state), + .descsize = sizeof(struct crypto_sha256_state), .digestsize = SHA256_DIGEST_SIZE, .base = { .cra_name = "sha256", .cra_driver_name = "sha256-ce", .cra_priority = 300, + .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY | + CRYPTO_AHASH_ALG_FINUP_MAX, .cra_blocksize = SHA256_BLOCK_SIZE, .cra_module = THIS_MODULE, }