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

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

crypto: skcipher - un-inline encrypt and decrypt functions 



crypto_skcipher_encrypt() and crypto_skcipher_decrypt() have grown to be
more than a single indirect function call.  They now also check whether
a key has been set, and with CONFIG_CRYPTO_STATS=y they also update the
crypto statistics.  That can add up to a lot of bloat at every call
site.  Moreover, these always involve a function call anyway, which
greatly limits the benefits of inlining.

So change them to be non-inline.

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

crypto/skcipher.c

+34 −0
Original line number Diff line number Diff line
@@ -842,6 +842,40 @@ static int skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key, 
	return 0;

}



int crypto_skcipher_encrypt(struct skcipher_request *req)

{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int cryptlen = req->cryptlen;

	int ret;



	crypto_stats_get(alg);

	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		ret = -ENOKEY;

	else

		ret = tfm->encrypt(req);

	crypto_stats_skcipher_encrypt(cryptlen, ret, alg);

	return ret;

}

EXPORT_SYMBOL_GPL(crypto_skcipher_encrypt);



int crypto_skcipher_decrypt(struct skcipher_request *req)

{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int cryptlen = req->cryptlen;

	int ret;



	crypto_stats_get(alg);

	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		ret = -ENOKEY;

	else

		ret = tfm->decrypt(req);

	crypto_stats_skcipher_decrypt(cryptlen, ret, alg);

	return ret;

}

EXPORT_SYMBOL_GPL(crypto_skcipher_decrypt);



static void crypto_skcipher_exit_tfm(struct crypto_tfm *tfm)

{

	struct crypto_skcipher *skcipher = __crypto_skcipher_cast(tfm);

include/crypto/skcipher.h

+2 −30
Original line number Diff line number Diff line
@@ -484,21 +484,7 @@ static inline struct crypto_sync_skcipher *crypto_sync_skcipher_reqtfm( 
 *

 * Return: 0 if the cipher operation was successful; < 0 if an error occurred

 */

static inline int crypto_skcipher_encrypt(struct skcipher_request *req)

{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int cryptlen = req->cryptlen;

	int ret;



	crypto_stats_get(alg);

	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		ret = -ENOKEY;

	else

		ret = tfm->encrypt(req);

	crypto_stats_skcipher_encrypt(cryptlen, ret, alg);

	return ret;

}

int crypto_skcipher_encrypt(struct skcipher_request *req);



/**

 * crypto_skcipher_decrypt() - decrypt ciphertext
@@ -511,21 +497,7 @@ static inline int crypto_skcipher_encrypt(struct skcipher_request *req) 
 *

 * Return: 0 if the cipher operation was successful; < 0 if an error occurred

 */

static inline int crypto_skcipher_decrypt(struct skcipher_request *req)

{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct crypto_alg *alg = tfm->base.__crt_alg;

	unsigned int cryptlen = req->cryptlen;

	int ret;



	crypto_stats_get(alg);

	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		ret = -ENOKEY;

	else

		ret = tfm->decrypt(req);

	crypto_stats_skcipher_decrypt(cryptlen, ret, alg);

	return ret;

}

int crypto_skcipher_decrypt(struct skcipher_request *req);



/**

 * DOC: Symmetric Key Cipher Request Handle