test/crypto: enable chacha_poly PMD

An autotest is added for the new chacha20_poly1305 PMD.
A new test case is also added for SGL test.

Signed-off-by: Kai Ji <kai.ji@intel.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 54e9ce6..814a0b4 100644 (file)
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -14105,6 +14105,14 @@ test_chacha20_poly1305_decrypt_test_case_rfc8439(void)
        return test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);
 }
 
+static int
+test_chacha20_poly1305_encrypt_SGL_out_of_place(void)
+{
+       return test_authenticated_encryption_SGL(
+               &chacha20_poly1305_case_2, OUT_OF_PLACE, 32,
+               chacha20_poly1305_case_2.plaintext.len);
+}
+
 #ifdef RTE_CRYPTO_SCHEDULER
 
 /* global AESNI worker IDs for the scheduler test */
@@ -14789,6 +14797,8 @@ static struct unit_test_suite cryptodev_chacha20_poly1305_testsuite  = {
                        test_chacha20_poly1305_encrypt_test_case_rfc8439),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_chacha20_poly1305_decrypt_test_case_rfc8439),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_chacha20_poly1305_encrypt_SGL_out_of_place),
                TEST_CASES_END()
        }
 };
@@ -15371,6 +15381,17 @@ test_cryptodev_cpu_aesni_mb(void)
        return rc;
 }
 
+static int
+test_cryptodev_chacha_poly_mb(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at = gbl_action_type;
+       rc = run_cryptodev_testsuite(
+                       RTE_STR(CRYPTODEV_NAME_CHACHA20_POLY1305_PMD));
+       gbl_action_type = at;
+       return rc;
+}
+
 static int
 test_cryptodev_openssl(void)
 {
@@ -15670,6 +15691,8 @@ REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
        test_cryptodev_cpu_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_chacha_poly_mb_autotest,
+       test_cryptodev_chacha_poly_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
 REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm);
 REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,

diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index 1cdd84d..90c8287 100644 (file)
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -59,6 +59,7 @@
 #define CRYPTODEV_NAME_SNOW3G_PMD      crypto_snow3g
 #define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
 #define CRYPTODEV_NAME_ZUC_PMD         crypto_zuc
+#define CRYPTODEV_NAME_CHACHA20_POLY1305_PMD   crypto_chacha20_poly1305
 #define CRYPTODEV_NAME_ARMV8_PMD       crypto_armv8
 #define CRYPTODEV_NAME_DPAA_SEC_PMD    crypto_dpaa_sec
 #define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec

diff --git a/app/test/test_cryptodev_aead_test_vectors.h b/app/test/test_cryptodev_aead_test_vectors.h
index 73cc143..0729262 100644 (file)
--- a/app/test/test_cryptodev_aead_test_vectors.h
+++ b/app/test/test_cryptodev_aead_test_vectors.h
@@ -3930,4 +3930,118 @@ static const struct aead_test_data chacha20_poly1305_case_rfc8439 = {
                .len = 16
        }
 };
+
+static uint8_t chacha_aad_2[] = {
+                       0xf3, 0x33, 0x88, 0x86, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x4e, 0x91
+};
+
+static const struct aead_test_data chacha20_poly1305_case_2 = {
+       .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
+       .key = {
+               .data = {
+                               0x1c, 0x92, 0x40, 0xa5, 0xeb, 0x55, 0xd3, 0x8a,
+                               0xf3, 0x33, 0x88, 0x86, 0x04, 0xf6, 0xb5, 0xf0,
+                               0x47, 0x39, 0x17, 0xc1, 0x40, 0x2b, 0x80, 0x09,
+                               0x9d, 0xca, 0x5c, 0xbc, 0x20, 0x70, 0x75, 0xc0
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                               0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04,
+                               0x05, 0x06, 0x07, 0x08
+               },
+               .len = 12
+       },
+       .aad = {
+               .data = chacha_aad_2,
+               .len = 12
+       },
+       .plaintext = {
+               .data = {
+                               0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74,
+                               0x2d, 0x44, 0x72, 0x61, 0x66, 0x74, 0x73, 0x20,
+                               0x61, 0x72, 0x65, 0x20, 0x64, 0x72, 0x61, 0x66,
+                               0x74, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+                               0x6e, 0x74, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x69,
+                               0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x20,
+                               0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x20,
+                               0x6f, 0x66, 0x20, 0x73, 0x69, 0x78, 0x20, 0x6d,
+                               0x6f, 0x6e, 0x74, 0x68, 0x73, 0x20, 0x61, 0x6e,
+                               0x64, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x62, 0x65,
+                               0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64,
+                               0x2c, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
+                               0x65, 0x64, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x6f,
+                               0x62, 0x73, 0x6f, 0x6c, 0x65, 0x74, 0x65, 0x64,
+                               0x20, 0x62, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65,
+                               0x72, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+                               0x6e, 0x74, 0x73, 0x20, 0x61, 0x74, 0x20, 0x61,
+                               0x6e, 0x79, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x2e,
+                               0x20, 0x49, 0x74, 0x20, 0x69, 0x73, 0x20, 0x69,
+                               0x6e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x70, 0x72,
+                               0x69, 0x61, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20,
+                               0x75, 0x73, 0x65, 0x20, 0x49, 0x6e, 0x74, 0x65,
+                               0x72, 0x6e, 0x65, 0x74, 0x2d, 0x44, 0x72, 0x61,
+                               0x66, 0x74, 0x73, 0x20, 0x61, 0x73, 0x20, 0x72,
+                               0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
+                               0x20, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61,
+                               0x6c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20,
+                               0x63, 0x69, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65,
+                               0x6d, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20,
+                               0x74, 0x68, 0x61, 0x6e, 0x20, 0x61, 0x73, 0x20,
+                               0x2f, 0xe2, 0x80, 0x9c, 0x77, 0x6f, 0x72, 0x6b,
+                               0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67,
+                               0x72, 0x65, 0x73, 0x73, 0x2e, 0x2f, 0xe2, 0x80,
+                               0x9d
+               },
+               .len = 265
+       },
+       .ciphertext = {
+               .data = {
+                               0x64, 0xa0, 0x86, 0x15, 0x75, 0x86, 0x1a, 0xf4,
+                               0x60, 0xf0, 0x62, 0xc7, 0x9b, 0xe6, 0x43, 0xbd,
+                               0x5e, 0x80, 0x5c, 0xfd, 0x34, 0x5c, 0xf3, 0x89,
+                               0xf1, 0x08, 0x67, 0x0a, 0xc7, 0x6c, 0x8c, 0xb2,
+                               0x4c, 0x6c, 0xfc, 0x18, 0x75, 0x5d, 0x43, 0xee,
+                               0xa0, 0x9e, 0xe9, 0x4e, 0x38, 0x2d, 0x26, 0xb0,
+                               0xbd, 0xb7, 0xb7, 0x3c, 0x32, 0x1b, 0x01, 0x00,
+                               0xd4, 0xf0, 0x3b, 0x7f, 0x35, 0x58, 0x94, 0xcf,
+                               0x33, 0x2f, 0x83, 0x0e, 0x71, 0x0b, 0x97, 0xce,
+                               0x98, 0xc8, 0xa8, 0x4a, 0xbd, 0x0b, 0x94, 0x81,
+                               0x14, 0xad, 0x17, 0x6e, 0x00, 0x8d, 0x33, 0xbd,
+                               0x60, 0xf9, 0x82, 0xb1, 0xff, 0x37, 0xc8, 0x55,
+                               0x97, 0x97, 0xa0, 0x6e, 0xf4, 0xf0, 0xef, 0x61,
+                               0xc1, 0x86, 0x32, 0x4e, 0x2b, 0x35, 0x06, 0x38,
+                               0x36, 0x06, 0x90, 0x7b, 0x6a, 0x7c, 0x02, 0xb0,
+                               0xf9, 0xf6, 0x15, 0x7b, 0x53, 0xc8, 0x67, 0xe4,
+                               0xb9, 0x16, 0x6c, 0x76, 0x7b, 0x80, 0x4d, 0x46,
+                               0xa5, 0x9b, 0x52, 0x16, 0xcd, 0xe7, 0xa4, 0xe9,
+                               0x90, 0x40, 0xc5, 0xa4, 0x04, 0x33, 0x22, 0x5e,
+                               0xe2, 0x82, 0xa1, 0xb0, 0xa0, 0x6c, 0x52, 0x3e,
+                               0xaf, 0x45, 0x34, 0xd7, 0xf8, 0x3f, 0xa1, 0x15,
+                               0x5b, 0x00, 0x47, 0x71, 0x8c, 0xbc, 0x54, 0x6a,
+                               0x0d, 0x07, 0x2b, 0x04, 0xb3, 0x56, 0x4e, 0xea,
+                               0x1b, 0x42, 0x22, 0x73, 0xf5, 0x48, 0x27, 0x1a,
+                               0x0b, 0xb2, 0x31, 0x60, 0x53, 0xfa, 0x76, 0x99,
+                               0x19, 0x55, 0xeb, 0xd6, 0x31, 0x59, 0x43, 0x4e,
+                               0xce, 0xbb, 0x4e, 0x46, 0x6d, 0xae, 0x5a, 0x10,
+                               0x73, 0xa6, 0x72, 0x76, 0x27, 0x09, 0x7a, 0x10,
+                               0x49, 0xe6, 0x17, 0xd9, 0x1d, 0x36, 0x10, 0x94,
+                               0xfa, 0x68, 0xf0, 0xff, 0x77, 0x98, 0x71, 0x30,
+                               0x30, 0x5b, 0xea, 0xba, 0x2e, 0xda, 0x04, 0xdf,
+                               0x99, 0x7b, 0x71, 0x4d, 0x6c, 0x6f, 0x2c, 0x29,
+                               0xa6, 0xad, 0x5c, 0xb4, 0x02, 0x2b, 0x02, 0x70,
+                               0x9b
+               },
+               .len = 265
+       },
+       .auth_tag = {
+               .data = {
+                               0xee, 0xad, 0x9d, 0x67, 0x89, 0x0c, 0xbb, 0x22,
+                               0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38
+               },
+               .len = 16
+       }
+};
 #endif /* TEST_CRYPTODEV_AEAD_TEST_VECTORS_H_ */

diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 5f27ab1..9f29238 100644 (file)
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -291,6 +291,7 @@ New Features
   * Added tests to validate packets hard expiry.
   * Added tests to verify tunnel header verification in IPsec inbound.
   * Added tests to verify inner checksum.
+  * Added tests for CHACHA20_POLY1305 PMD, including a new testcase for SGL OOP.
 
 * **Revised packet capture framework.**