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

Commit 263a8df0 authored by Luca Clementi's avatar Luca Clementi Committed by Herbert Xu
Browse files

crypto: tcrypt - print cra driver name in tcrypt tests output 



Print the driver name that is being tested. The driver name can be
inferred parsing /proc/crypto but having it in the output is
clearer

Signed-off-by: default avatarLuca Clementi <luca.clementi@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 14748d7c

crypto/tcrypt.c

+20 −11
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#define ENCRYPT 1

#define DECRYPT 0



/*

 * return a string with the driver name

 */

#define get_driver_name(tfm_type, tfm) crypto_tfm_alg_driver_name(tfm_type ## _tfm(tfm))



/*

 * Used by test_cipher_speed()

 */
@@ -305,9 +310,6 @@ static void test_aead_speed(const char *algo, int enc, unsigned int sec, 
	asg = &sg[8];

	sgout = &asg[8];





	printk(KERN_INFO "\ntesting speed of %s %s\n", algo, e);



	tfm = crypto_alloc_aead(algo, 0, 0);



	if (IS_ERR(tfm)) {
@@ -316,6 +318,9 @@ static void test_aead_speed(const char *algo, int enc, unsigned int sec, 
		goto out_notfm;

	}



	printk(KERN_INFO "\ntesting speed of %s (%s) %s\n", algo,

			get_driver_name(crypto_aead, tfm), e);



	req = aead_request_alloc(tfm, GFP_KERNEL);

	if (!req) {

		pr_err("alg: aead: Failed to allocate request for %s\n",
@@ -422,8 +427,6 @@ static void test_cipher_speed(const char *algo, int enc, unsigned int sec, 
	else

		e = "decryption";



	printk("\ntesting speed of %s %s\n", algo, e);



	tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);



	if (IS_ERR(tfm)) {
@@ -434,6 +437,9 @@ static void test_cipher_speed(const char *algo, int enc, unsigned int sec, 
	desc.tfm = tfm;

	desc.flags = 0;



	printk(KERN_INFO "\ntesting speed of %s (%s) %s\n", algo,

			get_driver_name(crypto_blkcipher, tfm), e);



	i = 0;

	do {
@@ -683,8 +689,6 @@ static void test_hash_speed(const char *algo, unsigned int sec, 
	int i;

	int ret;



	printk(KERN_INFO "\ntesting speed of %s\n", algo);



	tfm = crypto_alloc_hash(algo, 0, CRYPTO_ALG_ASYNC);



	if (IS_ERR(tfm)) {
@@ -693,6 +697,9 @@ static void test_hash_speed(const char *algo, unsigned int sec, 
		return;

	}



	printk(KERN_INFO "\ntesting speed of %s (%s)\n", algo,

			get_driver_name(crypto_hash, tfm));



	desc.tfm = tfm;

	desc.flags = 0;
@@ -921,8 +928,6 @@ static void test_ahash_speed(const char *algo, unsigned int sec, 
	static char output[1024];

	int i, ret;



	printk(KERN_INFO "\ntesting speed of async %s\n", algo);



	tfm = crypto_alloc_ahash(algo, 0, 0);

	if (IS_ERR(tfm)) {

		pr_err("failed to load transform for %s: %ld\n",
@@ -930,6 +935,9 @@ static void test_ahash_speed(const char *algo, unsigned int sec, 
		return;

	}



	printk(KERN_INFO "\ntesting speed of async %s (%s)\n", algo,

			get_driver_name(crypto_ahash, tfm));



	if (crypto_ahash_digestsize(tfm) > sizeof(output)) {

		pr_err("digestsize(%u) > outputbuffer(%zu)\n",

		       crypto_ahash_digestsize(tfm), sizeof(output));
@@ -1083,8 +1091,6 @@ static void test_acipher_speed(const char *algo, int enc, unsigned int sec, 
	else

		e = "decryption";



	pr_info("\ntesting speed of async %s %s\n", algo, e);



	init_completion(&tresult.completion);



	tfm = crypto_alloc_ablkcipher(algo, 0, 0);
@@ -1095,6 +1101,9 @@ static void test_acipher_speed(const char *algo, int enc, unsigned int sec, 
		return;

	}



	pr_info("\ntesting speed of async %s (%s) %s\n", algo,

			get_driver_name(crypto_ablkcipher, tfm), e);



	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);

	if (!req) {

		pr_err("tcrypt: skcipher: Failed to allocate request for %s\n",