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

crypto: algboss - optimize registration of internal algorithms 



Since algboss always skips testing of algorithms with the
CRYPTO_ALG_INTERNAL flag, there is no need to go through the dance of
creating the test kthread, which creates a lot of overhead.  Instead, we
can just directly finish the algorithm registration, like is now done
when self-tests are disabled entirely.

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

crypto/algapi.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static struct crypto_larval *crypto_alloc_test_larval(struct crypto_alg *alg) 
	struct crypto_larval *larval;



	if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER) ||

	    IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS))

	    IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) ||

	    (alg->cra_flags & CRYPTO_ALG_INTERNAL))

		return NULL; /* No self-test needed */



	larval = crypto_larval_alloc(alg->cra_name,

crypto/algboss.c

+1 −12
Original line number Diff line number Diff line
@@ -181,12 +181,8 @@ static int cryptomgr_test(void *data) 
	goto skiptest;

#endif



	if (type & CRYPTO_ALG_TESTED)

		goto skiptest;



	err = alg_test(param->driver, param->alg, type, CRYPTO_ALG_TESTED);



skiptest:

	crypto_alg_tested(param->driver, err);



	kfree(param);
@@ -197,7 +193,6 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) 
{

	struct task_struct *thread;

	struct crypto_test_param *param;

	u32 type;



	if (!try_module_get(THIS_MODULE))

		goto err;
@@ -208,13 +203,7 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) 


	memcpy(param->driver, alg->cra_driver_name, sizeof(param->driver));

	memcpy(param->alg, alg->cra_name, sizeof(param->alg));

	type = alg->cra_flags;



	/* Do not test internal algorithms. */

	if (type & CRYPTO_ALG_INTERNAL)

		type |= CRYPTO_ALG_TESTED;



	param->type = type;

	param->type = alg->cra_flags;



	thread = kthread_run(cryptomgr_test, param, "cryptomgr_test");

	if (IS_ERR(thread))