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

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

crypto: x86 - convert to use crypto_simd_usable() 



Replace all calls to irq_fpu_usable() in the x86 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 b55e1a39

arch/x86/crypto/aesni-intel_glue.c

+4 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#include <crypto/gcm.h>

#include <crypto/xts.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/api.h>

#include <asm/crypto/aes.h>

#include <asm/simd.h>

#include <crypto/scatterwalk.h>

#include <crypto/internal/aead.h>

#include <crypto/internal/simd.h>
@@ -332,7 +332,7 @@ static int aes_set_key_common(struct crypto_tfm *tfm, void *raw_ctx, 
		return -EINVAL;

	}



	if (!irq_fpu_usable())

	if (!crypto_simd_usable())

		err = crypto_aes_expand_key(ctx, in_key, key_len);

	else {

		kernel_fpu_begin();
@@ -353,7 +353,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));



	if (!irq_fpu_usable())

	if (!crypto_simd_usable())

		crypto_aes_encrypt_x86(ctx, dst, src);

	else {

		kernel_fpu_begin();
@@ -366,7 +366,7 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));



	if (!irq_fpu_usable())

	if (!crypto_simd_usable())

		crypto_aes_decrypt_x86(ctx, dst, src);

	else {

		kernel_fpu_begin();

arch/x86/crypto/chacha_glue.c

+3 −3
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 


#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>

#include <asm/fpu/api.h>

#include <asm/simd.h>



#define CHACHA_STATE_ALIGN 16
@@ -170,7 +170,7 @@ static int chacha_simd(struct skcipher_request *req) 
	struct skcipher_walk walk;

	int err;



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

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

		return crypto_chacha_crypt(req);



	err = skcipher_walk_virt(&walk, req, true);
@@ -193,7 +193,7 @@ static int xchacha_simd(struct skcipher_request *req) 
	u8 real_iv[16];

	int err;



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

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

		return crypto_xchacha_crypt(req);



	err = skcipher_walk_virt(&walk, req, true);

arch/x86/crypto/crc32-pclmul_glue.c

+3 −2
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ 
#include <linux/kernel.h>

#include <linux/crc32.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/api.h>

#include <asm/simd.h>



#define CHKSUM_BLOCK_SIZE	1

#define CHKSUM_DIGEST_SIZE	4
@@ -54,7 +55,7 @@ static u32 __attribute__((pure)) 
	unsigned int iremainder;

	unsigned int prealign;



	if (len < PCLMUL_MIN_LEN + SCALE_F_MASK || !irq_fpu_usable())

	if (len < PCLMUL_MIN_LEN + SCALE_F_MASK || !crypto_simd_usable())

		return crc32_le(crc, p, len);



	if ((long)p & SCALE_F_MASK) {

arch/x86/crypto/crc32c-intel_glue.c

+4 −3
Original line number Diff line number Diff line
@@ -29,10 +29,11 @@ 
#include <linux/string.h>

#include <linux/kernel.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>



#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/fpu/internal.h>

#include <asm/simd.h>



#define CHKSUM_BLOCK_SIZE	1

#define CHKSUM_DIGEST_SIZE	4
@@ -177,7 +178,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data, 
	 * use faster PCL version if datasize is large enough to

	 * overcome kernel fpu state save/restore overhead

	 */

	if (len >= CRC32C_PCL_BREAKEVEN && irq_fpu_usable()) {

	if (len >= CRC32C_PCL_BREAKEVEN && crypto_simd_usable()) {

		kernel_fpu_begin();

		*crcp = crc_pcl(data, len, *crcp);

		kernel_fpu_end();
@@ -189,7 +190,7 @@ static int crc32c_pcl_intel_update(struct shash_desc *desc, const u8 *data, 
static int __crc32c_pcl_intel_finup(u32 *crcp, const u8 *data, unsigned int len,

				u8 *out)

{

	if (len >= CRC32C_PCL_BREAKEVEN && irq_fpu_usable()) {

	if (len >= CRC32C_PCL_BREAKEVEN && crypto_simd_usable()) {

		kernel_fpu_begin();

		*(__le32 *)out = ~cpu_to_le32(crc_pcl(data, len, *crcp));

		kernel_fpu_end();

arch/x86/crypto/crct10dif-pclmul_glue.c

+4 −3
Original line number Diff line number Diff line
@@ -26,12 +26,13 @@ 
#include <linux/module.h>

#include <linux/crc-t10dif.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <linux/init.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <asm/fpu/api.h>

#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/simd.h>



asmlinkage u16 crc_t10dif_pcl(u16 init_crc, const u8 *buf, size_t len);
@@ -53,7 +54,7 @@ static int chksum_update(struct shash_desc *desc, const u8 *data, 
{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	if (length >= 16 && irq_fpu_usable()) {

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

		kernel_fpu_begin();

		ctx->crc = crc_t10dif_pcl(ctx->crc, data, length);

		kernel_fpu_end();
@@ -73,7 +74,7 @@ static int chksum_final(struct shash_desc *desc, u8 *out) 
static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len,

			u8 *out)

{

	if (len >= 16 && irq_fpu_usable()) {

	if (len >= 16 && crypto_simd_usable()) {

		kernel_fpu_begin();

		*(__u16 *)out = crc_t10dif_pcl(*crcp, data, len);

		kernel_fpu_end();