Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99680c5e authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: arm - convert to use crypto_simd_usable() 



Replace all calls to may_use_simd() in the arm crypto code with
crypto_simd_usable(), in order to allow testing the no-SIMD code paths.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f2abe0d7

arch/arm/crypto/chacha-neon-glue.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <crypto/algapi.h>

#include <crypto/chacha.h>

#include <crypto/internal/simd.h>

#include <crypto/internal/skcipher.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -93,7 +94,7 @@ static int chacha_neon(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);



	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !may_use_simd())

	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())

		return crypto_chacha_crypt(req);



	return chacha_neon_stream_xor(req, ctx, req->iv);
@@ -107,7 +108,7 @@ static int xchacha_neon(struct skcipher_request *req) 
	u32 state[16];

	u8 real_iv[16];



	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !may_use_simd())

	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())

		return crypto_xchacha_crypt(req);



	crypto_chacha_init(state, ctx, req->iv);

arch/arm/crypto/crc32-ce-glue.c

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/string.h>



#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/hwcap.h>

#include <asm/neon.h>
@@ -113,7 +114,7 @@ static int crc32_pmull_update(struct shash_desc *desc, const u8 *data, 
	u32 *crc = shash_desc_ctx(desc);

	unsigned int l;



	if (may_use_simd()) {

	if (crypto_simd_usable()) {

		if ((u32)data % SCALE_F) {

			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));
@@ -147,7 +148,7 @@ static int crc32c_pmull_update(struct shash_desc *desc, const u8 *data, 
	u32 *crc = shash_desc_ctx(desc);

	unsigned int l;



	if (may_use_simd()) {

	if (crypto_simd_usable()) {

		if ((u32)data % SCALE_F) {

			l = min_t(u32, length, SCALE_F - ((u32)data % SCALE_F));

arch/arm/crypto/crct10dif-ce-glue.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/string.h>



#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/neon.h>

#include <asm/simd.h>
@@ -36,7 +37,7 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data, 
{

	u16 *crc = shash_desc_ctx(desc);



	if (length >= CRC_T10DIF_PMULL_CHUNK_SIZE && may_use_simd()) {

	if (length >= CRC_T10DIF_PMULL_CHUNK_SIZE && crypto_simd_usable()) {

		kernel_neon_begin();

		*crc = crc_t10dif_pmull(*crc, data, length);

		kernel_neon_end();

arch/arm/crypto/ghash-ce-glue.c

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/unaligned.h>

#include <crypto/cryptd.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/gf128mul.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>
@@ -196,7 +197,7 @@ static int ghash_async_update(struct ahash_request *req) 
	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	if (!may_use_simd() ||

	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);
@@ -214,7 +215,7 @@ static int ghash_async_final(struct ahash_request *req) 
	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	if (!may_use_simd() ||

	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);
@@ -232,7 +233,7 @@ static int ghash_async_digest(struct ahash_request *req) 
	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	if (!may_use_simd() ||

	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

arch/arm/crypto/nhpoly1305-neon-glue.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/neon.h>

#include <asm/simd.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/nhpoly1305.h>

#include <linux/module.h>
@@ -25,7 +26,7 @@ static void _nh_neon(const u32 *key, const u8 *message, size_t message_len, 
static int nhpoly1305_neon_update(struct shash_desc *desc,

				  const u8 *src, unsigned int srclen)

{

	if (srclen < 64 || !may_use_simd())

	if (srclen < 64 || !crypto_simd_usable())

		return crypto_nhpoly1305_update(desc, src, srclen);



	do {