Commit be320395 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: arm64/sha256-ce - Use API partial block handling 



Use the Crypto API partial block handling.

Also remove the unnecessary SIMD fallback path.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5cd5d39e

arch/arm64/crypto/sha2-ce-glue.c

+18 −72
Original line number Diff line number Diff line
@@ -6,15 +6,13 @@ 
 */



#include <asm/neon.h>

#include <asm/simd.h>

#include <linux/unaligned.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/string.h>



MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash using ARMv8 Crypto Extensions");

MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
@@ -23,7 +21,7 @@ MODULE_ALIAS_CRYPTO("sha224"); 
MODULE_ALIAS_CRYPTO("sha256");



struct sha256_ce_state {

	struct sha256_state	sst;

	struct crypto_sha256_state sst;

	u32			finalize;

};
@@ -33,7 +31,7 @@ extern const u32 sha256_ce_offsetof_finalize; 
asmlinkage int __sha256_ce_transform(struct sha256_ce_state *sst, u8 const *src,

				     int blocks);



static void sha256_ce_transform(struct sha256_state *sst, u8 const *src,

static void sha256_ce_transform(struct crypto_sha256_state *sst, u8 const *src,

				int blocks)

{

	while (blocks) {
@@ -54,42 +52,21 @@ const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state, 
const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,

						 finalize);



asmlinkage void sha256_block_data_order(u32 *digest, u8 const *src, int blocks);



static void sha256_arm64_transform(struct sha256_state *sst, u8 const *src,

				   int blocks)

{

	sha256_block_data_order(sst->state, src, blocks);

}



static int sha256_ce_update(struct shash_desc *desc, const u8 *data,

			    unsigned int len)

{

	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	if (!crypto_simd_usable())

		return sha256_base_do_update(desc, data, len,

					     sha256_arm64_transform);



	sctx->finalize = 0;

	sha256_base_do_update(desc, data, len, sha256_ce_transform);



	return 0;

	return sha256_base_do_update_blocks(desc, data, len,

					    sha256_ce_transform);

}



static int sha256_ce_finup(struct shash_desc *desc, const u8 *data,

			   unsigned int len, u8 *out)

{

	struct sha256_ce_state *sctx = shash_desc_ctx(desc);

	bool finalize = !sctx->sst.count && !(len % SHA256_BLOCK_SIZE) && len;



	if (!crypto_simd_usable()) {

		if (len)

			sha256_base_do_update(desc, data, len,

					      sha256_arm64_transform);

		sha256_base_do_finalize(desc, sha256_arm64_transform);

		return sha256_base_finish(desc, out);

	}

	bool finalize = !(len % SHA256_BLOCK_SIZE) && len;



	/*

	 * Allow the asm code to perform the finalization if there is no
@@ -97,23 +74,11 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, 
	 */

	sctx->finalize = finalize;



	sha256_base_do_update(desc, data, len, sha256_ce_transform);

	if (!finalize)

		sha256_base_do_finalize(desc, sha256_ce_transform);

	return sha256_base_finish(desc, out);

}



static int sha256_ce_final(struct shash_desc *desc, u8 *out)

{

	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	if (!crypto_simd_usable()) {

		sha256_base_do_finalize(desc, sha256_arm64_transform);

		return sha256_base_finish(desc, out);

	}



	sctx->finalize = 0;

	sha256_base_do_finalize(desc, sha256_ce_transform);

	if (finalize)

		sha256_base_do_update_blocks(desc, data, len,

					     sha256_ce_transform);

	else

		sha256_base_do_finup(desc, data, len, sha256_ce_transform);

	return sha256_base_finish(desc, out);

}
@@ -124,55 +89,36 @@ static int sha256_ce_digest(struct shash_desc *desc, const u8 *data, 
	return sha256_ce_finup(desc, data, len, out);

}



static int sha256_ce_export(struct shash_desc *desc, void *out)

{

	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	memcpy(out, &sctx->sst, sizeof(struct sha256_state));

	return 0;

}



static int sha256_ce_import(struct shash_desc *desc, const void *in)

{

	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	memcpy(&sctx->sst, in, sizeof(struct sha256_state));

	sctx->finalize = 0;

	return 0;

}



static struct shash_alg algs[] = { {

	.init			= sha224_base_init,

	.update			= sha256_ce_update,

	.final			= sha256_ce_final,

	.finup			= sha256_ce_finup,

	.export			= sha256_ce_export,

	.import			= sha256_ce_import,

	.descsize		= sizeof(struct sha256_ce_state),

	.statesize		= sizeof(struct sha256_state),

	.statesize		= sizeof(struct crypto_sha256_state),

	.digestsize		= SHA224_DIGEST_SIZE,

	.base			= {

		.cra_name		= "sha224",

		.cra_driver_name	= "sha224-ce",

		.cra_priority		= 200,

		.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			= sha256_ce_update,

	.final			= sha256_ce_final,

	.finup			= sha256_ce_finup,

	.digest			= sha256_ce_digest,

	.export			= sha256_ce_export,

	.import			= sha256_ce_import,

	.descsize		= sizeof(struct sha256_ce_state),

	.statesize		= sizeof(struct sha256_state),

	.statesize		= sizeof(struct crypto_sha256_state),

	.digestsize		= SHA256_DIGEST_SIZE,

	.base			= {

		.cra_name		= "sha256",

		.cra_driver_name	= "sha256-ce",

		.cra_priority		= 200,

		.cra_flags		= CRYPTO_AHASH_ALG_BLOCK_ONLY |

					  CRYPTO_AHASH_ALG_FINUP_MAX,

		.cra_blocksize		= SHA256_BLOCK_SIZE,

		.cra_module		= THIS_MODULE,

	}