New upstream version 18.05
[deb_dpdk.git] / test / test / test_cryptodev.c
index 1417482..389f796 100644 (file)
@@ -21,6 +21,8 @@
 #include <rte_cryptodev_scheduler_operations.h>
 #endif
 
+#include <rte_lcore.h>
+
 #include "test.h"
 #include "test_cryptodev.h"
 
@@ -36,6 +38,8 @@
 #include "test_cryptodev_aead_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
 
+#define VDEV_ARGS_SIZE 100
+
 static int gbl_driver_id;
 
 struct crypto_testsuite_params {
@@ -316,40 +320,81 @@ testsuite_setup(void)
                }
        }
 
-       /* Create a MRVL device if required */
+       /* Create a MVSAM device if required */
        if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_MRVL_PMD))) {
-#ifndef RTE_LIBRTE_PMD_MRVL_CRYPTO
-               RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_MRVL_CRYPTO must be"
-                       " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
-#endif
+                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD))) {
                nb_devs = rte_cryptodev_device_count_by_driver(
                                rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)));
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)));
                if (nb_devs < 1) {
                        ret = rte_vdev_init(
-                               RTE_STR(CRYPTODEV_NAME_MRVL_PMD),
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD),
                                NULL);
 
                        TEST_ASSERT(ret == 0, "Failed to create "
                                "instance of pmd : %s",
-                               RTE_STR(CRYPTODEV_NAME_MRVL_PMD));
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
+               }
+       }
+
+       /* Create an CCP device if required */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_CCP_PMD))) {
+               nb_devs = rte_cryptodev_device_count_by_driver(
+                               rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD)));
+               if (nb_devs < 1) {
+                       ret = rte_vdev_init(
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD),
+                               NULL);
+
+                       TEST_ASSERT(ret == 0, "Failed to create "
+                               "instance of pmd : %s",
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD));
                }
        }
 
 #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+       char vdev_args[VDEV_ARGS_SIZE] = {""};
+       char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core,"
+               "ordering=enable,name=cryptodev_test_scheduler,corelist="};
+       uint16_t slave_core_count = 0;
+       uint16_t socket_id = 0;
+
        if (gbl_driver_id == rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
 
+               /* Identify the Slave Cores
+                * Use 2 slave cores for the device args
+                */
+               RTE_LCORE_FOREACH_SLAVE(i) {
+                       if (slave_core_count > 1)
+                               break;
+                       snprintf(vdev_args, sizeof(vdev_args),
+                                       "%s%d", temp_str, i);
+                       strcpy(temp_str, vdev_args);
+                       strcat(temp_str, ";");
+                       slave_core_count++;
+                       socket_id = lcore_config[i].socket_id;
+               }
+               if (slave_core_count != 2) {
+                       RTE_LOG(ERR, USER1,
+                               "Cryptodev scheduler test require at least "
+                               "two slave cores to run. "
+                               "Please use the correct coremask.\n");
+                       return TEST_FAILED;
+               }
+               strcpy(temp_str, vdev_args);
+               snprintf(vdev_args, sizeof(vdev_args), "%s,socket_id=%d",
+                               temp_str, socket_id);
+               RTE_LOG(DEBUG, USER1, "vdev_args: %s\n", vdev_args);
                nb_devs = rte_cryptodev_device_count_by_driver(
                                rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)));
                if (nb_devs < 1) {
                        ret = rte_vdev_init(
                                RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),
-                               NULL);
-
+                                       vdev_args);
                        TEST_ASSERT(ret == 0,
                                "Failed to create instance %u of"
                                " pmd : %s",
@@ -383,7 +428,8 @@ testsuite_setup(void)
        ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
        ts_params->conf.socket_id = SOCKET_ID_ANY;
 
-       unsigned int session_size = rte_cryptodev_get_private_session_size(dev_id);
+       unsigned int session_size =
+               rte_cryptodev_sym_get_private_session_size(dev_id);
 
        /*
         * Create mempool with maximum number of sessions * 2,
@@ -1726,6 +1772,44 @@ test_AES_cipheronly_openssl_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_AES_chain_ccp_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
+               BLKCIPHER_AES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_cipheronly_ccp_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_AES_chain_qat_all(void)
 {
@@ -1764,6 +1848,25 @@ test_AES_cipheronly_qat_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_AES_cipheronly_virtio_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_AES_chain_dpaa_sec_all(void)
 {
@@ -1897,6 +2000,25 @@ test_authonly_openssl_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_authonly_ccp_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_AES_chain_armv8_all(void)
 {
@@ -1927,7 +2049,7 @@ test_AES_chain_mrvl_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1946,7 +2068,7 @@ test_AES_cipheronly_mrvl_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1965,7 +2087,7 @@ test_authonly_mrvl_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
                BLKCIPHER_AUTHONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1984,7 +2106,7 @@ test_3DES_chain_mrvl_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
                BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -2003,7 +2125,7 @@ test_3DES_cipheronly_mrvl_all(void)
                ts_params->session_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MRVL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4972,6 +5094,44 @@ test_3DES_cipheronly_dpaa2_sec_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_3DES_chain_ccp_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
+               BLKCIPHER_3DES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_cipheronly_ccp_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->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_3DES_cipheronly_qat_all(void)
 {
@@ -6456,7 +6616,7 @@ test_multi_session_random_usage(void)
                sessions[i] = rte_cryptodev_sym_session_create(
                                ts_params->session_mpool);
 
-               rte_memcpy(&ut_paramz[i].ut_params, &testsuite_params,
+               rte_memcpy(&ut_paramz[i].ut_params, &unittest_params,
                                sizeof(struct crypto_unittest_params));
 
                test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
@@ -8375,7 +8535,8 @@ test_scheduler_attach_slave_op(void)
                        rte_mempool_free(ts_params->session_mpool);
                        ts_params->session_mpool = NULL;
                }
-               unsigned int session_size = rte_cryptodev_get_private_session_size(i);
+               unsigned int session_size =
+                       rte_cryptodev_sym_get_private_session_size(i);
 
                /*
                 * Create mempool with maximum number of sessions * 2,
@@ -8428,33 +8589,47 @@ test_scheduler_detach_slave_op(void)
 }
 
 static int
-test_scheduler_mode_op(void)
+test_scheduler_mode_op(enum rte_cryptodev_scheduler_mode scheduler_mode)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        uint8_t sched_id = ts_params->valid_devs[0];
-       struct rte_cryptodev_scheduler_ops op = {0};
-       struct rte_cryptodev_scheduler dummy_scheduler = {
-               .description = "dummy scheduler to test mode",
-               .name = "dummy scheduler",
-               .mode = CDEV_SCHED_MODE_USERDEFINED,
-               .ops = &op
-       };
-       int ret;
+       /* set mode */
+       return rte_cryptodev_scheduler_mode_set(sched_id,
+               scheduler_mode);
+}
+
+static int
+test_scheduler_mode_roundrobin_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) ==
+                       0, "Failed to set roundrobin mode");
+       return 0;
+
+}
+
+static int
+test_scheduler_mode_multicore_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
+                       0, "Failed to set multicore mode");
+
+       return 0;
+}
+
+static int
+test_scheduler_mode_failover_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
+                       0, "Failed to set failover mode");
+
+       return 0;
+}
 
-       /* set user defined mode */
-       ret = rte_cryptodev_scheduler_load_user_scheduler(sched_id,
-                       &dummy_scheduler);
-       TEST_ASSERT(ret == 0,
-               "Failed to set cdev %u to user defined mode", sched_id);
-
-       /* set round robin mode */
-       ret = rte_cryptodev_scheduler_mode_set(sched_id,
-                       CDEV_SCHED_MODE_ROUNDROBIN);
-       TEST_ASSERT(ret == 0,
-               "Failed to set cdev %u to round-robin mode", sched_id);
-       TEST_ASSERT(rte_cryptodev_scheduler_mode_get(sched_id) ==
-                       CDEV_SCHED_MODE_ROUNDROBIN, "Scheduling Mode "
-                                       "not match");
+static int
+test_scheduler_mode_pkt_size_distr_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) ==
+                       0, "Failed to set pktsize mode");
 
        return 0;
 }
@@ -8464,8 +8639,20 @@ static struct unit_test_suite cryptodev_scheduler_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
+               /* Multi Core */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_multicore_op),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_chain_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_cipheronly_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_authonly_scheduler_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* Round Robin */
                TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_AES_chain_scheduler_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8473,6 +8660,29 @@ static struct unit_test_suite cryptodev_scheduler_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                                test_authonly_scheduler_all),
                TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* Fail over */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_failover_op),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_chain_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_cipheronly_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_authonly_scheduler_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* PKT SIZE */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_pkt_size_distr_op),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_chain_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_AES_cipheronly_scheduler_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                       test_authonly_scheduler_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -8767,6 +8977,18 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
        }
 };
 
+static struct unit_test_suite cryptodev_virtio_testsuite = {
+       .suite_name = "Crypto VIRTIO Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_AES_cipheronly_virtio_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
 static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
        .suite_name = "Crypto Device AESNI MB Unit Test Suite",
        .setup = testsuite_setup,
@@ -9646,6 +9868,38 @@ static struct unit_test_suite cryptodev_mrvl_testsuite  = {
        }
 };
 
+static struct unit_test_suite cryptodev_ccp_testsuite  = {
+       .suite_name = "Crypto Device CCP Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_AES_chain_ccp_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_AES_cipheronly_ccp_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_3DES_chain_ccp_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_3DES_cipheronly_ccp_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_authonly_ccp_all),
+
+               /** 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,
+                       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*/)
@@ -9663,6 +9917,22 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_qat_testsuite);
 }
 
+static int
+test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_virtio_testsuite);
+}
+
 static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
 {
@@ -9795,11 +10065,11 @@ static int
 test_cryptodev_mrvl(void)
 {
        gbl_driver_id = rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_MRVL_PMD));
+                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
 
        if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "MRVL PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_MRVL_CRYPTO is enabled "
+               RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled "
                                "in config file to run this testsuite.\n");
                return TEST_SKIPPED;
        }
@@ -9867,6 +10137,22 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
 }
 
+static int
+test_cryptodev_ccp(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_CCP_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_CCP is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_ccp_testsuite);
+}
+
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
@@ -9876,6 +10162,8 @@ REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);
 REGISTER_TEST_COMMAND(cryptodev_sw_zuc_autotest, test_cryptodev_sw_zuc);
 REGISTER_TEST_COMMAND(cryptodev_sw_armv8_autotest, test_cryptodev_armv8);
-REGISTER_TEST_COMMAND(cryptodev_sw_mrvl_autotest, test_cryptodev_mrvl);
+REGISTER_TEST_COMMAND(cryptodev_sw_mvsam_autotest, test_cryptodev_mrvl);
 REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec);
 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);