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

Commit d5dc3927 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Herbert Xu
Browse files

[CRYPTO] tcrypt: Shrink speed templates 



The speed templates as it look always the same. The key size
is repeated for each block size and we test always the same
block size. The addition of one inner loop makes it possible
to get rid of the struct and it is possible to use a tiny
u8 array :)

Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 477035c2

crypto/tcrypt.c

+50 −39
Original line number Diff line number Diff line
@@ -721,15 +721,18 @@ static int test_cipher_cycles(struct blkcipher_desc *desc, int enc, char *p, 
	return ret;

}



static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 };



static void test_cipher_speed(char *algo, int enc, unsigned int sec,

			      struct cipher_testvec *template,

			      unsigned int tcount, struct cipher_speed *speed)

			      unsigned int tcount, u8 *keysize)

{

	unsigned int ret, i, j, iv_len;

	unsigned char *key, *p, iv[128];

	struct crypto_blkcipher *tfm;

	struct blkcipher_desc desc;

	const char *e;

	u32 *b_size;



	if (enc == ENCRYPT)

	        e = "encryption";
@@ -748,29 +751,34 @@ static void test_cipher_speed(char *algo, int enc, unsigned int sec, 
	desc.tfm = tfm;

	desc.flags = 0;



	for (i = 0; speed[i].klen != 0; i++) {

		if ((speed[i].blen + speed[i].klen) > TVMEMSIZE) {

	i = 0;

	do {



		b_size = block_sizes;

		do {



			if ((*keysize + *b_size) > TVMEMSIZE) {

				printk("template (%u) too big for tvmem (%u)\n",

			       speed[i].blen + speed[i].klen, TVMEMSIZE);

						*keysize + *b_size, TVMEMSIZE);

				goto out;

			}



			printk("test %u (%d bit key, %d byte blocks): ", i,

		       speed[i].klen * 8, speed[i].blen);

					*keysize * 8, *b_size);



		memset(tvmem, 0xff, speed[i].klen + speed[i].blen);

			memset(tvmem, 0xff, *keysize + *b_size);



			/* set key, plain text and IV */

			key = (unsigned char *)tvmem;

			for (j = 0; j < tcount; j++) {

			if (template[j].klen == speed[i].klen) {

				if (template[j].klen == *keysize) {

					key = template[j].key;

					break;

				}

			}

		p = (unsigned char *)tvmem + speed[i].klen;

			p = (unsigned char *)tvmem + *keysize;



		ret = crypto_blkcipher_setkey(tfm, key, speed[i].klen);

			ret = crypto_blkcipher_setkey(tfm, key, *keysize);

			if (ret) {

				printk("setkey() failed flags=%x\n",

						crypto_blkcipher_get_flags(tfm));
@@ -784,16 +792,19 @@ static void test_cipher_speed(char *algo, int enc, unsigned int sec, 
			}



			if (sec)

			ret = test_cipher_jiffies(&desc, enc, p, speed[i].blen,

						  sec);

				ret = test_cipher_jiffies(&desc, enc, p, *b_size, sec);

			else

			ret = test_cipher_cycles(&desc, enc, p, speed[i].blen);

				ret = test_cipher_cycles(&desc, enc, p, *b_size);



			if (ret) {

				printk("%s() failed flags=%x\n", e, desc.flags);

				break;

			}

	}

			b_size++;

			i++;

		} while (*b_size);

		keysize++;

	} while (*keysize);



out:

	crypto_free_blkcipher(tfm);

crypto/tcrypt.h

+7 −122
Original line number Diff line number Diff line
@@ -72,11 +72,6 @@ struct aead_testvec { 
	unsigned short rlen;

};



struct cipher_speed {

	unsigned char klen;

	unsigned int blen;

};



struct hash_speed {

	unsigned int blen;	/* buffer length */

	unsigned int plen;	/* per-update length */
@@ -8032,123 +8027,13 @@ static struct hash_testvec crc32c_tv_template[] = { 
/*

 * Cipher speed tests

 */

static struct cipher_speed speed_template_8[] = {

	{ .klen = 8, .blen = 16, },

	{ .klen = 8, .blen = 64, },

	{ .klen = 8, .blen = 256, },

	{ .klen = 8, .blen = 1024, },

	{ .klen = 8, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_24[] = {

	{ .klen = 24, .blen = 16, },

	{ .klen = 24, .blen = 64, },

	{ .klen = 24, .blen = 256, },

	{ .klen = 24, .blen = 1024, },

	{ .klen = 24, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_8_32[] = {

	/* Don't support blowfish keys > 256 bit in this test */

	{ .klen = 8, .blen = 16, },

	{ .klen = 8, .blen = 64, },

	{ .klen = 8, .blen = 256, },

	{ .klen = 8, .blen = 1024, },

	{ .klen = 8, .blen = 8192, },

	{ .klen = 32, .blen = 16, },

	{ .klen = 32, .blen = 64, },

	{ .klen = 32, .blen = 256, },

	{ .klen = 32, .blen = 1024, },

	{ .klen = 32, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_16_32[] = {

      { .klen = 16, .blen = 16, },

      { .klen = 16, .blen = 64, },

      { .klen = 16, .blen = 256, },

      { .klen = 16, .blen = 1024, },

      { .klen = 16, .blen = 8192, },

      { .klen = 32, .blen = 16, },

      { .klen = 32, .blen = 64, },

      { .klen = 32, .blen = 256, },

      { .klen = 32, .blen = 1024, },

      { .klen = 32, .blen = 8192, },



      /* End marker */

      {  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_16_24_32[] = {

	{ .klen = 16, .blen = 16, },

	{ .klen = 16, .blen = 64, },

	{ .klen = 16, .blen = 256, },

	{ .klen = 16, .blen = 1024, },

	{ .klen = 16, .blen = 8192, },

	{ .klen = 24, .blen = 16, },

	{ .klen = 24, .blen = 64, },

	{ .klen = 24, .blen = 256, },

	{ .klen = 24, .blen = 1024, },

	{ .klen = 24, .blen = 8192, },

	{ .klen = 32, .blen = 16, },

	{ .klen = 32, .blen = 64, },

	{ .klen = 32, .blen = 256, },

	{ .klen = 32, .blen = 1024, },

	{ .klen = 32, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_32_40_48[] = {

	{ .klen = 32, .blen = 16, },

	{ .klen = 32, .blen = 64, },

	{ .klen = 32, .blen = 256, },

	{ .klen = 32, .blen = 1024, },

	{ .klen = 32, .blen = 8192, },

	{ .klen = 40, .blen = 16, },

	{ .klen = 40, .blen = 64, },

	{ .klen = 40, .blen = 256, },

	{ .klen = 40, .blen = 1024, },

	{ .klen = 40, .blen = 8192, },

	{ .klen = 48, .blen = 16, },

	{ .klen = 48, .blen = 64, },

	{ .klen = 48, .blen = 256, },

	{ .klen = 48, .blen = 1024, },

	{ .klen = 48, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};



static struct cipher_speed speed_template_32_48_64[] = {

	{ .klen = 32, .blen = 16, },

	{ .klen = 32, .blen = 64, },

	{ .klen = 32, .blen = 256, },

	{ .klen = 32, .blen = 1024, },

	{ .klen = 32, .blen = 8192, },

	{ .klen = 48, .blen = 16, },

	{ .klen = 48, .blen = 64, },

	{ .klen = 48, .blen = 256, },

	{ .klen = 48, .blen = 1024, },

	{ .klen = 48, .blen = 8192, },

	{ .klen = 64, .blen = 16, },

	{ .klen = 64, .blen = 64, },

	{ .klen = 64, .blen = 256, },

	{ .klen = 64, .blen = 1024, },

	{ .klen = 64, .blen = 8192, },



	/* End marker */

	{  .klen = 0, .blen = 0, }

};

static u8 speed_template_8[] = {8, 0};

static u8 speed_template_24[] = {24, 0};

static u8 speed_template_8_32[] = {8, 32, 0};

static u8 speed_template_16_32[] = {16, 32, 0};

static u8 speed_template_16_24_32[] = {16, 24, 32, 0};

static u8 speed_template_32_40_48[] = {32, 40, 48, 0};

static u8 speed_template_32_48_64[] = {32, 48, 64, 0};



/*

 * Digest speed tests