cryptodev: rename functions to get session size
[dpdk.git] / test / test / test_cryptodev.c
index 4d7e5b1..389f796 100644 (file)
@@ -2,6 +2,8 @@
  * Copyright(c) 2015-2017 Intel Corporation
  */
 
+#include <time.h>
+
 #include <rte_common.h>
 #include <rte_hexdump.h>
 #include <rte_mbuf.h>
@@ -19,6 +21,8 @@
 #include <rte_cryptodev_scheduler_operations.h>
 #endif
 
+#include <rte_lcore.h>
+
 #include "test.h"
 #include "test_cryptodev.h"
 
@@ -34,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 {
@@ -314,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",
@@ -381,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,
@@ -1724,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)
 {
@@ -1762,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)
 {
@@ -1895,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)
 {
@@ -1925,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");
@@ -1944,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");
@@ -1963,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");
@@ -1982,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");
@@ -2001,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");
@@ -2024,7 +2148,7 @@ create_wireless_algo_hash_session(uint8_t dev_id,
 
        memcpy(hash_key, key, key_len);
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Setup Authentication Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -2071,7 +2195,7 @@ create_wireless_algo_cipher_session(uint8_t dev_id,
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
        ut_params->cipher_xform.cipher.iv.length = iv_len;
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Create Crypto session */
        ut_params->sess = rte_cryptodev_sym_session_create(
@@ -2187,7 +2311,7 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
        ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
@@ -2246,7 +2370,7 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
        ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
@@ -2308,7 +2432,7 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,
        ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
        ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
@@ -2365,7 +2489,7 @@ create_wireless_algo_hash_operation(const uint8_t *auth_tag,
        else
                rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                sym_op->auth.digest.data,
                auth_tag_len);
 
@@ -2421,7 +2545,7 @@ create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
        else
                rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                sym_op->auth.digest.data,
                auth_tag_len);
 
@@ -2488,7 +2612,7 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
        else
                rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                sym_op->auth.digest.data,
                auth_tag_len);
 
@@ -2544,7 +2668,7 @@ create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_len,
 
        memset(sym_op->auth.digest.data, 0, auth_tag_len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        auth_tag_len);
 
@@ -2977,7 +3101,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -2997,7 +3121,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        else
                ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        const uint8_t *reference_ciphertext = tdata->ciphertext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
@@ -3077,7 +3201,7 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
                                plaintext_len, buffer);
 
        /* Validate obuf */
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        const uint8_t *reference_ciphertext = tdata->ciphertext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
@@ -3126,7 +3250,7 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
@@ -3146,7 +3270,7 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        else
                ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        const uint8_t *reference_ciphertext = tdata->ciphertext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
@@ -3273,7 +3397,7 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
        rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
@@ -3293,7 +3417,7 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
        else
                plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
        const uint8_t *reference_plaintext = tdata->plaintext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
@@ -3340,7 +3464,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata)
                                ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -3360,7 +3484,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata)
        else
                plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
        const uint8_t *reference_plaintext = tdata->plaintext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
@@ -3407,7 +3531,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -3427,7 +3551,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -3480,7 +3604,7 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
@@ -3500,7 +3624,7 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -3578,7 +3702,7 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
                ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
                                plaintext_len, buffer);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -3736,7 +3860,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
                                ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -3755,7 +3879,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        else
                plaintext = ciphertext;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
@@ -3809,7 +3933,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
@@ -3828,7 +3952,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        else
                plaintext = ciphertext;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
@@ -3888,7 +4012,7 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create ZUC operation */
        retval = create_zuc_cipher_hash_generate_operation(tdata);
@@ -3904,7 +4028,7 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
@@ -3961,7 +4085,7 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
@@ -3986,7 +4110,7 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
@@ -4043,7 +4167,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_auth_cipher_operation(
@@ -4070,7 +4194,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata)
 
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
                        + plaintext_pad_len;
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -4126,7 +4250,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_auth_cipher_operation(tdata->digest.len,
@@ -4212,7 +4336,7 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
@@ -4304,7 +4428,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create ZUC operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -4324,7 +4448,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -4411,7 +4535,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
                        0, plaintext_len, ciphertext_buffer);
 
        /* Validate obuf */
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
@@ -4970,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)
 {
@@ -5055,7 +5217,7 @@ create_aead_session(uint8_t dev_id, enum rte_crypto_aead_algorithm algo,
        ut_params->aead_xform.aead.digest_length = auth_len;
        ut_params->aead_xform.aead.aad_length = aad_len;
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
@@ -5094,7 +5256,7 @@ create_aead_xform(struct rte_crypto_op *op,
        sym_op->xform->aead.digest_length = auth_len;
        sym_op->xform->aead.aad_length = aad_len;
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       debug_hexdump(stdout, "key:", key, key_len);
 
        return 0;
 }
@@ -5129,7 +5291,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                                rte_pktmbuf_iova(ut_params->ibuf);
                /* Copy AAD 18 bytes after the AAD pointer, according to the API */
                memcpy(sym_op->aead.aad.data + 18, tdata->aad.data, tdata->aad.len);
-               TEST_HEXDUMP(stdout, "aad:", sym_op->aead.aad.data,
+               debug_hexdump(stdout, "aad:", sym_op->aead.aad.data,
                        tdata->aad.len);
 
                /* Append IV at the end of the crypto operation*/
@@ -5138,7 +5300,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 
                /* Copy IV 1 byte after the IV pointer, according to the API */
                rte_memcpy(iv_ptr + 1, tdata->iv.data, tdata->iv.len);
-               TEST_HEXDUMP(stdout, "iv:", iv_ptr,
+               debug_hexdump(stdout, "iv:", iv_ptr,
                        tdata->iv.len);
        } else {
                aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
@@ -5150,7 +5312,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                sym_op->aead.aad.phys_addr =
                                rte_pktmbuf_iova(ut_params->ibuf);
                memcpy(sym_op->aead.aad.data, tdata->aad.data, tdata->aad.len);
-               TEST_HEXDUMP(stdout, "aad:", sym_op->aead.aad.data,
+               debug_hexdump(stdout, "aad:", sym_op->aead.aad.data,
                        tdata->aad.len);
 
                /* Append IV at the end of the crypto operation*/
@@ -5158,7 +5320,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                                uint8_t *, IV_OFFSET);
 
                rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
-               TEST_HEXDUMP(stdout, "iv:", iv_ptr,
+               debug_hexdump(stdout, "iv:", iv_ptr,
                        tdata->iv.len);
        }
 
@@ -5170,7 +5332,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
                memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-               TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+               debug_hexdump(stdout, "plaintext:", plaintext,
                                tdata->plaintext.len);
 
                if (ut_params->obuf) {
@@ -5192,7 +5354,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 
                memcpy(ciphertext, tdata->ciphertext.data,
                                tdata->ciphertext.len);
-               TEST_HEXDUMP(stdout, "ciphertext:", ciphertext,
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
                                tdata->ciphertext.len);
 
                if (ut_params->obuf) {
@@ -5232,7 +5394,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 
                rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                        tdata->auth_tag.len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                        sym_op->aead.digest.data,
                        tdata->auth_tag.len);
        }
@@ -5306,8 +5468,8 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
                auth_tag = ciphertext + plaintext_pad_len;
        }
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5520,7 +5682,7 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
                                uint8_t *,
                                ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5725,8 +5887,8 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
                        ut_params->op->sym->cipher.data.offset);
        auth_tag = ciphertext + plaintext_pad_len;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5799,7 +5961,7 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
        plaintext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
                        ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5875,8 +6037,8 @@ test_authenticated_encryption_sessionless(
                        ut_params->op->sym->cipher.data.offset);
        auth_tag = ciphertext + plaintext_pad_len;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5953,7 +6115,7 @@ test_authenticated_decryption_sessionless(
        plaintext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
                        ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -6454,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(
@@ -6581,17 +6743,29 @@ test_null_cipher_only_operation(void)
 
        return TEST_SUCCESS;
 }
-
+uint8_t orig_data[] = {0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab};
 static int
 test_null_auth_only_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *digest;
 
        /* Generate test mbuf data and space for digest */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
 
+       /* create a pointer for digest, but don't expect anything to be written
+        * here in a NULL auth algo so no mbuf append done.
+        */
+       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       QUOTE_512_BYTES);
+       /* prefill the memory pointed to by digest */
+       memcpy(digest, orig_data, sizeof(orig_data));
+
        /* Setup HMAC Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
        ut_params->auth_xform.next = NULL;
@@ -6623,6 +6797,9 @@ test_null_auth_only_operation(void)
 
        sym_op->auth.data.offset = 0;
        sym_op->auth.data.length = QUOTE_512_BYTES;
+       sym_op->auth.digest.data = digest;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                       QUOTE_512_BYTES);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6631,20 +6808,36 @@ test_null_auth_only_operation(void)
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto operation processing failed");
+       /* Make sure memory pointed to by digest hasn't been overwritten */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       orig_data,
+                       digest,
+                       sizeof(orig_data),
+                       "Memory at digest ptr overwritten unexpectedly");
 
        return TEST_SUCCESS;
 }
 
+
 static int
 test_null_cipher_auth_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *digest;
 
        /* Generate test mbuf data and space for digest */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
 
+       /* create a pointer for digest, but don't expect anything to be written
+        * here in a NULL auth algo so no mbuf append done.
+        */
+       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       QUOTE_512_BYTES);
+       /* prefill the memory pointed to by digest */
+       memcpy(digest, orig_data, sizeof(orig_data));
+
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = &ut_params->auth_xform;
@@ -6686,6 +6879,9 @@ test_null_cipher_auth_operation(void)
 
        sym_op->auth.data.offset = 0;
        sym_op->auth.data.length = QUOTE_512_BYTES;
+       sym_op->auth.digest.data = digest;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                       QUOTE_512_BYTES);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6701,6 +6897,12 @@ test_null_cipher_auth_operation(void)
                        catch_22_quote,
                        QUOTE_512_BYTES,
                        "Ciphertext data not as expected");
+       /* Make sure memory pointed to by digest hasn't been overwritten */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       orig_data,
+                       digest,
+                       sizeof(orig_data),
+                       "Memory at digest ptr overwritten unexpectedly");
 
        return TEST_SUCCESS;
 }
@@ -6710,11 +6912,20 @@ test_null_auth_cipher_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *digest;
 
-       /* Generate test mbuf data and space for digest */
+       /* Generate test mbuf data */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
 
+       /* create a pointer for digest, but don't expect anything to be written
+        * here in a NULL auth algo so no mbuf append done.
+        */
+       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                               QUOTE_512_BYTES);
+       /* prefill the memory pointed to by digest */
+       memcpy(digest, orig_data, sizeof(orig_data));
+
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
@@ -6756,6 +6967,9 @@ test_null_auth_cipher_operation(void)
 
        sym_op->auth.data.offset = 0;
        sym_op->auth.data.length = QUOTE_512_BYTES;
+       sym_op->auth.digest.data = digest;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                                       QUOTE_512_BYTES);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6771,6 +6985,12 @@ test_null_auth_cipher_operation(void)
                        catch_22_quote,
                        QUOTE_512_BYTES,
                        "Ciphertext data not as expected");
+       /* Make sure memory pointed to by digest hasn't been overwritten */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       orig_data,
+                       digest,
+                       sizeof(orig_data),
+                       "Memory at digest ptr overwritten unexpectedly");
 
        return TEST_SUCCESS;
 }
@@ -6941,7 +7161,7 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
        if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
                                tdata->gmac_tag.len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                                sym_op->auth.digest.data,
                                tdata->gmac_tag.len);
        }
@@ -6951,7 +7171,7 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
 
        rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
 
-       TEST_HEXDUMP(stdout, "iv:", iv_ptr, tdata->iv.len);
+       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
 
        sym_op->cipher.data.length = 0;
        sym_op->cipher.data.offset = 0;
@@ -7041,7 +7261,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
        memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+       debug_hexdump(stdout, "plaintext:", plaintext,
                        tdata->plaintext.len);
 
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
@@ -7067,7 +7287,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
                auth_tag = plaintext + plaintext_pad_len;
        }
 
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
 
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
                        auth_tag,
@@ -7145,7 +7365,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
        memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+       debug_hexdump(stdout, "plaintext:", plaintext,
                        tdata->plaintext.len);
 
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
@@ -7467,7 +7687,7 @@ create_auth_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7514,7 +7734,7 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7567,7 +7787,7 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7640,7 +7860,8 @@ test_authentication_verify_fail_when_data_corruption(
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
        memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, reference->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
 
        /* Create operation */
        retval = create_auth_verify_operation(ts_params, ut_params, reference);
@@ -7698,7 +7919,8 @@ test_authentication_verify_GMAC_fail_when_corruption(
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
        memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, reference->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
 
        /* Create operation */
        retval = create_auth_verify_GMAC_operation(ts_params,
@@ -7817,7 +8039,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
        if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
                rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                                auth_tag_len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                                sym_op->aead.digest.data,
                                auth_tag_len);
        }
@@ -7843,8 +8065,8 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
                /* Copy AAD 18 bytes after the AAD pointer, according to the API */
                rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
-               TEST_HEXDUMP(stdout, "iv:", iv_ptr, iv_len);
-               TEST_HEXDUMP(stdout, "aad:",
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
                                sym_op->aead.aad.data, aad_len);
        } else {
                uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
@@ -7862,8 +8084,8 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
                memset(sym_op->aead.aad.data, 0, aad_len);
                rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
-               TEST_HEXDUMP(stdout, "iv:", iv_ptr, iv_len);
-               TEST_HEXDUMP(stdout, "aad:",
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
                                sym_op->aead.aad.data, aad_len);
        }
 
@@ -8313,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,
@@ -8366,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;
 
-       /* 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_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;
+}
+
+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;
 }
@@ -8402,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,
@@ -8411,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 */
        }
 };
@@ -8705,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,
@@ -8718,6 +9002,18 @@ static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
                                                test_DES_cipheronly_mb_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
                                                test_DES_docsis_mb_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_128_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_128_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_128_3),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
@@ -9349,6 +9645,16 @@ static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
+               /** Scatter-Gather */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -9476,6 +9782,16 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
+               /** Scatter-Gather */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -9552,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*/)
@@ -9563,12 +9911,28 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_QAT is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        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*/)
 {
@@ -9579,7 +9943,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
@@ -9595,7 +9959,7 @@ test_cryptodev_openssl(void)
                RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_openssl_testsuite);
@@ -9611,7 +9975,7 @@ test_cryptodev_aesni_gcm(void)
                RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
@@ -9627,7 +9991,7 @@ test_cryptodev_null(void)
                RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_NULL is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_null_testsuite);
@@ -9643,7 +10007,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
@@ -9659,7 +10023,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
@@ -9675,7 +10039,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
@@ -9691,7 +10055,7 @@ test_cryptodev_armv8(void)
                RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_armv8_testsuite);
@@ -9701,13 +10065,13 @@ 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_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_mrvl_testsuite);
@@ -9725,14 +10089,14 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        if (rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) {
                RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be"
                        " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
 }
        return unit_test_suite_runner(&cryptodev_scheduler_testsuite);
 }
@@ -9751,7 +10115,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
@@ -9767,12 +10131,28 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        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);
@@ -9782,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);