1 files changed, 407 insertions, 173 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 92b0352c8e92..bd7524cfff33 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Quick & dirty crypto testing module.
  *
  * This will only exist until we have a better testing mechanism
@@ -9,11 +9,12 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
+ * Software Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * 14 - 09 - 2003 
- *      Rewritten by Kartikey Mahendra Bhatt
+ * 2004-08-09 Added cipher speed tests (Reyk Floeter <reyk@vantronix.net>)
+ * 2003-09-14 Rewritten by Kartikey Mahendra Bhatt
+ *
  */
 
 #include <linux/init.h>
@@ -25,12 +26,15 @@
 #include <linux/crypto.h>
 #include <linux/highmem.h>
 #include <linux/moduleparam.h>
+#include <linux/jiffies.h>
+#include <linux/timex.h>
+#include <linux/interrupt.h>
 #include "tcrypt.h"
 
 /*
  * Need to kmalloc() memory for testing kmap().
  */
-#define TVMEMSIZE       4096
+#define TVMEMSIZE       16384
 #define XBUFSIZE        32768
 
 /*
@@ -55,19 +59,23 @@
 
 static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };
 
+/*
+ * Used by test_cipher_speed()
+ */
+static unsigned int sec;
+
 static int mode;
 static char *xbuf;
 static char *tvmem;
 
 static char *check[] = {
         "des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
-        "twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
-        "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", 
+        "twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6",
+        "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
         "khazad", "wp512", "wp384", "wp256", "tnepres", NULL
 };
 
-static void
-hexdump(unsigned char *buf, unsigned int len)
+static void hexdump(unsigned char *buf, unsigned int len)
 {
         while (len--)
                 printk("%02x", *buf++);
@@ -75,29 +83,29 @@ hexdump(unsigned char *buf, unsigned int len)
         printk("\n");
 }
 
-static void 
-test_hash (char * algo, struct hash_testvec * template, unsigned int tcount)
+static void test_hash(char *algo, struct hash_testvec *template,
+                      unsigned int tcount)
 {
-        char *p; 
-        unsigned int i, j, k, temp;
-        struct scatterlist sg[8];
-        char result[64];
-        struct crypto_tfm *tfm;
-        struct hash_testvec *hash_tv;
-        unsigned int tsize;
-         
-        printk("\ntesting %s\n", algo);
-
-        tsize = sizeof (struct hash_testvec);
+        char *p;
+        unsigned int i, j, k, temp;
+        struct scatterlist sg[8];
+        char result[64];
+        struct crypto_tfm *tfm;
+        struct hash_testvec *hash_tv;
+        unsigned int tsize;
+
+        printk("\ntesting %s\n", algo);
+
+        tsize = sizeof(struct hash_testvec);
         tsize *= tcount;
-        
+
         if (tsize > TVMEMSIZE) {
                 printk("template (%u) too big for tvmem (%u)\n", tsize, TVMEMSIZE);
                 return;
         }
 
         memcpy(tvmem, template, tsize);
-        hash_tv = (void *) tvmem;
+        hash_tv = (void *)tvmem;
         tfm = crypto_alloc_tfm(algo, 0);
         if (tfm == NULL) {
                 printk("failed to load transform for %s\n", algo);
@@ -105,70 +113,71 @@ test_hash (char * algo, struct hash_testvec * template, unsigned int tcount)
         }
 
         for (i = 0; i < tcount; i++) {
-                printk ("test %u:\n", i + 1);
-                memset (result, 0, 64);
+                printk("test %u:\n", i + 1);
+                memset(result, 0, 64);
 
                 p = hash_tv[i].plaintext;
-                sg[0].page = virt_to_page (p);
-                sg[0].offset = offset_in_page (p);
+                sg[0].page = virt_to_page(p);
+                sg[0].offset = offset_in_page(p);
                 sg[0].length = hash_tv[i].psize;
 
-                crypto_digest_init (tfm);
+                crypto_digest_init(tfm);
                 if (tfm->crt_u.digest.dit_setkey) {
-                        crypto_digest_setkey (tfm, hash_tv[i].key,
-                                              hash_tv[i].ksize);
+                        crypto_digest_setkey(tfm, hash_tv[i].key,
+                                             hash_tv[i].ksize);
                 }
-                crypto_digest_update (tfm, sg, 1);
-                crypto_digest_final (tfm, result);
+                crypto_digest_update(tfm, sg, 1);
+                crypto_digest_final(tfm, result);
 
-                hexdump (result, crypto_tfm_alg_digestsize (tfm));
+                hexdump(result, crypto_tfm_alg_digestsize(tfm));
                 printk("%s\n",
-                        memcmp(result, hash_tv[i].digest,
-                                crypto_tfm_alg_digestsize(tfm)) ? "fail" :
-                        "pass");
+                       memcmp(result, hash_tv[i].digest,
+                              crypto_tfm_alg_digestsize(tfm)) ?
+                       "fail" : "pass");
         }
 
-        printk ("testing %s across pages\n", algo);
+        printk("testing %s across pages\n", algo);
 
         /* setup the dummy buffer first */
-        memset(xbuf, 0, XBUFSIZE);
+        memset(xbuf, 0, XBUFSIZE);
 
         j = 0;
         for (i = 0; i < tcount; i++) {
                 if (hash_tv[i].np) {
                         j++;
-                        printk ("test %u:\n", j);
-                        memset (result, 0, 64);
+                        printk("test %u:\n", j);
+                        memset(result, 0, 64);
 
                         temp = 0;
                         for (k = 0; k < hash_tv[i].np; k++) {
-                                memcpy (&xbuf[IDX[k]], hash_tv[i].plaintext + temp, 
-                                                hash_tv[i].tap[k]);     
+                                memcpy(&xbuf[IDX[k]],
+                                       hash_tv[i].plaintext + temp,
+                                       hash_tv[i].tap[k]);
                                 temp += hash_tv[i].tap[k];
                                 p = &xbuf[IDX[k]];
-                                sg[k].page = virt_to_page (p);
-                                sg[k].offset = offset_in_page (p);
+                                sg[k].page = virt_to_page(p);
+                                sg[k].offset = offset_in_page(p);
                                 sg[k].length = hash_tv[i].tap[k];
                         }
 
-                        crypto_digest_digest (tfm, sg, hash_tv[i].np, result);
-                        
-                        hexdump (result, crypto_tfm_alg_digestsize (tfm));
+                        crypto_digest_digest(tfm, sg, hash_tv[i].np, result);
+
+                        hexdump(result, crypto_tfm_alg_digestsize(tfm));
                         printk("%s\n",
-                                memcmp(result, hash_tv[i].digest,
-                                        crypto_tfm_alg_digestsize(tfm)) ? "fail" :
-                                "pass");
+                               memcmp(result, hash_tv[i].digest,
+                                      crypto_tfm_alg_digestsize(tfm)) ?
+                               "fail" : "pass");
                 }
         }
-        
-        crypto_free_tfm (tfm);
+
+        crypto_free_tfm(tfm);
 }
 
 
 #ifdef CONFIG_CRYPTO_HMAC
 
-static void
-test_hmac(char *algo, struct hmac_testvec * template, unsigned int tcount)
+static void test_hmac(char *algo, struct hmac_testvec *template,
+                      unsigned int tcount)
 {
         char *p;
         unsigned int i, j, k, temp;
@@ -185,8 +194,8 @@ test_hmac(char *algo, struct hmac_testvec * template, unsigned int tcount)
         }
 
         printk("\ntesting hmac_%s\n", algo);
-        
-        tsize = sizeof (struct hmac_testvec);
+
+        tsize = sizeof(struct hmac_testvec);
         tsize *= tcount;
         if (tsize > TVMEMSIZE) {
                 printk("template (%u) too big for tvmem (%u)\n", tsize,
@@ -195,7 +204,7 @@ test_hmac(char *algo, struct hmac_testvec * template, unsigned int tcount)
         }
 
         memcpy(tvmem, template, tsize);
-        hmac_tv = (void *) tvmem;
+        hmac_tv = (void *)tvmem;
 
         for (i = 0; i < tcount; i++) {
                 printk("test %u:\n", i + 1);
@@ -219,34 +228,35 @@ test_hmac(char *algo, struct hmac_testvec * template, unsigned int tcount)
         printk("\ntesting hmac_%s across pages\n", algo);
 
         memset(xbuf, 0, XBUFSIZE);
-        
+
         j = 0;
         for (i = 0; i < tcount; i++) {
                 if (hmac_tv[i].np) {
                         j++;
-                        printk ("test %u:\n",j);
-                        memset (result, 0, 64);
+                        printk("test %u:\n",j);
+                        memset(result, 0, 64);
 
                         temp = 0;
                         klen = hmac_tv[i].ksize;
                         for (k = 0; k < hmac_tv[i].np; k++) {
-                                memcpy (&xbuf[IDX[k]], hmac_tv[i].plaintext + temp, 
-                                                hmac_tv[i].tap[k]);     
+                                memcpy(&xbuf[IDX[k]],
+                                       hmac_tv[i].plaintext + temp,
+                                       hmac_tv[i].tap[k]);
                                 temp += hmac_tv[i].tap[k];
                                 p = &xbuf[IDX[k]];
-                                sg[k].page = virt_to_page (p);
-                                sg[k].offset = offset_in_page (p);
+                                sg[k].page = virt_to_page(p);
+                                sg[k].offset = offset_in_page(p);
                                 sg[k].length = hmac_tv[i].tap[k];
                         }
 
-                        crypto_hmac(tfm, hmac_tv[i].key, &klen, sg, hmac_tv[i].np, 
-                                        result);
+                        crypto_hmac(tfm, hmac_tv[i].key, &klen, sg,
+                                    hmac_tv[i].np, result);
                         hexdump(result, crypto_tfm_alg_digestsize(tfm));
-                        
+
                         printk("%s\n",
-                                memcmp(result, hmac_tv[i].digest,
-                                        crypto_tfm_alg_digestsize(tfm)) ? "fail" : 
-                                "pass");
+                               memcmp(result, hmac_tv[i].digest,
+                                      crypto_tfm_alg_digestsize(tfm)) ?
+                               "fail" : "pass");
                 }
         }
 out:
@@ -255,8 +265,8 @@ out:
 
 #endif  /* CONFIG_CRYPTO_HMAC */
 
-static void
-test_cipher(char * algo, int mode, int enc, struct cipher_testvec * template, unsigned int tcount)
+static void test_cipher(char *algo, int mode, int enc,
+                        struct cipher_testvec *template, unsigned int tcount)
 {
         unsigned int ret, i, j, k, temp;
         unsigned int tsize;
@@ -265,22 +275,22 @@ test_cipher(char * algo, int mode, int enc, struct cipher_testvec * template, un
         char *key;
         struct cipher_testvec *cipher_tv;
         struct scatterlist sg[8];
-        char e[11], m[4];
+        const char *e, *m;
 
         if (enc == ENCRYPT)
-                strncpy(e, "encryption", 11);
+                e = "encryption";
         else
-                strncpy(e, "decryption", 11);
+                e = "decryption";
         if (mode == MODE_ECB)
-                strncpy(m, "ECB", 4);
+                m = "ECB";
         else
-                strncpy(m, "CBC", 4);
+                m = "CBC";
 
-        printk("\ntesting %s %s %s \n", algo, m, e);
+        printk("\ntesting %s %s %s\n", algo, m, e);
 
-        tsize = sizeof (struct cipher_testvec); 
+        tsize = sizeof (struct cipher_testvec);
         tsize *= tcount;
-        
+
         if (tsize > TVMEMSIZE) {
                 printk("template (%u) too big for tvmem (%u)\n", tsize,
                        TVMEMSIZE);
@@ -288,112 +298,113 @@ test_cipher(char * algo, int mode, int enc, struct cipher_testvec * template, un
         }
 
         memcpy(tvmem, template, tsize);
-        cipher_tv = (void *) tvmem;
+        cipher_tv = (void *)tvmem;
+
+        if (mode)
+                tfm = crypto_alloc_tfm(algo, 0);
+        else
+                tfm = crypto_alloc_tfm(algo, CRYPTO_TFM_MODE_CBC);
 
-        if (mode) 
-                tfm = crypto_alloc_tfm (algo, 0);
-        else 
-                tfm = crypto_alloc_tfm (algo, CRYPTO_TFM_MODE_CBC);
-        
         if (tfm == NULL) {
                 printk("failed to load transform for %s %s\n", algo, m);
                 return;
         }
-        
+
         j = 0;
         for (i = 0; i < tcount; i++) {
                 if (!(cipher_tv[i].np)) {
-                        j++;    
+                        j++;
                         printk("test %u (%d bit key):\n",
                         j, cipher_tv[i].klen * 8);
 
                         tfm->crt_flags = 0;
-                        if (cipher_tv[i].wk) 
+                        if (cipher_tv[i].wk)
                                 tfm->crt_flags |= CRYPTO_TFM_REQ_WEAK_KEY;
                         key = cipher_tv[i].key;
-        
+
                         ret = crypto_cipher_setkey(tfm, key, cipher_tv[i].klen);
                         if (ret) {
                                 printk("setkey() failed flags=%x\n", tfm->crt_flags);
-        
+
                                 if (!cipher_tv[i].fail)
                                         goto out;
-                        }       
+                        }
 
                         p = cipher_tv[i].input;
                         sg[0].page = virt_to_page(p);
                         sg[0].offset = offset_in_page(p);
                         sg[0].length = cipher_tv[i].ilen;
-        
+
                         if (!mode) {
                                 crypto_cipher_set_iv(tfm, cipher_tv[i].iv,
-                                        crypto_tfm_alg_ivsize (tfm));
+                                        crypto_tfm_alg_ivsize(tfm));
                         }
-                
+
                         if (enc)
                                 ret = crypto_cipher_encrypt(tfm, sg, sg, cipher_tv[i].ilen);
                         else
                                 ret = crypto_cipher_decrypt(tfm, sg, sg, cipher_tv[i].ilen);
-                        
-                                
+
+
                         if (ret) {
                                 printk("%s () failed flags=%x\n", e, tfm->crt_flags);
                                 goto out;
-                        }       
-        
+                        }
+
                         q = kmap(sg[0].page) + sg[0].offset;
                         hexdump(q, cipher_tv[i].rlen);
-        
-                        printk("%s\n", 
-                                memcmp(q, cipher_tv[i].result, cipher_tv[i].rlen) ? "fail" : 
-                        "pass");
+
+                        printk("%s\n",
+                               memcmp(q, cipher_tv[i].result,
+                                      cipher_tv[i].rlen) ? "fail" : "pass");
                 }
         }
-        
-        printk("\ntesting %s %s %s across pages (chunking) \n", algo, m, e);
+
+        printk("\ntesting %s %s %s across pages (chunking)\n", algo, m, e);
         memset(xbuf, 0, XBUFSIZE);
-        
+
         j = 0;
         for (i = 0; i < tcount; i++) {
                 if (cipher_tv[i].np) {
-                        j++;                            
+                        j++;
                         printk("test %u (%d bit key):\n",
                         j, cipher_tv[i].klen * 8);
 
-                        tfm->crt_flags = 0;                     
-                        if (cipher_tv[i].wk) 
+                        tfm->crt_flags = 0;
+                        if (cipher_tv[i].wk)
                                 tfm->crt_flags |= CRYPTO_TFM_REQ_WEAK_KEY;
                         key = cipher_tv[i].key;
-                        
-                        ret = crypto_cipher_setkey(tfm, key, cipher_tv[i].klen);                
+
+                        ret = crypto_cipher_setkey(tfm, key, cipher_tv[i].klen);
                         if (ret) {
                                 printk("setkey() failed flags=%x\n", tfm->crt_flags);
-                                
+
                                 if (!cipher_tv[i].fail)
                                         goto out;
                         }
 
                         temp = 0;
                         for (k = 0; k < cipher_tv[i].np; k++) {
-                                memcpy (&xbuf[IDX[k]], cipher_tv[i].input + temp, 
-                                                cipher_tv[i].tap[k]);   
+                                memcpy(&xbuf[IDX[k]],
+                                       cipher_tv[i].input + temp,
+                                       cipher_tv[i].tap[k]);
                                 temp += cipher_tv[i].tap[k];
                                 p = &xbuf[IDX[k]];
-                                sg[k].page = virt_to_page (p);
-                                sg[k].offset = offset_in_page (p);
+                                sg[k].page = virt_to_page(p);
+                                sg[k].offset = offset_in_page(p);
                                 sg[k].length = cipher_tv[i].tap[k];
                         }
-                        
+
                         if (!mode) {
                                 crypto_cipher_set_iv(tfm, cipher_tv[i].iv,
-                                                crypto_tfm_alg_ivsize (tfm));
+                                                crypto_tfm_alg_ivsize(tfm));
                         }
-                        
+
                         if (enc)
                                 ret = crypto_cipher_encrypt(tfm, sg, sg, cipher_tv[i].ilen);
                         else
                                 ret = crypto_cipher_decrypt(tfm, sg, sg, cipher_tv[i].ilen);
-                        
+
                         if (ret) {
                                 printk("%s () failed flags=%x\n", e, tfm->crt_flags);
                                 goto out;
@@ -404,9 +415,9 @@ test_cipher(char * algo, int mode, int enc, struct cipher_testvec * template, un
                                 printk("page %u\n", k);
                                 q = kmap(sg[k].page) + sg[k].offset;
                                 hexdump(q, cipher_tv[i].tap[k]);
-                                printk("%s\n", 
-                                        memcmp(q, cipher_tv[i].result + temp, 
-                                                cipher_tv[i].tap[k]) ? "fail" : 
+                                printk("%s\n",
+                                        memcmp(q, cipher_tv[i].result + temp,
+                                                cipher_tv[i].tap[k]) ? "fail" :
                                         "pass");
                                 temp += cipher_tv[i].tap[k];
                         }
@@ -417,8 +428,169 @@ out:
         crypto_free_tfm(tfm);
 }
 
-static void
-test_deflate(void)
+static int test_cipher_jiffies(struct crypto_tfm *tfm, int enc, char *p,
+                               int blen, int sec)
+{
+        struct scatterlist sg[8];
+        unsigned long start, end;
+        int bcount;
+        int ret;
+
+        sg[0].page = virt_to_page(p);
+        sg[0].offset = offset_in_page(p);
+        sg[0].length = blen;
+
+        for (start = jiffies, end = start + sec * HZ, bcount = 0;
+             time_before(jiffies, end); bcount++) {
+                if (enc)
+                        ret = crypto_cipher_encrypt(tfm, sg, sg, blen);
+                else
+                        ret = crypto_cipher_decrypt(tfm, sg, sg, blen);
+
+                if (ret)
+                        return ret;
+        }
+
+        printk("%d operations in %d seconds (%ld bytes)\n",
+               bcount, sec, (long)bcount * blen);
+        return 0;
+}
+
+static int test_cipher_cycles(struct crypto_tfm *tfm, int enc, char *p,
+                              int blen)
+{
+        struct scatterlist sg[8];
+        unsigned long cycles = 0;
+        int ret = 0;
+        int i;
+
+        sg[0].page = virt_to_page(p);
+        sg[0].offset = offset_in_page(p);
+        sg[0].length = blen;
+
+        local_bh_disable();
+        local_irq_disable();
+
+        /* Warm-up run. */
+        for (i = 0; i < 4; i++) {
+                if (enc)
+                        ret = crypto_cipher_encrypt(tfm, sg, sg, blen);
+                else
+                        ret = crypto_cipher_decrypt(tfm, sg, sg, blen);
+
+                if (ret)
+                        goto out;
+        }
+
+        /* The real thing. */
+        for (i = 0; i < 8; i++) {
+                cycles_t start, end;
+
+                start = get_cycles();
+                if (enc)
+                        ret = crypto_cipher_encrypt(tfm, sg, sg, blen);
+                else
+                        ret = crypto_cipher_decrypt(tfm, sg, sg, blen);
+                end = get_cycles();
+
+                if (ret)
+                        goto out;
+
+                cycles += end - start;
+        }
+
+out:
+        local_irq_enable();
+        local_bh_enable();
+
+        if (ret == 0)
+                printk("1 operation in %lu cycles (%d bytes)\n",
+                       (cycles + 4) / 8, blen);
+
+        return ret;
+}
+
+static void test_cipher_speed(char *algo, int mode, int enc, unsigned int sec,
+                              struct cipher_testvec *template,
+                              unsigned int tcount, struct cipher_speed *speed)
+{
+        unsigned int ret, i, j, iv_len;
+        unsigned char *key, *p, iv[128];
+        struct crypto_tfm *tfm;
+        const char *e, *m;
+
+        if (enc == ENCRYPT)
+                e = "encryption";
+        else
+                e = "decryption";
+        if (mode == MODE_ECB)
+                m = "ECB";
+        else
+                m = "CBC";
+
+        printk("\ntesting speed of %s %s %s\n", algo, m, e);
+
+        if (mode)
+                tfm = crypto_alloc_tfm(algo, 0);
+        else
+                tfm = crypto_alloc_tfm(algo, CRYPTO_TFM_MODE_CBC);
+
+        if (tfm == NULL) {
+                printk("failed to load transform for %s %s\n", algo, m);
+                return;
+        }
+
+        for (i = 0; speed[i].klen != 0; i++) {
+                if ((speed[i].blen + speed[i].klen) > TVMEMSIZE) {
+                        printk("template (%u) too big for tvmem (%u)\n",
+                               speed[i].blen + speed[i].klen, TVMEMSIZE);
+                        goto out;
+                }
+
+                printk("test %u (%d bit key, %d byte blocks): ", i,
+                       speed[i].klen * 8, speed[i].blen);
+
+                memset(tvmem, 0xff, speed[i].klen + speed[i].blen);
+
+                /* set key, plain text and IV */
+                key = (unsigned char *)tvmem;
+                for (j = 0; j < tcount; j++) {
+                        if (template[j].klen == speed[i].klen) {
+                                key = template[j].key;
+                                break;
+                        }
+                }
+                p = (unsigned char *)tvmem + speed[i].klen;
+
+                ret = crypto_cipher_setkey(tfm, key, speed[i].klen);
+                if (ret) {
+                        printk("setkey() failed flags=%x\n", tfm->crt_flags);
+                        goto out;
+                }
+
+                if (!mode) {
+                        iv_len = crypto_tfm_alg_ivsize(tfm);
+                        memset(&iv, 0xff, iv_len);
+                        crypto_cipher_set_iv(tfm, iv, iv_len);
+                }
+
+                if (sec)
+                        ret = test_cipher_jiffies(tfm, enc, p, speed[i].blen,
+                                                  sec);
+                else
+                        ret = test_cipher_cycles(tfm, enc, p, speed[i].blen);
+
+                if (ret) {
+                        printk("%s() failed flags=%x\n", e, tfm->crt_flags);
+                        break;
+                }
+        }
+
+out:
+        crypto_free_tfm(tfm);
+}
+
+static void test_deflate(void)
 {
         unsigned int i;
         char result[COMP_BUF_SIZE];
@@ -436,7 +608,7 @@ test_deflate(void)
         }
 
         memcpy(tvmem, deflate_comp_tv_template, tsize);
-        tv = (void *) tvmem;
+        tv = (void *)tvmem;
 
         tfm = crypto_alloc_tfm("deflate", 0);
         if (tfm == NULL) {
@@ -446,7 +618,7 @@ test_deflate(void)
 
         for (i = 0; i < DEFLATE_COMP_TEST_VECTORS; i++) {
                 int ilen, ret, dlen = COMP_BUF_SIZE;
-                
+
                 printk("test %u:\n", i + 1);
                 memset(result, 0, sizeof (result));
 
@@ -473,11 +645,11 @@ test_deflate(void)
         }
 
         memcpy(tvmem, deflate_decomp_tv_template, tsize);
-        tv = (void *) tvmem;
+        tv = (void *)tvmem;
 
         for (i = 0; i < DEFLATE_DECOMP_TEST_VECTORS; i++) {
                 int ilen, ret, dlen = COMP_BUF_SIZE;
-                
+
                 printk("test %u:\n", i + 1);
                 memset(result, 0, sizeof (result));
 
@@ -497,8 +669,7 @@ out:
         crypto_free_tfm(tfm);
 }
 
-static void
-test_crc32c(void)
+static void test_crc32c(void)
 {
 #define NUMVEC 6
 #define VECSIZE 40
@@ -511,7 +682,7 @@ test_crc32c(void)
                 0xd579c862, 0xba979ad0, 0x2b29d913
         };
         static u32 tot_vec_results = 0x24c5d375;
-        
+
         struct scatterlist sg[NUMVEC];
         struct crypto_tfm *tfm;
         char *fmtdata = "testing crc32c initialized to %08x: %s\n";
@@ -525,18 +696,18 @@ test_crc32c(void)
                 printk("failed to load transform for crc32c\n");
                 return;
         }
-        
+
         crypto_digest_init(tfm);
         crypto_digest_final(tfm, (u8*)&crc);
         printk(fmtdata, crc, (crc == 0) ? "pass" : "ERROR");
-        
+
         /*
          * stuff test_vec with known values, simple incrementing
          * byte values.
          */
         b = 0;
         for (i = 0; i < NUMVEC; i++) {
-                for (j = 0; j < VECSIZE; j++) 
+                for (j = 0; j < VECSIZE; j++)
                         test_vec[i][j] = ++b;
                 sg[i].page = virt_to_page(test_vec[i]);
                 sg[i].offset = offset_in_page(test_vec[i]);
@@ -548,11 +719,11 @@ test_crc32c(void)
         crypto_digest_final(tfm, (u8*)&crc);
         printk("testing crc32c setkey returns %08x : %s\n", crc, (crc == (SEEDTESTVAL ^ ~(u32)0)) ?
                "pass" : "ERROR");
-        
+
         printk("testing crc32c using update/final:\n");
 
         pass = 1;                   /* assume all is well */
-        
+
         for (i = 0; i < NUMVEC; i++) {
                 seed = ~(u32)0;
                 (void)crypto_digest_setkey(tfm, (const u8*)&seed, sizeof(u32));
@@ -591,66 +762,64 @@ test_crc32c(void)
                 printk(" %08x:BAD, wanted %08x\n", crc, tot_vec_results);
                 pass = 0;
         }
-        
+
         printk("\n%s\n", pass ? "pass" : "ERROR");
 
         crypto_free_tfm(tfm);
         printk("crc32c test complete\n");
 }
 
-static void
-test_available(void)
+static void test_available(void)
 {
         char **name = check;
-        
+
         while (*name) {
                 printk("alg %s ", *name);
                 printk((crypto_alg_available(*name, 0)) ?
                         "found\n" : "not found\n");
                 name++;
-        }       
+        }
 }
 
-static void
-do_test(void)
+static void do_test(void)
 {
         switch (mode) {
 
         case 0:
                 test_hash("md5", md5_tv_template, MD5_TEST_VECTORS);
-                
+
                 test_hash("sha1", sha1_tv_template, SHA1_TEST_VECTORS);
-                
+
                 //DES
                 test_cipher ("des", MODE_ECB, ENCRYPT, des_enc_tv_template, DES_ENC_TEST_VECTORS);
-                test_cipher ("des", MODE_ECB, DECRYPT, des_dec_tv_template, DES_DEC_TEST_VECTORS);
-                test_cipher ("des", MODE_CBC, ENCRYPT, des_cbc_enc_tv_template, DES_CBC_ENC_TEST_VECTORS);
-                test_cipher ("des", MODE_CBC, DECRYPT, des_cbc_dec_tv_template, DES_CBC_DEC_TEST_VECTORS);
-        
+                test_cipher ("des", MODE_ECB, DECRYPT, des_dec_tv_template, DES_DEC_TEST_VECTORS);
+                test_cipher ("des", MODE_CBC, ENCRYPT, des_cbc_enc_tv_template, DES_CBC_ENC_TEST_VECTORS);
+                test_cipher ("des", MODE_CBC, DECRYPT, des_cbc_dec_tv_template, DES_CBC_DEC_TEST_VECTORS);
+
                 //DES3_EDE
                 test_cipher ("des3_ede", MODE_ECB, ENCRYPT, des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS);
-                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
-                
+                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
+
                 test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
-                
+
                 test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);
-                
+
                 //BLOWFISH
                 test_cipher ("blowfish", MODE_ECB, ENCRYPT, bf_enc_tv_template, BF_ENC_TEST_VECTORS);
                 test_cipher ("blowfish", MODE_ECB, DECRYPT, bf_dec_tv_template, BF_DEC_TEST_VECTORS);
                 test_cipher ("blowfish", MODE_CBC, ENCRYPT, bf_cbc_enc_tv_template, BF_CBC_ENC_TEST_VECTORS);
                 test_cipher ("blowfish", MODE_CBC, DECRYPT, bf_cbc_dec_tv_template, BF_CBC_DEC_TEST_VECTORS);
-                
+
                 //TWOFISH
                 test_cipher ("twofish", MODE_ECB, ENCRYPT, tf_enc_tv_template, TF_ENC_TEST_VECTORS);
                 test_cipher ("twofish", MODE_ECB, DECRYPT, tf_dec_tv_template, TF_DEC_TEST_VECTORS);
                 test_cipher ("twofish", MODE_CBC, ENCRYPT, tf_cbc_enc_tv_template, TF_CBC_ENC_TEST_VECTORS);
                 test_cipher ("twofish", MODE_CBC, DECRYPT, tf_cbc_dec_tv_template, TF_CBC_DEC_TEST_VECTORS);
-                
+
                 //SERPENT
                 test_cipher ("serpent", MODE_ECB, ENCRYPT, serpent_enc_tv_template, SERPENT_ENC_TEST_VECTORS);
                 test_cipher ("serpent", MODE_ECB, DECRYPT, serpent_dec_tv_template, SERPENT_DEC_TEST_VECTORS);
-                
+
                 //TNEPRES
                 test_cipher ("tnepres", MODE_ECB, ENCRYPT, tnepres_enc_tv_template, TNEPRES_ENC_TEST_VECTORS);
                 test_cipher ("tnepres", MODE_ECB, DECRYPT, tnepres_dec_tv_template, TNEPRES_DEC_TEST_VECTORS);
@@ -662,7 +831,7 @@ do_test(void)
                 //CAST5
                 test_cipher ("cast5", MODE_ECB, ENCRYPT, cast5_enc_tv_template, CAST5_ENC_TEST_VECTORS);
                 test_cipher ("cast5", MODE_ECB, DECRYPT, cast5_dec_tv_template, CAST5_DEC_TEST_VECTORS);
-                
+
                 //CAST6
                 test_cipher ("cast6", MODE_ECB, ENCRYPT, cast6_enc_tv_template, CAST6_ENC_TEST_VECTORS);
                 test_cipher ("cast6", MODE_ECB, DECRYPT, cast6_dec_tv_template, CAST6_DEC_TEST_VECTORS);
@@ -702,9 +871,9 @@ do_test(void)
                 test_crc32c();
 #ifdef CONFIG_CRYPTO_HMAC
                 test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
-                test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);               
+                test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);
                 test_hmac("sha256", hmac_sha256_tv_template, HMAC_SHA256_TEST_VECTORS);
-#endif          
+#endif
 
                 test_hash("michael_mic", michael_mic_tv_template, MICHAEL_MIC_TEST_VECTORS);
                 break;
@@ -726,17 +895,17 @@ do_test(void)
 
         case 4:
                 test_cipher ("des3_ede", MODE_ECB, ENCRYPT, des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS);
-                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
+                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
                 break;
 
         case 5:
                 test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
                 break;
-                
+
         case 6:
                 test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);
                 break;
-        
+
         case 7:
                 test_cipher ("blowfish", MODE_ECB, ENCRYPT, bf_enc_tv_template, BF_ENC_TEST_VECTORS);
                 test_cipher ("blowfish", MODE_ECB, DECRYPT, bf_dec_tv_template, BF_DEC_TEST_VECTORS);
@@ -750,7 +919,7 @@ do_test(void)
                 test_cipher ("twofish", MODE_CBC, ENCRYPT, tf_cbc_enc_tv_template, TF_CBC_ENC_TEST_VECTORS);
                 test_cipher ("twofish", MODE_CBC, DECRYPT, tf_cbc_dec_tv_template, TF_CBC_DEC_TEST_VECTORS);
                 break;
-                
+
         case 9:
                 test_cipher ("serpent", MODE_ECB, ENCRYPT, serpent_enc_tv_template, SERPENT_ENC_TEST_VECTORS);
                 test_cipher ("serpent", MODE_ECB, DECRYPT, serpent_dec_tv_template, SERPENT_DEC_TEST_VECTORS);
@@ -758,13 +927,13 @@ do_test(void)
 
         case 10:
                 test_cipher ("aes", MODE_ECB, ENCRYPT, aes_enc_tv_template, AES_ENC_TEST_VECTORS);
-                test_cipher ("aes", MODE_ECB, DECRYPT, aes_dec_tv_template, AES_DEC_TEST_VECTORS);      
+                test_cipher ("aes", MODE_ECB, DECRYPT, aes_dec_tv_template, AES_DEC_TEST_VECTORS);
                 break;
 
         case 11:
                 test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
                 break;
-                
+
         case 12:
                 test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
                 break;
@@ -852,21 +1021,84 @@ do_test(void)
         case 100:
                 test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
                 break;
-                
+
         case 101:
-                test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);               
+                test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);
                 break;
-        
+
         case 102:
                 test_hmac("sha256", hmac_sha256_tv_template, HMAC_SHA256_TEST_VECTORS);
                 break;
 
 #endif
 
+        case 200:
+                test_cipher_speed("aes", MODE_ECB, ENCRYPT, sec, NULL, 0,
+                                  aes_speed_template);
+                test_cipher_speed("aes", MODE_ECB, DECRYPT, sec, NULL, 0,
+                                  aes_speed_template);
+                test_cipher_speed("aes", MODE_CBC, ENCRYPT, sec, NULL, 0,
+                                  aes_speed_template);
+                test_cipher_speed("aes", MODE_CBC, DECRYPT, sec, NULL, 0,
+                                  aes_speed_template);
+                break;
+
+        case 201:
+                test_cipher_speed("des3_ede", MODE_ECB, ENCRYPT, sec,
+                                  des3_ede_enc_tv_template,
+                                  DES3_EDE_ENC_TEST_VECTORS,
+                                  des3_ede_speed_template);
+                test_cipher_speed("des3_ede", MODE_ECB, DECRYPT, sec,
+                                  des3_ede_dec_tv_template,
+                                  DES3_EDE_DEC_TEST_VECTORS,
+                                  des3_ede_speed_template);
+                test_cipher_speed("des3_ede", MODE_CBC, ENCRYPT, sec,
+                                  des3_ede_enc_tv_template,
+                                  DES3_EDE_ENC_TEST_VECTORS,
+                                  des3_ede_speed_template);
+                test_cipher_speed("des3_ede", MODE_CBC, DECRYPT, sec,
+                                  des3_ede_dec_tv_template,
+                                  DES3_EDE_DEC_TEST_VECTORS,
+                                  des3_ede_speed_template);
+                break;
+
+        case 202:
+                test_cipher_speed("twofish", MODE_ECB, ENCRYPT, sec, NULL, 0,
+                                  twofish_speed_template);
+                test_cipher_speed("twofish", MODE_ECB, DECRYPT, sec, NULL, 0,
+                                  twofish_speed_template);
+                test_cipher_speed("twofish", MODE_CBC, ENCRYPT, sec, NULL, 0,
+                                  twofish_speed_template);
+                test_cipher_speed("twofish", MODE_CBC, DECRYPT, sec, NULL, 0,
+                                  twofish_speed_template);
+                break;
+
+        case 203:
+                test_cipher_speed("blowfish", MODE_ECB, ENCRYPT, sec, NULL, 0,
+                                  blowfish_speed_template);
+                test_cipher_speed("blowfish", MODE_ECB, DECRYPT, sec, NULL, 0,
+                                  blowfish_speed_template);
+                test_cipher_speed("blowfish", MODE_CBC, ENCRYPT, sec, NULL, 0,
+                                  blowfish_speed_template);
+                test_cipher_speed("blowfish", MODE_CBC, DECRYPT, sec, NULL, 0,
+                                  blowfish_speed_template);
+                break;
+
+        case 204:
+                test_cipher_speed("des", MODE_ECB, ENCRYPT, sec, NULL, 0,
+                                  des_speed_template);
+                test_cipher_speed("des", MODE_ECB, DECRYPT, sec, NULL, 0,
+                                  des_speed_template);
+                test_cipher_speed("des", MODE_CBC, ENCRYPT, sec, NULL, 0,
+                                  des_speed_template);
+                test_cipher_speed("des", MODE_CBC, DECRYPT, sec, NULL, 0,
+                                  des_speed_template);
+                break;
+
         case 1000:
                 test_available();
                 break;
-                
+
         default:
                 /* useful for debugging */
                 printk("not testing anything\n");
@@ -874,8 +1106,7 @@ do_test(void)
         }
 }
 
-static int __init
-init(void)
+static int __init init(void)
 {
         tvmem = kmalloc(TVMEMSIZE, GFP_KERNEL);
         if (tvmem == NULL)
@@ -904,6 +1135,9 @@ module_init(init);
 module_exit(fini);
 
 module_param(mode, int, 0);
+module_param(sec, uint, 0);
+MODULE_PARM_DESC(sec, "Length in seconds of speed tests "
+                      "(defaults to zero which uses CPU cycles instead)");
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Quick & dirty crypto testing module");