test/crypto: add OCTEON TX2

This patch adds the OCTEON TX2 crypto validation tests.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>

diff --git a/app/test/meson.build b/app/test/meson.build
index 2c23c63..a88b0eb 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -271,6 +271,7 @@ driver_test_names = [
         'cryptodev_dpaa_sec_autotest',
         'cryptodev_dpaa2_sec_autotest',
         'cryptodev_null_autotest',
+        'cryptodev_octeontx2_autotest',
         'cryptodev_openssl_autotest',
         'cryptodev_openssl_asym_autotest',
         'cryptodev_qat_autotest',

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a3ae2e2..65d8083 100644 (file)
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2404,6 +2404,101 @@ test_authonly_octeontx_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_AES_chain_octeontx2_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->session_mpool,
+               ts_params->session_priv_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),
+               BLKCIPHER_AES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_cipheronly_octeontx2_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->session_mpool,
+               ts_params->session_priv_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_chain_octeontx2_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->session_mpool,
+               ts_params->session_priv_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),
+               BLKCIPHER_3DES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_cipheronly_octeontx2_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->session_mpool,
+               ts_params->session_priv_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_authonly_octeontx2_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->session_mpool,
+               ts_params->session_priv_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 /* ***** SNOW 3G Tests ***** */
 static int
 create_wireless_algo_hash_session(uint8_t dev_id,
@@ -13386,6 +13481,218 @@ static struct unit_test_suite cryptodev_nitrox_testsuite  = {
        }
 };
 
+static struct unit_test_suite cryptodev_octeontx2_testsuite  = {
+       .suite_name = "Crypto Device OCTEON TX2 Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_chain_octeontx2_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_cipheronly_octeontx2_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_3DES_chain_octeontx2_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_3DES_cipheronly_octeontx2_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_authonly_octeontx2_all),
+
+               /** AES GCM Authenticated Encryption */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_7),
+
+               /** AES GCM Authenticated Decryption */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_7),
+               /** AES GMAC Authentication */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_3),
+
+               /** SNOW 3G encrypt only (UEA2) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_5),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop_sgl),
+
+               /** SNOW 3G decrypt only (UEA2) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_5),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_3),
+
+               /** ZUC encrypt only (EEA3) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_6_sgl),
+
+               /** KASUMI encrypt only (UEA1) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop_sgl),
+               /** KASUMI decrypt only (UEA1) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_5),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_1_oop),
+
+               /** KASUMI hash only (UIA1) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_generate_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_5),
+
+               /** NULL tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_cipher_only_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_auth_only_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_cipher_auth_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_auth_cipher_operation),
+
+               /** Negative tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
 static int
 test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
 {
@@ -13653,6 +13960,21 @@ test_cryptodev_octeontx(void)
        return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
 }
 
+static int
+test_cryptodev_octeontx2(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is "
+                               "enabled in config file to run this "
+                               "testsuite.\n");
+               return TEST_FAILED;
+       }
+       return unit_test_suite_runner(&cryptodev_octeontx2_testsuite);
+}
+
 static int
 test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
 {
@@ -13700,5 +14022,6 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
 REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
 REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
+REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
 REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);

diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index d20586e..def304e 100644 (file)
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -66,6 +66,7 @@
 #define CRYPTODEV_NAME_CCP_PMD         crypto_ccp
 #define CRYPTODEV_NAME_VIRTIO_PMD      crypto_virtio
 #define CRYPTODEV_NAME_OCTEONTX_SYM_PMD        crypto_octeontx
+#define CRYPTODEV_NAME_OCTEONTX2_PMD   crypto_octeontx2
 #define CRYPTODEV_NAME_CAAM_JR_PMD     crypto_caam_jr
 #define CRYPTODEV_NAME_NITROX_PMD      crypto_nitrox_sym
 

diff --git a/app/test/test_cryptodev_aes_test_vectors.h b/app/test/test_cryptodev_aes_test_vectors.h
index 54a5d75..54a8082 100644 (file)
--- a/app/test/test_cryptodev_aes_test_vectors.h
+++ b/app/test/test_cryptodev_aes_test_vectors.h
@@ -1707,7 +1707,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -1717,7 +1718,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -1734,7 +1736,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
@@ -1752,7 +1755,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
@@ -1764,7 +1768,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                            BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                            BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                            BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                           BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                           BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
@@ -1774,7 +1779,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Encryption Digest",
@@ -1791,7 +1797,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Encryption Digest "
@@ -1801,7 +1808,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Decryption Digest "
@@ -1818,7 +1826,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Decryption Digest "
@@ -1828,7 +1837,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest",
@@ -1843,7 +1853,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest "
@@ -1854,7 +1865,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
                        BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest "
@@ -1866,7 +1878,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_FEATURE_OOP,
                .pmd_mask =
                        BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Decryption Digest "
@@ -1882,7 +1895,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Decryption Digest "
@@ -1897,7 +1911,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_SCHEDULER |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC XCBC Encryption Digest",
@@ -1929,7 +1944,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MB |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -1955,7 +1971,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
                        BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest",
@@ -1970,7 +1987,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA224 Decryption Digest "
@@ -1986,7 +2004,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
-                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX
+                       BLOCKCIPHER_TEST_TARGET_PMD_NITROX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA384 Encryption Digest",
@@ -2026,7 +2045,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr =
@@ -2038,7 +2058,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_ARMV8 |
                        BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x8byte",
@@ -2141,7 +2162,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CBC Decryption",
@@ -2157,7 +2179,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CBC Encryption",
@@ -2172,7 +2195,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CBC Encryption Scater gather",
@@ -2184,7 +2208,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CBC Decryption",
@@ -2199,7 +2224,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CBC Decryption Scatter Gather",
@@ -2209,7 +2235,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CBC Encryption",
@@ -2225,7 +2252,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CBC Decryption",
@@ -2241,7 +2269,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CBC OOP Encryption",
@@ -2284,7 +2313,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CTR Decryption",
@@ -2299,7 +2329,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CTR Encryption",
@@ -2313,7 +2344,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CTR Decryption",
@@ -2327,7 +2359,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CTR Encryption",
@@ -2342,7 +2375,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CTR Decryption",
@@ -2357,28 +2391,32 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-CTR Encryption (12-byte IV)",
                .test_data = &aes_test_data_1_IV_12_bytes,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-192-CTR Encryption (12-byte IV)",
                .test_data = &aes_test_data_2_IV_12_bytes,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-256-CTR Encryption (12-byte IV)",
                .test_data = &aes_test_data_3_IV_12_bytes,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "AES-128-XTS Encryption (16-byte plaintext)",

diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 885a20e..5bfe2d0 100644 (file)
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -77,6 +77,8 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
                        RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
        int octeontx_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
+       int octeontx2_pmd = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
        int null_pmd = rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_NULL_PMD));
        int nitrox_pmd = rte_cryptodev_driver_id_get(
@@ -127,6 +129,7 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
                        driver_id == ccp_pmd ||
                        driver_id == virtio_pmd ||
                        driver_id == octeontx_pmd ||
+                       driver_id == octeontx2_pmd ||
                        driver_id == null_pmd ||
                        driver_id == nitrox_pmd) { /* Fall through */
                digest_len = tdata->digest.len;
@@ -718,6 +721,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
                        RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
        int octeontx_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
+       int octeontx2_pmd = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
        int null_pmd = rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_NULL_PMD));
        int nitrox_pmd = rte_cryptodev_driver_id_get(
@@ -792,6 +797,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO;
        else if (driver_id == octeontx_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX;
+       else if (driver_id == octeontx2_pmd)
+               target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2;
        else if (driver_id == null_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_NULL;
        else if (driver_id == nitrox_pmd)

diff --git a/app/test/test_cryptodev_blockcipher.h b/app/test/test_cryptodev_blockcipher.h
index 1a65cda..204ba7b 100644 (file)
--- a/app/test/test_cryptodev_blockcipher.h
+++ b/app/test/test_cryptodev_blockcipher.h
@@ -33,6 +33,7 @@
 #define BLOCKCIPHER_TEST_TARGET_PMD_CCP                0x0800 /* CCP flag */
 #define BLOCKCIPHER_TEST_TARGET_PMD_NULL       0x1000 /* NULL flag */
 #define BLOCKCIPHER_TEST_TARGET_PMD_NITROX     0x2000 /* NITROX flag */
+#define BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2  0x4000 /* OCTEON TX2 flag */
 
 #define BLOCKCIPHER_TEST_OP_CIPHER     (BLOCKCIPHER_TEST_OP_ENCRYPT | \
                                        BLOCKCIPHER_TEST_OP_DECRYPT)

diff --git a/app/test/test_cryptodev_des_test_vectors.h b/app/test/test_cryptodev_des_test_vectors.h
index a71b0e9..9d2d0e7 100644 (file)
--- a/app/test/test_cryptodev_des_test_vectors.h
+++ b/app/test/test_cryptodev_des_test_vectors.h
@@ -1114,7 +1114,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "3DES-192-CBC HMAC-SHA1 Decryption Digest Verify",
@@ -1127,7 +1128,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "3DES-192-CBC SHA1 Encryption Digest",
@@ -1296,7 +1298,8 @@ static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "3DES-192-CBC Decryption",
@@ -1310,7 +1313,8 @@ static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "3DES-128-CTR Encryption",

diff --git a/app/test/test_cryptodev_hash_test_vectors.h b/app/test/test_cryptodev_hash_test_vectors.h
index 6f201c0..cff2831 100644 (file)
--- a/app/test/test_cryptodev_hash_test_vectors.h
+++ b/app/test/test_cryptodev_hash_test_vectors.h
@@ -413,7 +413,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN,
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "MD5 Digest Verify",
@@ -421,7 +422,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY,
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
                            BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-MD5 Digest",
@@ -435,7 +437,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-MD5 Digest Verify",
@@ -449,7 +452,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA1 Digest",
@@ -461,7 +465,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA1 Digest Verify",
@@ -473,7 +478,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA1 Digest",
@@ -488,7 +494,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA1 Digest Scatter Gather",
@@ -498,7 +505,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                            BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                            BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA1 Digest Verify",
@@ -513,7 +521,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA1 Digest Verify Scatter Gather",
@@ -523,7 +532,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |
                            BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |
                            BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA224 Digest",
@@ -535,7 +545,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA224 Digest Verify",
@@ -547,7 +558,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA224 Digest",
@@ -561,7 +573,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA224 Digest Verify",
@@ -575,7 +588,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA256 Digest",
@@ -587,7 +601,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA256 Digest Verify",
@@ -599,7 +614,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA256 Digest",
@@ -614,7 +630,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA256 Digest Verify",
@@ -629,7 +646,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA384 Digest",
@@ -641,7 +659,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA384 Digest Verify",
@@ -653,7 +672,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA384 Digest",
@@ -668,7 +688,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA384 Digest Verify",
@@ -683,7 +704,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "SHA512 Digest",
@@ -707,7 +729,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 52, 0)
                            BLOCKCIPHER_TEST_TARGET_PMD_MB |
 #endif
-                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                           BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA512 Digest",
@@ -722,7 +745,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "HMAC-SHA512 Digest Verify",
@@ -737,7 +761,8 @@ static const struct blockcipher_test_case hash_test_cases[] = {
                        BLOCKCIPHER_TEST_TARGET_PMD_QAT |
                        BLOCKCIPHER_TEST_TARGET_PMD_CCP |
                        BLOCKCIPHER_TEST_TARGET_PMD_MVSAM |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX |
+                       BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
        },
        {
                .test_descr = "CMAC Digest 12B",

diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst
index 47e9150..406d746 100644 (file)
--- a/doc/guides/cryptodevs/octeontx2.rst
+++ b/doc/guides/cryptodevs/octeontx2.rst
@@ -132,3 +132,14 @@ Debugging Options
     +===+============+=======================================================+
     | 1 | CPT        | --log-level='pmd\.crypto\.octeontx2,8'                |
     +---+------------+-------------------------------------------------------+
+
+Testing
+-------
+
+The symmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test
+application:
+
+.. code-block:: console
+
+    ./test
+    RTE>>cryptodev_octeontx2_autotest