3 files changed, 107 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 8e84225c096b..e00a4e49e013 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -913,6 +913,30 @@ config CRYPTO_TWOFISH_X86_64_3WAY
           See also:
           <http://www.schneier.com/twofish.html>
 
+config CRYPTO_TWOFISH_AVX_X86_64
+        tristate "Twofish cipher algorithm (x86_64/AVX)"
+        depends on X86 && 64BIT
+        select CRYPTO_ALGAPI
+        select CRYPTO_CRYPTD
+        select CRYPTO_TWOFISH_COMMON
+        select CRYPTO_TWOFISH_X86_64
+        select CRYPTO_TWOFISH_X86_64_3WAY
+        select CRYPTO_LRW
+        select CRYPTO_XTS
+        help
+          Twofish cipher algorithm (x86_64/AVX).
+
+          Twofish was submitted as an AES (Advanced Encryption Standard)
+          candidate cipher by researchers at CounterPane Systems.  It is a
+          16 round block cipher supporting key sizes of 128, 192, and 256
+          bits.
+
+          This module provides the Twofish cipher algorithm that processes
+          eight blocks parallel using the AVX Instruction Set.
+
+          See also:
+          <http://www.schneier.com/twofish.html>
+
 comment "Compression"
 
 config CRYPTO_DEFLATE
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 750cce44bad6..2af879786e75 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1566,6 +1566,29 @@ static int do_test(int m)
                                    speed_template_32_64);
                 break;
 
+        case 504:
+                test_acipher_speed("ecb(twofish)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("ecb(twofish)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("cbc(twofish)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("cbc(twofish)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("ctr(twofish)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("ctr(twofish)", DECRYPT, sec, NULL, 0,
+                                   speed_template_16_24_32);
+                test_acipher_speed("lrw(twofish)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_32_40_48);
+                test_acipher_speed("lrw(twofish)", DECRYPT, sec, NULL, 0,
+                                   speed_template_32_40_48);
+                test_acipher_speed("xts(twofish)", ENCRYPT, sec, NULL, 0,
+                                   speed_template_32_48_64);
+                test_acipher_speed("xts(twofish)", DECRYPT, sec, NULL, 0,
+                                   speed_template_32_48_64);
+                break;
+
         case 1000:
                 test_available();
                 break;
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index eb6d20f8ec5d..73b3ec6fe1a2 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1549,6 +1549,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__cbc-twofish-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-cbc-aes-aesni",
                 .test = alg_test_null,
                 .suite = {
@@ -1579,6 +1594,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-cbc-twofish-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-ecb-aes-aesni",
                 .test = alg_test_null,
                 .suite = {
@@ -1609,6 +1639,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-ecb-twofish-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__ghash-pclmulqdqni",
                 .test = alg_test_null,
                 .suite = {
@@ -1806,6 +1851,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "cryptd(__driver-ecb-twofish-avx)",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "cryptd(__ghash-pclmulqdqni)",
                 .test = alg_test_null,
                 .suite = {