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

crypto: x86/camellia - stop using the SIMD helper 



Stop wrapping skcipher and aead algorithms with the crypto SIMD helper
(crypto/simd.c).  The only purpose of doing so was to work around x86
not always supporting kernel-mode FPU in softirqs.  Specifically, if a
hardirq interrupted a task context kernel-mode FPU section and then a
softirqs were run at the end of that hardirq, those softirqs could not
use kernel-mode FPU.  This has now been fixed.  In combination with the
fact that the skcipher and aead APIs only support task and softirq
contexts, these can now just use kernel-mode FPU unconditionally on x86.

This simplifies the code and improves performance.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6e3379b9

arch/x86/crypto/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 
	depends on X86 && 64BIT

	select CRYPTO_SKCIPHER

	select CRYPTO_CAMELLIA_X86_64

	select CRYPTO_SIMD

	imply CRYPTO_XTS

	help

	  Length-preserving ciphers: Camellia with ECB and CBC modes

arch/x86/crypto/camellia_aesni_avx2_glue.c

+7 −14
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 */



#include <crypto/algapi.h>

#include <crypto/internal/simd.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <linux/module.h>
@@ -69,10 +68,9 @@ static int cbc_decrypt(struct skcipher_request *req) 


static struct skcipher_alg camellia_algs[] = {

	{

		.base.cra_name		= "__ecb(camellia)",

		.base.cra_driver_name	= "__ecb-camellia-aesni-avx2",

		.base.cra_name		= "ecb(camellia)",

		.base.cra_driver_name	= "ecb-camellia-aesni-avx2",

		.base.cra_priority	= 500,

		.base.cra_flags		= CRYPTO_ALG_INTERNAL,

		.base.cra_blocksize	= CAMELLIA_BLOCK_SIZE,

		.base.cra_ctxsize	= sizeof(struct camellia_ctx),

		.base.cra_module	= THIS_MODULE,
@@ -82,10 +80,9 @@ static struct skcipher_alg camellia_algs[] = { 
		.encrypt		= ecb_encrypt,

		.decrypt		= ecb_decrypt,

	}, {

		.base.cra_name		= "__cbc(camellia)",

		.base.cra_driver_name	= "__cbc-camellia-aesni-avx2",

		.base.cra_name		= "cbc(camellia)",

		.base.cra_driver_name	= "cbc-camellia-aesni-avx2",

		.base.cra_priority	= 500,

		.base.cra_flags		= CRYPTO_ALG_INTERNAL,

		.base.cra_blocksize	= CAMELLIA_BLOCK_SIZE,

		.base.cra_ctxsize	= sizeof(struct camellia_ctx),

		.base.cra_module	= THIS_MODULE,
@@ -98,8 +95,6 @@ static struct skcipher_alg camellia_algs[] = { 
	},

};



static struct simd_skcipher_alg *camellia_simd_algs[ARRAY_SIZE(camellia_algs)];



static int __init camellia_aesni_init(void)

{

	const char *feature_name;
@@ -118,15 +113,13 @@ static int __init camellia_aesni_init(void) 
		return -ENODEV;

	}



	return simd_register_skciphers_compat(camellia_algs,

					      ARRAY_SIZE(camellia_algs),

					      camellia_simd_algs);

	return crypto_register_skciphers(camellia_algs,

					 ARRAY_SIZE(camellia_algs));

}



static void __exit camellia_aesni_fini(void)

{

	simd_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs),

				  camellia_simd_algs);

	crypto_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs));

}



module_init(camellia_aesni_init);

arch/x86/crypto/camellia_aesni_avx_glue.c

+7 −14
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 */



#include <crypto/algapi.h>

#include <crypto/internal/simd.h>

#include <linux/crypto.h>

#include <linux/err.h>

#include <linux/module.h>
@@ -69,10 +68,9 @@ static int cbc_decrypt(struct skcipher_request *req) 


static struct skcipher_alg camellia_algs[] = {

	{

		.base.cra_name		= "__ecb(camellia)",

		.base.cra_driver_name	= "__ecb-camellia-aesni",

		.base.cra_name		= "ecb(camellia)",

		.base.cra_driver_name	= "ecb-camellia-aesni",

		.base.cra_priority	= 400,

		.base.cra_flags		= CRYPTO_ALG_INTERNAL,

		.base.cra_blocksize	= CAMELLIA_BLOCK_SIZE,

		.base.cra_ctxsize	= sizeof(struct camellia_ctx),

		.base.cra_module	= THIS_MODULE,
@@ -82,10 +80,9 @@ static struct skcipher_alg camellia_algs[] = { 
		.encrypt		= ecb_encrypt,

		.decrypt		= ecb_decrypt,

	}, {

		.base.cra_name		= "__cbc(camellia)",

		.base.cra_driver_name	= "__cbc-camellia-aesni",

		.base.cra_name		= "cbc(camellia)",

		.base.cra_driver_name	= "cbc-camellia-aesni",

		.base.cra_priority	= 400,

		.base.cra_flags		= CRYPTO_ALG_INTERNAL,

		.base.cra_blocksize	= CAMELLIA_BLOCK_SIZE,

		.base.cra_ctxsize	= sizeof(struct camellia_ctx),

		.base.cra_module	= THIS_MODULE,
@@ -98,8 +95,6 @@ static struct skcipher_alg camellia_algs[] = { 
	}

};



static struct simd_skcipher_alg *camellia_simd_algs[ARRAY_SIZE(camellia_algs)];



static int __init camellia_aesni_init(void)

{

	const char *feature_name;
@@ -117,15 +112,13 @@ static int __init camellia_aesni_init(void) 
		return -ENODEV;

	}



	return simd_register_skciphers_compat(camellia_algs,

					      ARRAY_SIZE(camellia_algs),

					      camellia_simd_algs);

	return crypto_register_skciphers(camellia_algs,

					 ARRAY_SIZE(camellia_algs));

}



static void __exit camellia_aesni_fini(void)

{

	simd_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs),

				  camellia_simd_algs);

	crypto_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs));

}



module_init(camellia_aesni_init);