Commit a2484474 authored by Eric Biggers's avatar Eric Biggers
Browse files

crypto: aes - Replace aes-generic with wrapper around lib 



Now that the AES library's performance has been improved, replace
aes_generic.c with a new file aes.c which wraps the AES library.

In preparation for making the AES library actually utilize the kernel's
existing architecture-optimized AES code including AES instructions, set
the driver name to "aes-lib" instead of "aes-generic".  This mirrors
what's been done for the hash algorithms.  Update testmgr.c accordingly.

Since this removes the crypto_aes_set_key() helper function, add
temporary replacements for it to arch/arm/crypto/aes-cipher-glue.c and
arch/arm64/crypto/aes-cipher-glue.c.  This is temporary, as that code
will be migrated into lib/crypto/ in later commits.

Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260112192035.10427-10-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 641e7056

arch/arm/crypto/aes-cipher-glue.c

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 
EXPORT_SYMBOL_GPL(__aes_arm_encrypt);

EXPORT_SYMBOL_GPL(__aes_arm_decrypt);



static int aes_arm_setkey(struct crypto_tfm *tfm, const u8 *in_key,

			  unsigned int key_len)

{

	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);



	return aes_expandkey(ctx, in_key, key_len);

}



static void aes_arm_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -41,7 +49,7 @@ static struct crypto_alg aes_alg = { 


	.cra_cipher.cia_min_keysize	= AES_MIN_KEY_SIZE,

	.cra_cipher.cia_max_keysize	= AES_MAX_KEY_SIZE,

	.cra_cipher.cia_setkey		= crypto_aes_set_key,

	.cra_cipher.cia_setkey		= aes_arm_setkey,

	.cra_cipher.cia_encrypt		= aes_arm_encrypt,

	.cra_cipher.cia_decrypt		= aes_arm_decrypt,

arch/arm64/crypto/aes-cipher-glue.c

+9 −1
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ 
asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int rounds);

asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds);



static int aes_arm64_setkey(struct crypto_tfm *tfm, const u8 *in_key,

			    unsigned int key_len)

{

	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);



	return aes_expandkey(ctx, in_key, key_len);

}



static void aes_arm64_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	struct crypto_aes_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -39,7 +47,7 @@ static struct crypto_alg aes_alg = { 


	.cra_cipher.cia_min_keysize	= AES_MIN_KEY_SIZE,

	.cra_cipher.cia_max_keysize	= AES_MAX_KEY_SIZE,

	.cra_cipher.cia_setkey		= crypto_aes_set_key,

	.cra_cipher.cia_setkey		= aes_arm64_setkey,

	.cra_cipher.cia_encrypt		= aes_arm64_encrypt,

	.cra_cipher.cia_decrypt		= aes_arm64_decrypt

};

crypto/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o 
obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o

obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o

CFLAGS_serpent_generic.o := $(call cc-option,-fsched-pressure)  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149

obj-$(CONFIG_CRYPTO_AES) += aes_generic.o

CFLAGS_aes_generic.o := $(call cc-option,-fno-code-hoisting) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83356

obj-$(CONFIG_CRYPTO_AES) += aes.o

obj-$(CONFIG_CRYPTO_SM4) += sm4.o

obj-$(CONFIG_CRYPTO_SM4_GENERIC) += sm4_generic.o

obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o

crypto/aes.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Crypto API support for AES block cipher

 *

 * Copyright 2026 Google LLC

 */



#include <crypto/aes.h>

#include <crypto/algapi.h>

#include <linux/module.h>



static_assert(__alignof__(struct aes_key) <= CRYPTO_MINALIGN);



static int crypto_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key,

			     unsigned int key_len)

{

	struct aes_key *key = crypto_tfm_ctx(tfm);



	return aes_preparekey(key, in_key, key_len);

}



static void crypto_aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	const struct aes_key *key = crypto_tfm_ctx(tfm);



	aes_encrypt(key, out, in);

}



static void crypto_aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

	const struct aes_key *key = crypto_tfm_ctx(tfm);



	aes_decrypt(key, out, in);

}



static struct crypto_alg alg = {

	.cra_name = "aes",

	.cra_driver_name = "aes-lib",

	.cra_priority = 100,

	.cra_flags = CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize = AES_BLOCK_SIZE,

	.cra_ctxsize = sizeof(struct aes_key),

	.cra_module = THIS_MODULE,

	.cra_u = { .cipher = { .cia_min_keysize = AES_MIN_KEY_SIZE,

			       .cia_max_keysize = AES_MAX_KEY_SIZE,

			       .cia_setkey = crypto_aes_setkey,

			       .cia_encrypt = crypto_aes_encrypt,

			       .cia_decrypt = crypto_aes_decrypt } }

};



static int __init crypto_aes_mod_init(void)

{

	return crypto_register_alg(&alg);

}

module_init(crypto_aes_mod_init);



static void __exit crypto_aes_mod_exit(void)

{

	crypto_unregister_alg(&alg);

}

module_exit(crypto_aes_mod_exit);



MODULE_DESCRIPTION("Crypto API support for AES block cipher");

MODULE_LICENSE("GPL");

MODULE_ALIAS_CRYPTO("aes");

MODULE_ALIAS_CRYPTO("aes-lib");

crypto/aes_generic.c

deleted100644 → 0
+0 −1320

File deleted.

Preview size limit exceeded, changes collapsed.