test/crypto: enable feature flag for security
[dpdk.git] / app / test / test_cryptodev.c
index e6abc22..70bf6fe 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2019 Intel Corporation
+ * Copyright(c) 2015-2020 Intel Corporation
  */
 
 #include <time.h>
@@ -11,6 +11,7 @@
 #include <rte_memcpy.h>
 #include <rte_pause.h>
 #include <rte_bus_vdev.h>
+#include <rte_ether.h>
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
@@ -42,6 +43,7 @@
 #ifdef RTE_LIBRTE_SECURITY
 #include "test_cryptodev_security_pdcp_test_vectors.h"
 #include "test_cryptodev_security_pdcp_test_func.h"
+#include "test_cryptodev_security_docsis_test_vectors.h"
 #endif
 
 #define VDEV_ARGS_SIZE 100
@@ -52,6 +54,9 @@
 
 static int gbl_driver_id;
 
+static enum rte_security_session_action_type gbl_action_type =
+       RTE_SECURITY_ACTION_TYPE_NONE;
+
 struct crypto_testsuite_params {
        struct rte_mempool *mbuf_pool;
        struct rte_mempool *large_mbuf_pool;
@@ -69,6 +74,9 @@ struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
        struct rte_crypto_sym_xform aead_xform;
+#ifdef RTE_LIBRTE_SECURITY
+       struct rte_security_docsis_xform docsis_xform;
+#endif
 
        union {
                struct rte_cryptodev_sym_session *sess;
@@ -139,9 +147,99 @@ ceil_byte_length(uint32_t num_bits)
                return (num_bits >> 3);
 }
 
+static void
+process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->aead.data.offset,
+               sop->aead.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->aead.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
+static void
+process_cpu_crypt_auth_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->auth.data.offset,
+               sop->auth.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->auth.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+       ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset;
+       ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) -
+               (sop->cipher.data.offset + sop->cipher.data.length);
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
 static struct rte_crypto_op *
 process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 {
+
+       RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
+
        if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {
                RTE_LOG(ERR, USER1, "Error sending packet for encryption\n");
                return NULL;
@@ -533,7 +631,7 @@ testsuite_teardown(void)
 }
 
 static int
-ut_setup(void)
+dev_configure_and_start(uint64_t ff_disable)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -545,7 +643,7 @@ ut_setup(void)
 
        /* Reconfigure device to default parameters */
        ts_params->conf.socket_id = SOCKET_ID_ANY;
-       ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
+       ts_params->conf.ff_disable = ff_disable;
        ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
        ts_params->qp_conf.mp_session = ts_params->session_mpool;
        ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
@@ -575,6 +673,20 @@ ut_setup(void)
        return TEST_SUCCESS;
 }
 
+static int
+ut_setup(void)
+{
+       /* Configure and start the device with security feature disabled */
+       return dev_configure_and_start(RTE_CRYPTODEV_FF_SECURITY);
+}
+
+static int
+ut_setup_security(void)
+{
+       /* Configure and start the device with no features disabled */
+       return dev_configure_and_start(0);
+}
+
 static void
 ut_teardown(void)
 {
@@ -674,27 +786,19 @@ test_device_configure_invalid_queue_pair_ids(void)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs;
 
-       /* This test is for QAT and NITROX PMDs only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)) &&
-           gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NITROX_PMD)))
-               return -ENOTSUP;
-
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       /* valid - one queue pairs */
-       ts_params->conf.nb_queue_pairs = 1;
+       /* valid - max value queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev: dev_id %u, qp_id %u",
                        ts_params->valid_devs[0], ts_params->conf.nb_queue_pairs);
 
-
-       /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       /* valid - one queue pairs */
+       ts_params->conf.nb_queue_pairs = 1;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -745,24 +849,14 @@ static int
 test_queue_pair_descriptor_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_qp_conf qp_conf = {
                .nb_descriptors = MAX_NUM_OPS_INFLIGHT
        };
-
        uint16_t qp_id;
 
-       /* This test is for QAT PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)))
-               return -ENOTSUP;
-
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev %u",
@@ -816,36 +910,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 2 */
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT + 2;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
-       /* invalid number of descriptors - max value of parameter */
-       qp_conf.nb_descriptors = UINT32_MAX-1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
 
        for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
@@ -860,21 +924,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 1 */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT + 1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
@@ -1447,8 +1496,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1598,8 +1653,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                               process_crypto_request(ts_params->valid_devs[0],
+                                       ut_params->op),
+                                       "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1630,7 +1691,6 @@ test_blockcipher(enum blockcipher_test_type test_type)
                ts_params->op_mpool,
                ts_params->session_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
-               gbl_driver_id,
                test_type);
 
        if (status == -ENOTSUP)
@@ -1946,6 +2006,8 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
        status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
                        &ut_params->cipher_xform,
                        ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
        TEST_ASSERT_EQUAL(status, 0, "session init failed");
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
@@ -2357,12 +2419,16 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
        uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2431,12 +2497,16 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
        uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -2546,8 +2616,13 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
        ut_params->obuf = ut_params->op->sym->m_src;
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -3530,11 +3605,16 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
        uint32_t plaintext_pad_len;
        uint8_t extra_offset = 4;
        uint8_t *expected_ciphertext_shifted;
+       struct rte_cryptodev_info dev_info;
 
-       /* QAT PMD supports byte-aligned data only */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)))
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validDataLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3788,8 +3868,19 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
 
+       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_sym_capability_idx cap_idx;
 
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8 != 0) ||
+                       (tdata->validDataLenInBits.len % 8 != 0))) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
+
        /* Check if device supports ZUC EEA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
@@ -4977,12 +5068,16 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
        uint8_t *plaintext;
 
        struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* QAT PMD supports byte-aligned data only */
-       if ((tdata->validAuthLenInBits.len % 8 != 0) &&
-                       (gbl_driver_id == rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       (tdata->validAuthLenInBits.len % 8 != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
                return -ENOTSUP;
+       }
 
        /* Check if device supports ZUC EIA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -5075,6 +5170,19 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
                printf("Device doesn't support digest encrypted.\n");
                return -ENOTSUP;
        }
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       }
 
        /* Create ZUC session */
        retval = create_wireless_algo_auth_cipher_session(
@@ -5923,11 +6031,6 @@ test_zuc_hash_generate_test_case_6(void)
 static int
 test_zuc_hash_generate_test_case_7(void)
 {
-       /* This test is not for SW ZUC PMD */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD)))
-               return -ENOTSUP;
-
        return test_zuc_authentication(&zuc_test_case_auth_2080b);
 }
 
@@ -5952,11 +6055,6 @@ test_zuc_cipher_auth_test_case_2(void)
 static int
 test_zuc_auth_cipher_test_case_1(void)
 {
-       /* This test is not for SW ZUC PMD */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_ZUC_PMD)))
-               return -ENOTSUP;
-
        return test_zuc_auth_cipher(
                &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
 }
@@ -6794,9 +6892,15 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
                                uint8_t *, IV_OFFSET);
 
-               rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
-               debug_hexdump(stdout, "iv:", iv_ptr,
-                       tdata->iv.len);
+               if (tdata->iv.len == 0) {
+                       rte_memcpy(iv_ptr, tdata->iv.data, AES_GCM_J0_LENGTH);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               AES_GCM_J0_LENGTH);
+               } else {
+                       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               tdata->iv.len);
+               }
        }
 
        /* Append plaintext/ciphertext */
@@ -6937,7 +7041,11 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -6978,6 +7086,36 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
 }
 
 #ifdef RTE_LIBRTE_SECURITY
+static int
+security_proto_supported(enum rte_security_session_action_type action,
+       enum rte_security_session_protocol proto)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+
+       const struct rte_security_capability *capabilities;
+       const struct rte_security_capability *capability;
+       uint16_t i = 0;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
+
+
+       capabilities = rte_security_capabilities_get(ctx);
+
+       if (capabilities == NULL)
+               return -ENOTSUP;
+
+       while ((capability = &capabilities[i++])->action !=
+                       RTE_SECURITY_ACTION_TYPE_NONE) {
+               if (capability->action == action &&
+                               capability->protocol == proto)
+                       return 0;
+       }
+
+       return -ENOTSUP;
+}
+
 /* Basic algorithm run function for async inplace mode.
  * Creates a session from input parameters and runs one operation
  * on input_vec. Checks the output of the crypto operation against
@@ -7003,7 +7141,7 @@ test_pdcp_proto(int i, int oop,
        /* Verify the capabilities */
        struct rte_security_capability_idx sec_cap_idx;
 
-       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.action = ut_params->type;
        sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
        sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
        if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
@@ -7029,9 +7167,6 @@ test_pdcp_proto(int i, int oop,
                rte_pktmbuf_append(ut_params->obuf, output_vec_len);
        }
 
-       /* Set crypto type as IPSEC */
-       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
-
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
@@ -7039,7 +7174,9 @@ test_pdcp_proto(int i, int oop,
        ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
        ut_params->cipher_xform.cipher.key.length =
                                        pdcp_test_params[i].cipher_key_len;
-       ut_params->cipher_xform.cipher.iv.length = 0;
+       ut_params->cipher_xform.cipher.iv.length =
+                               pdcp_test_packet_direction[i] ? 4 : 0;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
 
        /* Setup HMAC Parameters if ICV header is required */
        if (pdcp_test_params[i].auth_alg != 0) {
@@ -7057,15 +7194,25 @@ test_pdcp_proto(int i, int oop,
        }
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .action_type = ut_params->type,
                .protocol = RTE_SECURITY_PROTOCOL_PDCP,
                {.pdcp = {
                        .bearer = pdcp_test_bearer[i],
                        .domain = pdcp_test_params[i].domain,
                        .pkt_dir = pdcp_test_packet_direction[i],
                        .sn_size = pdcp_test_data_sn_size[i],
-                       .hfn = pdcp_test_hfn[i],
+                       .hfn = pdcp_test_packet_direction[i] ?
+                               0 : pdcp_test_hfn[i],
+                               /**
+                                * hfn can be set as pdcp_test_hfn[i]
+                                * if hfn_ovrd is not set. Here, PDCP
+                                * packet direction is just used to
+                                * run half of the cases with session
+                                * HFN and other half with per packet
+                                * HFN.
+                                */
                        .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .hfn_ovrd = pdcp_test_packet_direction[i] ? 1 : 0,
                } },
                .crypto_xform = &ut_params->cipher_xform
        };
@@ -7092,6 +7239,10 @@ test_pdcp_proto(int i, int oop,
                goto on_err;
        }
 
+       uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ut_params->op,
+                                       uint32_t *, IV_OFFSET);
+       *per_pkt_hfn = pdcp_test_packet_direction[i] ? pdcp_test_hfn[i] : 0;
+
        rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
        /* set crypto operation source mbuf */
@@ -7177,7 +7328,7 @@ test_pdcp_proto_SGL(int i, int oop,
        /* Verify the capabilities */
        struct rte_security_capability_idx sec_cap_idx;
 
-       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.action = ut_params->type;
        sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
        sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
        if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
@@ -7287,8 +7438,6 @@ test_pdcp_proto_SGL(int i, int oop,
                ut_params->obuf->nb_segs = segs;
        }
 
-       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
-
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
@@ -7314,7 +7463,7 @@ test_pdcp_proto_SGL(int i, int oop,
        }
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .action_type = ut_params->type,
                .protocol = RTE_SECURITY_PROTOCOL_PDCP,
                {.pdcp = {
                        .bearer = pdcp_test_bearer[i],
@@ -7323,6 +7472,7 @@ test_pdcp_proto_SGL(int i, int oop,
                        .sn_size = pdcp_test_data_sn_size[i],
                        .hfn = pdcp_test_hfn[i],
                        .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .hfn_ovrd = 0,
                } },
                .crypto_xform = &ut_params->cipher_xform
        };
@@ -7567,202 +7717,722 @@ test_PDCP_PROTO_SGL_oop_128B_32B(void)
                        pdcp_test_data_in_len[i]+4,
                        128, 32);
 }
-#endif
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_1(void)
+test_PDCP_PROTO_all(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_2);
-}
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_3);
-}
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_4);
-}
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_5);
-}
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_PDCP) < 0)
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_6(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_6);
-}
+       status = test_PDCP_PROTO_cplane_encap_all();
+       status += test_PDCP_PROTO_cplane_decap_all();
+       status += test_PDCP_PROTO_uplane_encap_all();
+       status += test_PDCP_PROTO_uplane_decap_all();
+       status += test_PDCP_PROTO_SGL_in_place_32B();
+       status += test_PDCP_PROTO_SGL_oop_32B_128B();
+       status += test_PDCP_PROTO_SGL_oop_32B_40B();
+       status += test_PDCP_PROTO_SGL_oop_128B_32B();
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_7);
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_8(void)
+test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)
 {
-       return test_authenticated_encryption(&gcm_test_case_8);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       uint32_t crc_data_len;
+       int ret = TEST_SUCCESS;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_1);
-}
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_2);
-}
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_3);
-}
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_UPLINK;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_4);
-}
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_5);
-}
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
+
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
+
+       /* Setup source mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->ciphertext.len);
+
+       memcpy(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len);
+
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
+
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_UPLINK;
+
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
+
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
+
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate symmetric crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Setup CRC operation parameters */
+       crc_len = d_td->ciphertext.no_crc == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       crc_data_len = crc_len == 0 ? 0 : RTE_ETHER_CRC_LEN;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->ciphertext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->ciphertext.no_cipher == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->ciphertext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = NULL;
+
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Validate plaintext */
+       plaintext = ciphertext;
+
+       if (memcmp(plaintext, d_td->plaintext.data,
+                       d_td->plaintext.len - crc_data_len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "plaintext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->plaintext.data,
+                               d_td->plaintext.len);
+               rte_hexdump(stdout, "actual", plaintext, d_td->plaintext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
+}
 
 static int
-test_AES_GCM_auth_encryption_test_case_192_6(void)
+test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)
 {
-       return test_authenticated_encryption(&gcm_test_case_192_6);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       int ret = TEST_SUCCESS;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
+
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
+
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
+
+       /* Setup source mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->plaintext.len);
+
+       memcpy(plaintext, d_td->plaintext.data, d_td->plaintext.len);
+
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
+
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
+
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
+
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate security crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Setup CRC operation parameters */
+       crc_len = d_td->plaintext.no_crc == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->plaintext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->plaintext.no_cipher == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->plaintext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = NULL;
+
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Validate ciphertext */
+       ciphertext = plaintext;
+
+       if (memcmp(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "ciphertext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->ciphertext.data,
+                               d_td->ciphertext.len);
+               rte_hexdump(stdout, "actual", ciphertext, d_td->ciphertext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
 }
 
+#define TEST_DOCSIS_COUNT(func) do {                   \
+       int ret = func;                                 \
+       if (ret == TEST_SUCCESS)  {                     \
+               printf("\t%2d)", n++);                  \
+               printf("+++++ PASSED:" #func"\n");      \
+               p++;                                    \
+       } else if (ret == -ENOTSUP) {                   \
+               printf("\t%2d)", n++);                  \
+               printf("~~~~~ UNSUPP:" #func"\n");      \
+               u++;                                    \
+       } else {                                        \
+               printf("\t%2d)", n++);                  \
+               printf("----- FAILED:" #func"\n");      \
+               f++;                                    \
+       }                                               \
+} while (0)
+
+static int
+test_DOCSIS_PROTO_uplink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
+
 static int
-test_AES_GCM_auth_encryption_test_case_192_7(void)
+test_DOCSIS_PROTO_downlink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
+
+static int
+test_DOCSIS_PROTO_all(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_192_7);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
+
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
+
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_DOCSIS) < 0)
+               return -ENOTSUP;
+
+       status = test_DOCSIS_PROTO_uplink_all();
+       status += test_DOCSIS_PROTO_downlink_all();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
+#endif
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_1(void)
+test_AES_GCM_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_1);
+       return test_authenticated_encryption(&gcm_test_case_1);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_2(void)
+test_AES_GCM_authenticated_encryption_test_case_2(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_2);
+       return test_authenticated_encryption(&gcm_test_case_2);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_3(void)
+test_AES_GCM_authenticated_encryption_test_case_3(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_3);
+       return test_authenticated_encryption(&gcm_test_case_3);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_4(void)
+test_AES_GCM_authenticated_encryption_test_case_4(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_4);
+       return test_authenticated_encryption(&gcm_test_case_4);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_5(void)
+test_AES_GCM_authenticated_encryption_test_case_5(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_5);
+       return test_authenticated_encryption(&gcm_test_case_5);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_6(void)
+test_AES_GCM_authenticated_encryption_test_case_6(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_6);
+       return test_authenticated_encryption(&gcm_test_case_6);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_256_7(void)
+test_AES_GCM_authenticated_encryption_test_case_7(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_256_7);
+       return test_authenticated_encryption(&gcm_test_case_7);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_aad_1(void)
+test_AES_GCM_authenticated_encryption_test_case_8(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_aad_1);
+       return test_authenticated_encryption(&gcm_test_case_8);
 }
 
 static int
-test_AES_GCM_auth_encryption_test_case_aad_2(void)
+test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_aad_2);
+       return test_authenticated_encryption(&gcm_J0_test_case_1);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+test_AES_GCM_auth_encryption_test_case_192_1(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.iv.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_192_1);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
+test_AES_GCM_auth_encryption_test_case_192_2(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.plaintext.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_192_2);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
+test_AES_GCM_auth_encryption_test_case_192_3(void)
 {
-       struct aead_test_data tdata;
-       int res;
-
-       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
-       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
-       tdata.ciphertext.data[0] += 1;
-       res = test_authenticated_encryption(&tdata);
-       if (res == -ENOTSUP)
-               return res;
-       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_192_3);
 }
 
 static int
-test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
+test_AES_GCM_auth_encryption_test_case_192_4(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_4);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_5(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_5);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_6(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_6);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_7(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_192_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_2);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_3(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_3);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_4(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_4);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_5(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_5);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_6(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_6);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_7(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_256_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_1);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_aad_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_2);
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
 {
        struct aead_test_data tdata;
        int res;
@@ -7868,7 +8538,11 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -7946,6 +8620,12 @@ test_AES_GCM_authenticated_decryption_test_case_8(void)
        return test_authenticated_decryption(&gcm_test_case_8);
 }
 
+static int
+test_AES_GCM_J0_authenticated_decryption_test_case_1(void)
+{
+       return test_authenticated_decryption(&gcm_J0_test_case_1);
+}
+
 static int
 test_AES_GCM_auth_decryption_test_case_192_1(void)
 {
@@ -8154,6 +8834,10 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8239,6 +8923,10 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8310,12 +8998,18 @@ test_authenticated_encryption_sessionless(
        uint8_t *ciphertext, *auth_tag;
        uint16_t plaintext_pad_len;
        uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
 
-       /* This test is for AESNI MB and AESNI GCM PMDs only */
-       if ((gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) &&
-                       (gbl_driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))))
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                return -ENOTSUP;
 
        /* Verify the capabilities */
@@ -8406,12 +9100,18 @@ test_authenticated_decryption_sessionless(
        int retval;
        uint8_t *plaintext;
        uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* This test is for AESNI MB and AESNI GCM PMDs only */
-       if ((gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) &&
-                       (gbl_driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))))
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
                return -ENOTSUP;
 
        /* Verify the capabilities */
@@ -8597,8 +9297,9 @@ test_stats(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct rte_cryptodev_stats stats;
-       struct rte_cryptodev *dev;
-       cryptodev_stats_get_t temp_pfn;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -8613,19 +9314,16 @@ test_stats(void)
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
+       if (rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
+                       == -ENOTSUP)
+               return -ENOTSUP;
+
        rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
                        &stats) == -ENODEV),
                "rte_cryptodev_stats_get invalid dev failed");
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], 0) != 0),
                "rte_cryptodev_stats_get invalid Param failed");
-       dev = &rte_cryptodevs[ts_params->valid_devs[0]];
-       temp_pfn = dev->dev_ops->stats_get;
-       dev->dev_ops->stats_get = (cryptodev_stats_get_t)0;
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
-                       == -ENOTSUP),
-               "rte_cryptodev_stats_get invalid Param failed");
-       dev->dev_ops->stats_get = temp_pfn;
 
        /* Test expected values */
        ut_setup();
@@ -8771,8 +9469,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -8823,8 +9527,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "HMAC_MD5 crypto op processing failed");
@@ -9084,105 +9794,86 @@ test_multi_session_random_usage(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_cipher_only_operation(void)
+test_null_invalid_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       int ret;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
                return -ENOTSUP;
 
-       /* 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);
-
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
        ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
 
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Setup HMAC Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+       /* Create Crypto session*/
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       return TEST_SUCCESS;
+}
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
+#define NULL_BURST_LENGTH (32)
 
-       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)
+test_null_burst_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       unsigned i, burst_len = NULL_BURST_LENGTH;
 
-       /* 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);
+       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
+       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
 
-       /* 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));
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return -ENOTSUP;
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
 
        /* Setup HMAC Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -9196,475 +9887,602 @@ test_null_auth_only_operation(void)
 
        /* Create Crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
+                       ut_params->sess, &ut_params->cipher_xform,
                        ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
+                       burst_len, "failed to generate burst of crypto ops");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Generate an operation for each mbuf in burst */
+       for (i = 0; i < burst_len; i++) {
+               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
 
-       sym_op->m_src = ut_params->ibuf;
+               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
+                               sizeof(unsigned));
+               *data = i;
 
-       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);
+               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
+
+               burst[i]->sym->m_src = m;
+       }
 
        /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
+                       0, burst, burst_len),
+                       burst_len,
+                       "Error enqueuing burst");
 
-       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");
+       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
+                       0, burst_dequeued, burst_len),
+                       burst_len,
+                       "Error dequeuing burst");
+
+
+       for (i = 0; i < burst_len; i++) {
+               TEST_ASSERT_EQUAL(
+                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
+                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
+                                       uint32_t *),
+                       "data not as expected");
+
+               rte_pktmbuf_free(burst[i]->sym->m_src);
+               rte_crypto_op_free(burst[i]);
+       }
 
        return TEST_SUCCESS;
 }
 
+static void
+generate_gmac_large_plaintext(uint8_t *data)
+{
+       uint16_t i;
+
+       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
+               memcpy(&data[i], &data[0], 32);
+}
 
 static int
-test_null_cipher_auth_operation(void)
+create_gmac_operation(enum rte_crypto_auth_operation op,
+               const struct gmac_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
+       struct rte_crypto_sym_op *sym_op;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       /* 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);
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
 
-       /* 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));
+       sym_op = ut_params->op->sym;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, tdata->gmac_tag.len);
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append digest");
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, plaintext_pad_len);
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
+               rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
+                               tdata->gmac_tag.len);
+               debug_hexdump(stdout, "digest:",
+                               sym_op->auth.digest.data,
+                               tdata->gmac_tag.len);
+       }
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                       uint8_t *, IV_OFFSET);
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       sym_op->cipher.data.length = 0;
+       sym_op->cipher.data.offset = 0;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = tdata->plaintext.len;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       return 0;
+}
 
-       sym_op->m_src = ut_params->ibuf;
+static int create_gmac_session(uint8_t dev_id,
+               const struct gmac_test_data *tdata,
+               enum rte_crypto_auth_operation auth_op)
+{
+       uint8_t auth_key[tdata->key.len];
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       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);
+       memcpy(auth_key, tdata->key.data, tdata->key.len);
 
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
+       ut_params->auth_xform.auth.key.length = tdata->key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = tdata->iv.len;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       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;
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       return 0;
 }
 
 static int
-test_null_auth_cipher_operation(void)
+test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
+
+       int retval;
+
+       uint8_t *auth_tag, *plaintext;
+       uint16_t plaintext_pad_len;
+
+       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
+                             "No GMAC length in the source data");
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_NULL;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_NULL;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
-       /* Generate test mbuf data */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       retval = create_gmac_session(ts_params->valid_devs[0],
+                       tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
 
-       /* 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));
+       if (retval < 0)
+               return retval;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       if (tdata->plaintext.len > MBUF_SIZE)
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+       else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+                       tdata->plaintext.len);
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata);
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       if (retval < 0)
+               return retval;
 
-       /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       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);
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+                       "crypto op processing failed");
+
+       if (ut_params->op->sym->m_dst) {
+               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
+                               uint8_t *, plaintext_pad_len);
+       } else {
+               auth_tag = plaintext + plaintext_pad_len;
+       }
+
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       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");
+                       auth_tag,
+                       tdata->gmac_tag.data,
+                       tdata->gmac_tag.len,
+                       "GMAC Generated auth tag not as expected");
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
-
 static int
-test_null_invalid_operation(void)
+test_AES_GMAC_authentication_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       int ret;
-
-       /* This test is for NULL PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
-               return -ENOTSUP;
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
-
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
+       return test_AES_GMAC_authentication(&gmac_test_case_1);
+}
 
-       return TEST_SUCCESS;
+static int
+test_AES_GMAC_authentication_test_case_2(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_2);
 }
 
+static int
+test_AES_GMAC_authentication_test_case_3(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_3);
+}
 
-#define NULL_BURST_LENGTH (32)
+static int
+test_AES_GMAC_authentication_test_case_4(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_4);
+}
 
 static int
-test_null_burst_operation(void)
+test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       int retval;
+       uint32_t plaintext_pad_len;
+       uint8_t *plaintext;
 
-       unsigned i, burst_len = NULL_BURST_LENGTH;
-
-       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
-       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
+       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
+                             "No GMAC length in the source data");
 
-       /* This test is for NULL PMD only */
-       if (gbl_driver_id != rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
                return -ENOTSUP;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       retval = create_gmac_session(ts_params->valid_devs[0],
+                       tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       if (retval < 0)
+               return retval;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       if (tdata->plaintext.len > MBUF_SIZE)
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+       else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
-                       burst_len, "failed to generate burst of crypto ops");
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
 
-       /* Generate an operation for each mbuf in burst */
-       for (i = 0; i < burst_len; i++) {
-               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
-               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+                       tdata->plaintext.len);
 
-               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
-                               sizeof(unsigned));
-               *data = i;
+       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
+                       tdata);
 
-               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
+       if (retval < 0)
+               return retval;
 
-               burst[i]->sym->m_src = m;
-       }
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       /* Process crypto operation */
-       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
-                       0, burst, burst_len),
-                       burst_len,
-                       "Error enqueuing burst");
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
-                       0, burst_dequeued, burst_len),
-                       burst_len,
-                       "Error dequeuing burst");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-       for (i = 0; i < burst_len; i++) {
-               TEST_ASSERT_EQUAL(
-                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
-                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
-                                       uint32_t *),
-                       "data not as expected");
+       return 0;
 
-               rte_pktmbuf_free(burst[i]->sym->m_src);
-               rte_crypto_op_free(burst[i]);
-       }
+}
 
-       return TEST_SUCCESS;
+static int
+test_AES_GMAC_authentication_verify_test_case_1(void)
+{
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_1);
 }
 
-static void
-generate_gmac_large_plaintext(uint8_t *data)
+static int
+test_AES_GMAC_authentication_verify_test_case_2(void)
 {
-       uint16_t i;
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_2);
+}
 
-       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
-               memcpy(&data[i], &data[0], 32);
+static int
+test_AES_GMAC_authentication_verify_test_case_3(void)
+{
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_3);
 }
 
 static int
-create_gmac_operation(enum rte_crypto_auth_operation op,
-               const struct gmac_test_data *tdata)
+test_AES_GMAC_authentication_verify_test_case_4(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_crypto_sym_op *sym_op;
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_4);
+}
 
-       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+struct test_crypto_vector {
+       enum rte_crypto_cipher_algorithm crypto_algo;
+       unsigned int cipher_offset;
+       unsigned int cipher_len;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       struct {
+               uint8_t data[64];
+               unsigned int len;
+       } cipher_key;
 
-       sym_op = ut_params->op->sym;
+       struct {
+               uint8_t data[64];
+               unsigned int len;
+       } iv;
 
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, tdata->gmac_tag.len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append digest");
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } plaintext;
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, plaintext_pad_len);
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } ciphertext;
 
-       if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
-               rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
-                               tdata->gmac_tag.len);
-               debug_hexdump(stdout, "digest:",
-                               sym_op->auth.digest.data,
-                               tdata->gmac_tag.len);
-       }
+       enum rte_crypto_auth_algorithm auth_algo;
+       unsigned int auth_offset;
 
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                       uint8_t *, IV_OFFSET);
+       struct {
+               uint8_t data[128];
+               unsigned int len;
+       } auth_key;
 
-       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } aad;
 
-       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
+       struct {
+               uint8_t data[128];
+               unsigned int len;
+       } digest;
+};
 
-       sym_op->cipher.data.length = 0;
-       sym_op->cipher.data.offset = 0;
+static const struct test_crypto_vector
+hmac_sha1_test_crypto_vector = {
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0xC4, 0xB7, 0x0E, 0x6B, 0xDE, 0xD1, 0xE7, 0x77,
+                       0x7E, 0x2E, 0x8F, 0xFC, 0x48, 0x39, 0x46, 0x17,
+                       0x3F, 0x91, 0x64, 0x59
+               },
+               .len = 20
+       }
+};
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = tdata->plaintext.len;
+static const struct test_crypto_vector
+aes128_gmac_test_vector = {
+       .auth_algo = RTE_CRYPTO_AUTH_AES_GMAC,
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B
+               },
+               .len = 12
+       },
+       .auth_key = {
+               .data = {
+                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+                       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA
+               },
+               .len = 16
+       },
+       .digest = {
+               .data = {
+                       0xCA, 0x00, 0x99, 0x8B, 0x30, 0x7E, 0x74, 0x56,
+                       0x32, 0xA7, 0x87, 0xB5, 0xE9, 0xB2, 0x34, 0x5A
+               },
+               .len = 16
+       }
+};
 
-       return 0;
+static const struct test_crypto_vector
+aes128cbc_hmac_sha1_test_vector = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 0,
+       .cipher_len = 512,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x9A, 0x4F, 0x88, 0x1B, 0xB6, 0x8F, 0xD8, 0x60,
+                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+                       0x18, 0x8C, 0x1D, 0x32
+               },
+               .len = 20
+       }
+};
+
+static const struct test_crypto_vector
+aes128cbc_hmac_sha1_aad_test_vector = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 8,
+       .cipher_len = 496,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc_aad,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x6D, 0xF3, 0x50, 0x79, 0x7A, 0x2A, 0xAC, 0x7F,
+                       0xA6, 0xF0, 0xC6, 0x38, 0x1F, 0xA4, 0xDD, 0x9B,
+                       0x62, 0x0F, 0xFB, 0x10
+               },
+               .len = 20
+       }
+};
+
+static void
+data_corruption(uint8_t *data)
+{
+       data[0] += 1;
 }
 
-static int create_gmac_session(uint8_t dev_id,
-               const struct gmac_test_data *tdata,
-               enum rte_crypto_auth_operation auth_op)
+static void
+tag_corruption(uint8_t *data, unsigned int tag_offset)
 {
-       uint8_t auth_key[tdata->key.len];
+       data[tag_offset] += 1;
+}
 
+static int
+create_auth_session(struct crypto_unittest_params *ut_params,
+               uint8_t dev_id,
+               const struct test_crypto_vector *reference,
+               enum rte_crypto_auth_operation auth_op)
+{
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-       memcpy(auth_key, tdata->key.data, tdata->key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
+       /* Setup Authentication Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
        ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
-       ut_params->auth_xform.auth.key.length = tdata->key.len;
+       ut_params->auth_xform.next = NULL;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
        ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-       ut_params->auth_xform.auth.iv.length = tdata->iv.len;
-
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
 
+       /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -9672,2790 +10490,1527 @@ static int create_gmac_session(uint8_t dev_id,
 }
 
 static int
-test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
+create_auth_cipher_session(struct crypto_unittest_params *ut_params,
+               uint8_t dev_id,
+               const struct test_crypto_vector *reference,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_cipher_operation cipher_op)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-       int retval;
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
-       uint8_t *auth_tag, *plaintext;
-       uint16_t plaintext_pad_len;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
 
-       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
-                             "No GMAC length in the source data");
+       if (reference->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+               ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+               ut_params->auth_xform.auth.iv.length = reference->iv.len;
+       } else {
+               ut_params->auth_xform.next = &ut_params->cipher_xform;
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+               /* Setup Cipher Parameters */
+               ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+               ut_params->cipher_xform.next = NULL;
+               ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+               ut_params->cipher_xform.cipher.op = cipher_op;
+               ut_params->cipher_xform.cipher.key.data = cipher_key;
+               ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+               ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+               ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+       }
 
-       retval = create_gmac_session(ts_params->valid_devs[0],
-                       tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       if (retval < 0)
-               return retval;
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-       if (tdata->plaintext.len > MBUF_SIZE)
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-       else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       return 0;
+}
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-       /*
-        * Runtime generate the large plain text instead of use hard code
-        * plain text vector. It is done to avoid create huge source file
-        * with the test vector.
-        */
-       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
-               generate_gmac_large_plaintext(tdata->plaintext.data);
+static int
+create_auth_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
+{
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       debug_hexdump(stdout, "plaintext:", plaintext,
-                       tdata->plaintext.len);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata);
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       if (retval < 0)
-               return retval;
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
+
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->plaintext.len);
+
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
+
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
+
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = 0;
+
+       return 0;
+}
+
+static int
+create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
+{
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
+       /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       ut_params->op->sym->m_src = ut_params->ibuf;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
 
-       if (ut_params->op->sym->m_dst) {
-               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, plaintext_pad_len);
-       } else {
-               auth_tag = plaintext + plaintext_pad_len;
-       }
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
 
-       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->ciphertext.len);
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->gmac_tag.data,
-                       tdata->gmac_tag.len,
-                       "GMAC Generated auth tag not as expected");
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
+
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
+
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       reference->iv.data, reference->iv.len);
+
+       sym_op->cipher.data.length = 0;
+       sym_op->cipher.data.offset = 0;
+
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = 0;
 
        return 0;
 }
 
 static int
-test_AES_GMAC_authentication_test_case_1(void)
+create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_1);
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
+
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->ciphertext.len);
+
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
+
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
+
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       reference->iv.data, reference->iv.len);
+
+       sym_op->cipher.data.length = reference->cipher_len;
+       sym_op->cipher.data.offset = reference->cipher_offset;
+
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = reference->auth_offset;
+
+       return 0;
 }
 
 static int
-test_AES_GMAC_authentication_test_case_2(void)
+create_auth_verify_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_2);
+       return create_auth_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_AES_GMAC_authentication_test_case_3(void)
+create_auth_verify_GMAC_operation(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_3);
+       return create_auth_GMAC_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_AES_GMAC_authentication_test_case_4(void)
+create_cipher_auth_verify_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_4);
+       return create_cipher_auth_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
+test_authentication_verify_fail_when_data_corruption(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
        int retval;
-       uint32_t plaintext_pad_len;
-       uint8_t *plaintext;
 
-       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
-                             "No GMAC length in the source data");
+       uint8_t *plaintext;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       cap_idx.algo.auth = reference->auth_algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
-       retval = create_gmac_session(ts_params->valid_devs[0],
-                       tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
-
+       /* Create session */
+       retval = create_auth_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY);
        if (retval < 0)
                return retval;
 
-       if (tdata->plaintext.len > MBUF_SIZE)
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-       else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
 
+       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-
-       /*
-        * Runtime generate the large plain text instead of use hard code
-        * plain text vector. It is done to avoid create huge source file
-        * with the test vector.
-        */
-       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
-               generate_gmac_large_plaintext(tdata->plaintext.data);
-
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
+                       reference->plaintext.len);
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
        debug_hexdump(stdout, "plaintext:", plaintext,
-                       tdata->plaintext.len);
+               reference->plaintext.len);
 
-       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata);
+       /* Create operation */
+       retval = create_auth_verify_operation(ts_params, ut_params, reference);
 
        if (retval < 0)
                return retval;
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       ut_params->op->sym->m_src = ut_params->ibuf;
-
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (data_corrupted)
+               data_corruption(plaintext);
+       else
+               tag_corruption(plaintext, reference->plaintext.len);
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
-
 }
 
 static int
-test_AES_GMAC_authentication_verify_test_case_1(void)
+test_authentication_verify_GMAC_fail_when_corruption(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
 {
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_1);
-}
+       int retval;
+       uint8_t *plaintext;
 
-static int
-test_AES_GMAC_authentication_verify_test_case_2(void)
-{
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_2);
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_AES_GMAC_authentication_verify_test_case_3(void)
-{
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_3);
+       /* Create session */
+       retval = create_auth_cipher_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
+
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
+
+       /* Create operation */
+       retval = create_auth_verify_GMAC_operation(ts_params,
+                       ut_params,
+                       reference);
+
+       if (retval < 0)
+               return retval;
+
+       if (data_corrupted)
+               data_corruption(plaintext);
+       else
+               tag_corruption(plaintext, reference->aad.len);
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
+
+       return 0;
 }
 
 static int
-test_AES_GMAC_authentication_verify_test_case_4(void)
+test_authenticated_decryption_fail_when_corruption(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
 {
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_4);
-}
+       int retval;
 
-struct test_crypto_vector {
-       enum rte_crypto_cipher_algorithm crypto_algo;
-       unsigned int cipher_offset;
-       unsigned int cipher_len;
+       uint8_t *ciphertext;
 
-       struct {
-               uint8_t data[64];
-               unsigned int len;
-       } cipher_key;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       struct {
-               uint8_t data[64];
-               unsigned int len;
-       } iv;
+       /* Create session */
+       retval = create_auth_cipher_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
+       if (retval < 0)
+               return retval;
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } plaintext;
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } ciphertext;
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       enum rte_crypto_auth_algorithm auth_algo;
-       unsigned int auth_offset;
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->ciphertext.len);
+       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
+       memcpy(ciphertext, reference->ciphertext.data,
+                       reference->ciphertext.len);
 
-       struct {
-               uint8_t data[128];
-               unsigned int len;
-       } auth_key;
+       /* Create operation */
+       retval = create_cipher_auth_verify_operation(ts_params,
+                       ut_params,
+                       reference);
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } aad;
+       if (retval < 0)
+               return retval;
 
-       struct {
-               uint8_t data[128];
-               unsigned int len;
-       } digest;
-};
+       if (data_corrupted)
+               data_corruption(ciphertext);
+       else
+               tag_corruption(ciphertext, reference->ciphertext.len);
 
-static const struct test_crypto_vector
-hmac_sha1_test_crypto_vector = {
-       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .auth_key = {
-               .data = {
-                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-                       0xDE, 0xF4, 0xDE, 0xAD
-               },
-               .len = 20
-       },
-       .digest = {
-               .data = {
-                       0xC4, 0xB7, 0x0E, 0x6B, 0xDE, 0xD1, 0xE7, 0x77,
-                       0x7E, 0x2E, 0x8F, 0xFC, 0x48, 0x39, 0x46, 0x17,
-                       0x3F, 0x91, 0x64, 0x59
-               },
-               .len = 20
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
        }
-};
 
-static const struct test_crypto_vector
-aes128_gmac_test_vector = {
-       .auth_algo = RTE_CRYPTO_AUTH_AES_GMAC,
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .iv = {
-               .data = {
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0A, 0x0B
-               },
-               .len = 12
-       },
-       .auth_key = {
-               .data = {
-                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-                       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA
-               },
-               .len = 16
-       },
-       .digest = {
-               .data = {
-                       0xCA, 0x00, 0x99, 0x8B, 0x30, 0x7E, 0x74, 0x56,
-                       0x32, 0xA7, 0x87, 0xB5, 0xE9, 0xB2, 0x34, 0x5A
-               },
-               .len = 16
-       }
-};
-
-static const struct test_crypto_vector
-aes128cbc_hmac_sha1_test_vector = {
-       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
-       .cipher_offset = 0,
-       .cipher_len = 512,
-       .cipher_key = {
-               .data = {
-                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
-                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
-               },
-               .len = 16
-       },
-       .iv = {
-               .data = {
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
-               },
-               .len = 16
-       },
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .ciphertext = {
-               .data = ciphertext512_aes128cbc,
-               .len = 512
-       },
-       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-       .auth_offset = 0,
-       .auth_key = {
-               .data = {
-                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-                       0xDE, 0xF4, 0xDE, 0xAD
-               },
-               .len = 20
-       },
-       .digest = {
-               .data = {
-                       0x9A, 0x4F, 0x88, 0x1B, 0xB6, 0x8F, 0xD8, 0x60,
-                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-                       0x18, 0x8C, 0x1D, 0x32
-               },
-               .len = 20
-       }
-};
-
-static const struct test_crypto_vector
-aes128cbc_hmac_sha1_aad_test_vector = {
-       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
-       .cipher_offset = 12,
-       .cipher_len = 496,
-       .cipher_key = {
-               .data = {
-                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
-                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
-               },
-               .len = 16
-       },
-       .iv = {
-               .data = {
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
-               },
-               .len = 16
-       },
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .ciphertext = {
-               .data = ciphertext512_aes128cbc_aad,
-               .len = 512
-       },
-       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-       .auth_offset = 0,
-       .auth_key = {
-               .data = {
-                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-                       0xDE, 0xF4, 0xDE, 0xAD
-               },
-               .len = 20
-       },
-       .digest = {
-               .data = {
-                       0x1F, 0x6A, 0xD2, 0x8B, 0x4B, 0xB3, 0xC0, 0x9E,
-                       0x86, 0x9B, 0x3A, 0xF2, 0x00, 0x5B, 0x4F, 0x08,
-                       0x62, 0x8D, 0x62, 0x65
-               },
-               .len = 20
-       }
-};
-
-static void
-data_corruption(uint8_t *data)
-{
-       data[0] += 1;
-}
-
-static void
-tag_corruption(uint8_t *data, unsigned int tag_offset)
-{
-       data[tag_offset] += 1;
-}
+       return 0;
+}
 
 static int
-create_auth_session(struct crypto_unittest_params *ut_params,
-               uint8_t dev_id,
-               const struct test_crypto_vector *reference,
-               enum rte_crypto_auth_operation auth_op)
+test_authenticated_encryt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int retval;
+
+       uint8_t *authciphertext, *plaintext, *auth_tag;
+       uint16_t plaintext_pad_len;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
        uint8_t auth_key[reference->auth_key.len + 1];
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create session */
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
        memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
        /* Setup Authentication Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.next = NULL;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
        ut_params->auth_xform.auth.algo = reference->auth_algo;
        ut_params->auth_xform.auth.key.length = reference->auth_key.len;
        ut_params->auth_xform.auth.key.data = auth_key;
        ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = NULL;
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                               &ut_params->auth_xform,
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
+                               &ut_params->cipher_xform,
                                ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       return 0;
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
+
+       /* Create operation */
+       retval = create_cipher_auth_operation(ts_params,
+                       ut_params,
+                       reference, 0);
+
+       if (retval < 0)
+               return retval;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(
+                       ts_params->valid_devs[0], ut_params->op);
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
+       plaintext_pad_len = RTE_ALIGN_CEIL(reference->plaintext.len, 16);
+
+       authciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       ut_params->op->sym->auth.data.offset);
+       auth_tag = authciphertext + plaintext_pad_len;
+       debug_hexdump(stdout, "ciphertext:", authciphertext,
+                       reference->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, reference->digest.len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       authciphertext,
+                       reference->ciphertext.data,
+                       reference->ciphertext.len,
+                       "Ciphertext data not as expected");
+
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       reference->digest.data,
+                       reference->digest.len,
+                       "Generated digest not as expected");
+
+       return TEST_SUCCESS;
+
 }
 
 static int
-create_auth_cipher_session(struct crypto_unittest_params *ut_params,
-               uint8_t dev_id,
-               const struct test_crypto_vector *reference,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_cipher_operation cipher_op)
+test_authenticated_decrypt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int retval;
+
+       uint8_t *ciphertext;
        uint8_t cipher_key[reference->cipher_key.len + 1];
        uint8_t auth_key[reference->auth_key.len + 1];
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create session */
        memcpy(cipher_key, reference->cipher_key.data,
                        reference->cipher_key.len);
        memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
        /* Setup Authentication Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
        ut_params->auth_xform.auth.algo = reference->auth_algo;
        ut_params->auth_xform.auth.key.length = reference->auth_key.len;
        ut_params->auth_xform.auth.key.data = auth_key;
        ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
 
-       if (reference->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
-               ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-               ut_params->auth_xform.auth.iv.length = reference->iv.len;
-       } else {
-               ut_params->auth_xform.next = &ut_params->cipher_xform;
-
-               /* Setup Cipher Parameters */
-               ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-               ut_params->cipher_xform.next = NULL;
-               ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
-               ut_params->cipher_xform.cipher.op = cipher_op;
-               ut_params->cipher_xform.cipher.key.data = cipher_key;
-               ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
-               ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-               ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
-       }
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
                                &ut_params->auth_xform,
                                ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       return 0;
-}
-
-static int
-create_auth_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
-{
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->ciphertext.len);
+       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
+       memcpy(ciphertext, reference->ciphertext.data,
+                       reference->ciphertext.len);
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+       /* Create operation */
+       retval = create_cipher_auth_verify_operation(ts_params,
+                       ut_params,
+                       reference);
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->plaintext.len);
+       if (retval < 0)
+               return retval;
 
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
        else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
+       TEST_ASSERT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing passed");
 
-       sym_op->auth.data.length = reference->plaintext.len;
-       sym_op->auth.data.offset = 0;
+       ut_params->obuf = ut_params->op->sym->m_src;
+       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
 
        return 0;
 }
 
 static int
-create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
+create_aead_operation_SGL(enum rte_crypto_aead_operation op,
+               const struct aead_test_data *tdata,
+               void *digest_mem, uint64_t digest_phys)
 {
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       const unsigned int auth_tag_len = tdata->auth_tag.len;
+       const unsigned int iv_len = tdata->iv.len;
+       unsigned int aad_len = tdata->aad.len;
+       unsigned int aad_len_pad = 0;
+
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
                        RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+               "Failed to allocate symmetric crypto operation struct");
 
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
-
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
-
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->ciphertext.len);
-
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
-       else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
-
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
-
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       reference->iv.data, reference->iv.len);
+       sym_op->aead.digest.data = digest_mem;
 
-       sym_op->cipher.data.length = 0;
-       sym_op->cipher.data.offset = 0;
+       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
+                       "no room to append digest");
 
-       sym_op->auth.data.length = reference->plaintext.len;
-       sym_op->auth.data.offset = 0;
+       sym_op->aead.digest.phys_addr = digest_phys;
 
-       return 0;
-}
+       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
+                               auth_tag_len);
+               debug_hexdump(stdout, "digest:",
+                               sym_op->aead.digest.data,
+                               auth_tag_len);
+       }
 
-static int
-create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
-{
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+       /* Append aad data */
+       if (tdata->algo == RTE_CRYPTO_AEAD_AES_CCM) {
+               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                               uint8_t *, IV_OFFSET);
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+               /* Copy IV 1 byte after the IV pointer, according to the API */
+               rte_memcpy(iv_ptr + 1, tdata->iv.data, iv_len);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+               aad_len = RTE_ALIGN_CEIL(aad_len + 18, 16);
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+                               ut_params->ibuf, aad_len);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to prepend aad");
+               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
+                               ut_params->ibuf);
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
+               memset(sym_op->aead.aad.data, 0, aad_len);
+               /* 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_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+               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,
+                               uint8_t *, IV_OFFSET);
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->ciphertext.len);
+               rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
 
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
-       else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
+               aad_len_pad = RTE_ALIGN_CEIL(aad_len, 16);
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+                               ut_params->ibuf, aad_len_pad);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to prepend aad");
+               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
+                               ut_params->ibuf);
 
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       reference->iv.data, reference->iv.len);
+               memset(sym_op->aead.aad.data, 0, aad_len);
+               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
-       sym_op->cipher.data.length = reference->cipher_len;
-       sym_op->cipher.data.offset = reference->cipher_offset;
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
+                               sym_op->aead.aad.data, aad_len);
+       }
 
-       sym_op->auth.data.length = reference->plaintext.len;
-       sym_op->auth.data.offset = reference->auth_offset;
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_len_pad;
 
        return 0;
 }
 
-static int
-create_auth_verify_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return create_auth_operation(ts_params, ut_params, reference, 0);
-}
-
-static int
-create_auth_verify_GMAC_operation(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return create_auth_GMAC_operation(ts_params, ut_params, reference, 0);
-}
-
-static int
-create_cipher_auth_verify_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return create_cipher_auth_operation(ts_params, ut_params, reference, 0);
-}
+#define SGL_MAX_NO     16
 
 static int
-test_authentication_verify_fail_when_data_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
+test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
+               const int oop, uint32_t fragsz, uint32_t fragsz_oop)
 {
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_mbuf *buf, *buf_oop = NULL, *buf_last_oop = NULL;
        int retval;
-
-       uint8_t *plaintext;
+       int to_trn = 0;
+       int to_trn_tbl[SGL_MAX_NO];
+       int segs = 1;
+       unsigned int trn_data = 0;
+       uint8_t *plaintext, *ciphertext, *auth_tag;
+       struct rte_cryptodev_info dev_info;
 
        /* Verify the capabilities */
        struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = reference->auth_algo;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
-       /* Create session */
-       retval = create_auth_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->plaintext.len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
-       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
-
-       debug_hexdump(stdout, "plaintext:", plaintext,
-               reference->plaintext.len);
+       /* OOP not supported with CPU crypto */
+       if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-       /* Create operation */
-       retval = create_auth_verify_operation(ts_params, ut_params, reference);
+       /* Detailed check for the particular SGL support flag */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       if (!oop) {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               if (sgl_in && (!(dev_info.feature_flags &
+                               RTE_CRYPTODEV_FF_IN_PLACE_SGL)))
+                       return -ENOTSUP;
+       } else {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               unsigned int sgl_out = (fragsz_oop ? fragsz_oop : fragsz) <
+                               tdata->plaintext.len;
+               if (sgl_in && !sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT))
+                               return -ENOTSUP;
+               } else if (!sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT))
+                               return -ENOTSUP;
+               } else if (sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT))
+                               return -ENOTSUP;
+               }
+       }
 
-       if (retval < 0)
-               return retval;
+       if (fragsz > tdata->plaintext.len)
+               fragsz = tdata->plaintext.len;
 
-       if (data_corrupted)
-               data_corruption(plaintext);
-       else
-               tag_corruption(plaintext, reference->plaintext.len);
+       uint16_t plaintext_len = fragsz;
+       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       if (fragsz_oop > tdata->plaintext.len)
+               frag_size_oop = tdata->plaintext.len;
 
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       int ecx = 0;
+       void *digest_mem = NULL;
 
-       return 0;
-}
+       uint32_t prepend_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
 
-static int
-test_authentication_verify_GMAC_fail_when_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
-{
-       int retval;
-       uint8_t *plaintext;
+       if (tdata->plaintext.len % fragsz != 0) {
+               if (tdata->plaintext.len / fragsz + 1 > SGL_MAX_NO)
+                       return 1;
+       }       else {
+               if (tdata->plaintext.len / fragsz > SGL_MAX_NO)
+                       return 1;
+       }
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = reference->auth_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       /*
+        * For out-op-place we need to alloc another mbuf
+        */
+       if (oop) {
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf,
+                               frag_size_oop + prepend_len);
+               buf_oop = ut_params->obuf;
+       }
 
-       /* Create session */
-       retval = create_auth_cipher_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
 
        /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->plaintext.len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
-       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
+                       plaintext_len);
 
-       debug_hexdump(stdout, "plaintext:", plaintext,
-               reference->plaintext.len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create operation */
-       retval = create_auth_verify_GMAC_operation(ts_params,
-                       ut_params,
-                       reference);
+       trn_data += plaintext_len;
 
-       if (retval < 0)
-               return retval;
+       buf = ut_params->ibuf;
 
-       if (data_corrupted)
-               data_corruption(plaintext);
-       else
-               tag_corruption(plaintext, reference->aad.len);
+       /*
+        * Loop until no more fragments
+        */
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       while (trn_data < tdata->plaintext.len) {
+               ++segs;
+               to_trn = (tdata->plaintext.len - trn_data < fragsz) ?
+                               (tdata->plaintext.len - trn_data) : fragsz;
 
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+               to_trn_tbl[ecx++] = to_trn;
 
-       return 0;
-}
+               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               buf = buf->next;
 
-static int
-test_authenticated_decryption_fail_when_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
-{
-       int retval;
+               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(buf));
 
-       uint8_t *ciphertext;
+               /* OOP */
+               if (oop && !fragsz_oop) {
+                       buf_last_oop = buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+               }
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = reference->auth_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = reference->crypto_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
+                               to_trn);
 
-       /* Create session */
-       retval = create_auth_cipher_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
-       if (retval < 0)
-               return retval;
+               memcpy(plaintext, tdata->plaintext.data + trn_data,
+                               to_trn);
+               trn_data += to_trn;
+               if (trn_data  == tdata->plaintext.len) {
+                       if (oop) {
+                               if (!fragsz_oop)
+                                       digest_mem = rte_pktmbuf_append(buf_oop,
+                                               tdata->auth_tag.len);
+                       } else
+                               digest_mem = (uint8_t *)rte_pktmbuf_append(buf,
+                                       tdata->auth_tag.len);
+               }
+       }
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+       uint64_t digest_phys = 0;
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       ut_params->ibuf->nb_segs = segs;
 
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->ciphertext.len);
-       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
-       memcpy(ciphertext, reference->ciphertext.data,
-                       reference->ciphertext.len);
+       segs = 1;
+       if (fragsz_oop && oop) {
+               to_trn = 0;
+               ecx = 0;
 
-       /* Create operation */
-       retval = create_cipher_auth_verify_operation(ts_params,
-                       ut_params,
-                       reference);
+               if (frag_size_oop == tdata->plaintext.len) {
+                       digest_mem = rte_pktmbuf_append(ut_params->obuf,
+                               tdata->auth_tag.len);
 
-       if (retval < 0)
-               return retval;
+                       digest_phys = rte_pktmbuf_iova_offset(
+                                       ut_params->obuf,
+                                       tdata->plaintext.len + prepend_len);
+               }
 
-       if (data_corrupted)
-               data_corruption(ciphertext);
-       else
-               tag_corruption(ciphertext, reference->ciphertext.len);
+               trn_data = frag_size_oop;
+               while (trn_data < tdata->plaintext.len) {
+                       ++segs;
+                       to_trn =
+                               (tdata->plaintext.len - trn_data <
+                                               frag_size_oop) ?
+                               (tdata->plaintext.len - trn_data) :
+                                               frag_size_oop;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+                       to_trn_tbl[ecx++] = to_trn;
 
-       TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+                       buf_last_oop = buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
 
-       return 0;
-}
+                       trn_data += to_trn;
 
-static int
-test_authenticated_encryt_with_esn(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       int retval;
-
-       uint8_t *authciphertext, *plaintext, *auth_tag;
-       uint16_t plaintext_pad_len;
-       uint8_t cipher_key[reference->cipher_key.len + 1];
-       uint8_t auth_key[reference->auth_key.len + 1];
-
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = reference->auth_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = reference->crypto_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+                       if (trn_data  == tdata->plaintext.len) {
+                               digest_mem = rte_pktmbuf_append(buf_oop,
+                                       tdata->auth_tag.len);
+                       }
+               }
 
-       /* Create session */
-       memcpy(cipher_key, reference->cipher_key.data,
-                       reference->cipher_key.len);
-       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+               ut_params->obuf->nb_segs = segs;
+       }
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+       /*
+        * Place digest at the end of the last buffer
+        */
+       if (!digest_phys)
+               digest_phys = rte_pktmbuf_iova(buf) + to_trn;
+       if (oop && buf_last_oop)
+               digest_phys = rte_pktmbuf_iova(buf_last_oop) + to_trn;
 
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       if (!digest_mem && !oop) {
+               digest_mem = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               + tdata->auth_tag.len);
+               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                               tdata->plaintext.len);
+       }
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-       ut_params->auth_xform.auth.algo = reference->auth_algo;
-       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
-       ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.digest_length = reference->digest.len;
-       ut_params->auth_xform.next = NULL;
+       /* Create AEAD operation */
+       retval = create_aead_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata, digest_mem, digest_phys);
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       if (retval < 0)
+               return retval;
 
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+       /* Process crypto operation */
+       if (oop == IN_PLACE &&
+                       gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->plaintext.len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
-       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       /* Create operation */
-       retval = create_cipher_auth_operation(ts_params,
-                       ut_params,
-                       reference, 0);
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
+                       uint8_t *, prepend_len);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
+                               uint8_t *, prepend_len);
+       }
 
-       if (retval < 0)
-               return retval;
+       if (fragsz_oop)
+               fragsz = fragsz_oop;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       fragsz,
+                       "Ciphertext data not as expected");
 
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       buf = ut_params->op->sym->m_src->next;
+       if (oop)
+               buf = ut_params->op->sym->m_dst->next;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       unsigned int off = fragsz;
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(reference->plaintext.len, 16);
+       ecx = 0;
+       while (buf) {
+               ciphertext = rte_pktmbuf_mtod(buf,
+                               uint8_t *);
 
-       authciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       ut_params->op->sym->auth.data.offset);
-       auth_tag = authciphertext + plaintext_pad_len;
-       debug_hexdump(stdout, "ciphertext:", authciphertext,
-                       reference->ciphertext.len);
-       debug_hexdump(stdout, "auth tag:", auth_tag, reference->digest.len);
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                               ciphertext,
+                               tdata->ciphertext.data + off,
+                               to_trn_tbl[ecx],
+                               "Ciphertext data not as expected");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       authciphertext,
-                       reference->ciphertext.data,
-                       reference->ciphertext.len,
-                       "Ciphertext data not as expected");
+               off += to_trn_tbl[ecx++];
+               buf = buf->next;
+       }
 
+       auth_tag = digest_mem;
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
                        auth_tag,
-                       reference->digest.data,
-                       reference->digest.len,
-                       "Generated digest not as expected");
+                       tdata->auth_tag.data,
+                       tdata->auth_tag.len,
+                       "Generated auth tag not as expected");
 
-       return TEST_SUCCESS;
+       return 0;
+}
 
+static int
+test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B(void)
+{
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 400, 400);
 }
 
 static int
-test_authenticated_decrypt_with_esn(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
+test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B(void)
 {
-       int retval;
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 1500, 2000);
+}
 
-       uint8_t *ciphertext;
-       uint8_t cipher_key[reference->cipher_key.len + 1];
-       uint8_t auth_key[reference->auth_key.len + 1];
+static int
+test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg(void)
+{
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_8, OUT_OF_PLACE, 400,
+                       gcm_test_case_8.plaintext.len);
+}
 
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = reference->auth_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = reference->crypto_algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
+static int
+test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
+{
+       /* This test is not for OPENSSL PMD */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)))
                return -ENOTSUP;
 
-       /* Create session */
-       memcpy(cipher_key, reference->cipher_key.data,
-                       reference->cipher_key.len);
-       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
+}
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
-       ut_params->auth_xform.auth.algo = reference->auth_algo;
-       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
-       ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.digest_length = reference->digest.len;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
+static int
+test_authentication_verify_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_fail_when_data_corruption(
+                       ts_params, ut_params, reference, 1);
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+static int
+test_authentication_verify_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_fail_when_data_corruption(
+                       ts_params, ut_params, reference, 0);
+}
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_authentication_verify_GMAC_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_GMAC_fail_when_corruption(
+                       ts_params, ut_params, reference, 1);
+}
 
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->auth_xform,
-                               ts_params->session_priv_mpool);
-
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+static int
+test_authentication_verify_GMAC_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_GMAC_fail_when_corruption(
+                       ts_params, ut_params, reference, 0);
+}
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+static int
+test_authenticated_decryption_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authenticated_decryption_fail_when_corruption(
+                       ts_params, ut_params, reference, 1);
+}
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+static int
+test_authenticated_decryption_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authenticated_decryption_fail_when_corruption(
+                       ts_params, ut_params, reference, 0);
+}
 
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->ciphertext.len);
-       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
-       memcpy(ciphertext, reference->ciphertext.data,
-                       reference->ciphertext.len);
+static int
+authentication_verify_HMAC_SHA1_fail_data_corrupt(void)
+{
+       return test_authentication_verify_fail_when_data_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &hmac_sha1_test_crypto_vector);
+}
 
-       /* Create operation */
-       retval = create_cipher_auth_verify_operation(ts_params,
-                       ut_params,
-                       reference);
+static int
+authentication_verify_HMAC_SHA1_fail_tag_corrupt(void)
+{
+       return test_authentication_verify_fail_when_tag_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &hmac_sha1_test_crypto_vector);
+}
 
-       if (retval < 0)
-               return retval;
+static int
+authentication_verify_AES128_GMAC_fail_data_corrupt(void)
+{
+       return test_authentication_verify_GMAC_fail_when_data_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &aes128_gmac_test_vector);
+}
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+static int
+authentication_verify_AES128_GMAC_fail_tag_corrupt(void)
+{
+       return test_authentication_verify_GMAC_fail_when_tag_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &aes128_gmac_test_vector);
+}
 
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing passed");
+static int
+auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt(void)
+{
+       return test_authenticated_decryption_fail_when_data_corrupted(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_test_vector);
+}
 
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+static int
+auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
+{
+       return test_authenticated_decryption_fail_when_tag_corrupted(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_test_vector);
+}
 
-       return 0;
+static int
+auth_encrypt_AES128CBC_HMAC_SHA1_esn_check(void)
+{
+       return test_authenticated_encryt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
 }
 
 static int
-create_aead_operation_SGL(enum rte_crypto_aead_operation op,
-               const struct aead_test_data *tdata,
-               void *digest_mem, uint64_t digest_phys)
+auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_authenticated_decrypt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
+}
 
-       const unsigned int auth_tag_len = tdata->auth_tag.len;
-       const unsigned int iv_len = tdata->iv.len;
-       unsigned int aad_len = tdata->aad.len;
-       unsigned int aad_len_pad = 0;
+static int
+test_chacha20_poly1305_encrypt_test_case_rfc8439(void)
+{
+       return test_authenticated_encryption(&chacha20_poly1305_case_rfc8439);
+}
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-               "Failed to allocate symmetric crypto operation struct");
+static int
+test_chacha20_poly1305_decrypt_test_case_rfc8439(void)
+{
+       return test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);
+}
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
 
-       sym_op->aead.digest.data = digest_mem;
+/* global AESNI slave IDs for the scheduler test */
+uint8_t aesni_ids[2];
 
-       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
-                       "no room to append digest");
+static int
+test_scheduler_attach_slave_op(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t nb_devs, i, nb_devs_attached = 0;
+       int ret;
+       char vdev_name[32];
 
-       sym_op->aead.digest.phys_addr = digest_phys;
+       /* create 2 AESNI_MB if necessary */
+       nb_devs = rte_cryptodev_device_count_by_driver(
+                       rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
+       if (nb_devs < 2) {
+               for (i = nb_devs; i < 2; i++) {
+                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
+                                       i);
+                       ret = rte_vdev_init(vdev_name, NULL);
 
-       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
-               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
-                               auth_tag_len);
-               debug_hexdump(stdout, "digest:",
-                               sym_op->aead.digest.data,
-                               auth_tag_len);
+                       TEST_ASSERT(ret == 0,
+                               "Failed to create instance %u of"
+                               " pmd : %s",
+                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+               }
        }
 
-       /* Append aad data */
-       if (tdata->algo == RTE_CRYPTO_AEAD_AES_CCM) {
-               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                               uint8_t *, IV_OFFSET);
-
-               /* Copy IV 1 byte after the IV pointer, according to the API */
-               rte_memcpy(iv_ptr + 1, tdata->iv.data, iv_len);
+       /* attach 2 AESNI_MB cdevs */
+       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
+                       i++) {
+               struct rte_cryptodev_info info;
+               unsigned int session_size;
 
-               aad_len = RTE_ALIGN_CEIL(aad_len + 18, 16);
+               rte_cryptodev_info_get(i, &info);
+               if (info.driver_id != rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
+                       continue;
 
-               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-                               ut_params->ibuf, aad_len);
-               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
-                               "no room to prepend aad");
-               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
-                               ut_params->ibuf);
+               session_size = rte_cryptodev_sym_get_private_session_size(i);
+               /*
+                * Create the session mempool again, since now there are new devices
+                * to use the mempool.
+                */
+               if (ts_params->session_mpool) {
+                       rte_mempool_free(ts_params->session_mpool);
+                       ts_params->session_mpool = NULL;
+               }
+               if (ts_params->session_priv_mpool) {
+                       rte_mempool_free(ts_params->session_priv_mpool);
+                       ts_params->session_priv_mpool = NULL;
+               }
 
-               memset(sym_op->aead.aad.data, 0, aad_len);
-               /* Copy AAD 18 bytes after the AAD pointer, according to the API */
-               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+               if (info.sym.max_nb_sessions != 0 &&
+                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+                       RTE_LOG(ERR, USER1,
+                                       "Device does not support "
+                                       "at least %u sessions\n",
+                                       MAX_NB_SESSIONS);
+                       return TEST_FAILED;
+               }
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include the session headers
+                */
+               if (ts_params->session_mpool == NULL) {
+                       ts_params->session_mpool =
+                               rte_cryptodev_sym_session_pool_create(
+                                               "test_sess_mp",
+                                               MAX_NB_SESSIONS, 0, 0, 0,
+                                               SOCKET_ID_ANY);
+                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
+                                       "session mempool allocation failed");
+               }
 
-               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,
-                               uint8_t *, IV_OFFSET);
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include device specific session private data
+                */
+               if (ts_params->session_priv_mpool == NULL) {
+                       ts_params->session_priv_mpool = rte_mempool_create(
+                                       "test_sess_mp_priv",
+                                       MAX_NB_SESSIONS,
+                                       session_size,
+                                       0, 0, NULL, NULL, NULL,
+                                       NULL, SOCKET_ID_ANY,
+                                       0);
 
-               rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
+                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
+                                       "session mempool allocation failed");
+               }
 
-               aad_len_pad = RTE_ALIGN_CEIL(aad_len, 16);
+               ts_params->qp_conf.mp_session = ts_params->session_mpool;
+               ts_params->qp_conf.mp_session_private =
+                               ts_params->session_priv_mpool;
 
-               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-                               ut_params->ibuf, aad_len_pad);
-               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
-                               "no room to prepend aad");
-               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
-                               ut_params->ibuf);
+               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
+                               (uint8_t)i);
 
-               memset(sym_op->aead.aad.data, 0, aad_len);
-               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+               TEST_ASSERT(ret == 0,
+                       "Failed to attach device %u of pmd : %s", i,
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
 
-               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
-               debug_hexdump(stdout, "aad:",
-                               sym_op->aead.aad.data, aad_len);
-       }
+               aesni_ids[nb_devs_attached] = (uint8_t)i;
 
-       sym_op->aead.data.length = tdata->plaintext.len;
-       sym_op->aead.data.offset = aad_len_pad;
+               nb_devs_attached++;
+       }
 
        return 0;
 }
 
-#define SGL_MAX_NO     16
-
 static int
-test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
-               const int oop, uint32_t fragsz, uint32_t fragsz_oop)
+test_scheduler_detach_slave_op(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_mbuf *buf, *buf_oop = NULL, *buf_last_oop = NULL;
-       int retval;
-       int to_trn = 0;
-       int to_trn_tbl[SGL_MAX_NO];
-       int segs = 1;
-       unsigned int trn_data = 0;
-       uint8_t *plaintext, *ciphertext, *auth_tag;
-       struct rte_cryptodev_info dev_info;
-
-       /* Verify the capabilities */
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
-       cap_idx.algo.aead = tdata->algo;
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t i;
+       int ret;
 
-       /* Detailed check for the particular SGL support flag */
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!oop) {
-               unsigned int sgl_in = fragsz < tdata->plaintext.len;
-               if (sgl_in && (!(dev_info.feature_flags &
-                               RTE_CRYPTODEV_FF_IN_PLACE_SGL)))
-                       return -ENOTSUP;
-       } else {
-               unsigned int sgl_in = fragsz < tdata->plaintext.len;
-               unsigned int sgl_out = (fragsz_oop ? fragsz_oop : fragsz) <
-                               tdata->plaintext.len;
-               if (sgl_in && !sgl_out) {
-                       if (!(dev_info.feature_flags &
-                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT))
-                               return -ENOTSUP;
-               } else if (!sgl_in && sgl_out) {
-                       if (!(dev_info.feature_flags &
-                                       RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT))
-                               return -ENOTSUP;
-               } else if (sgl_in && sgl_out) {
-                       if (!(dev_info.feature_flags &
-                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT))
-                               return -ENOTSUP;
-               }
+       for (i = 0; i < 2; i++) {
+               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
+                               aesni_ids[i]);
+               TEST_ASSERT(ret == 0,
+                       "Failed to detach device %u", aesni_ids[i]);
        }
 
-       if (fragsz > tdata->plaintext.len)
-               fragsz = tdata->plaintext.len;
+       return 0;
+}
 
-       uint16_t plaintext_len = fragsz;
-       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
+static int
+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];
+       /* set mode */
+       return rte_cryptodev_scheduler_mode_set(sched_id,
+               scheduler_mode);
+}
 
-       if (fragsz_oop > tdata->plaintext.len)
-               frag_size_oop = tdata->plaintext.len;
+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;
 
-       int ecx = 0;
-       void *digest_mem = NULL;
+}
 
-       uint32_t prepend_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
+static int
+test_scheduler_mode_multicore_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
+                       0, "Failed to set multicore mode");
 
-       if (tdata->plaintext.len % fragsz != 0) {
-               if (tdata->plaintext.len / fragsz + 1 > SGL_MAX_NO)
-                       return 1;
-       }       else {
-               if (tdata->plaintext.len / fragsz > SGL_MAX_NO)
-                       return 1;
-       }
+       return 0;
+}
 
-       /*
-        * For out-op-place we need to alloc another mbuf
-        */
-       if (oop) {
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               rte_pktmbuf_append(ut_params->obuf,
-                               frag_size_oop + prepend_len);
-               buf_oop = ut_params->obuf;
-       }
+static int
+test_scheduler_mode_failover_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
+                       0, "Failed to set failover mode");
 
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       return 0;
+}
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+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");
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       return 0;
+}
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       plaintext_len);
+static struct unit_test_suite cryptodev_scheduler_testsuite  = {
+       .suite_name = "Crypto Device Scheduler Unit Test Suite",
+       .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_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               /* Round Robin */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-       trn_data += plaintext_len;
+               /* 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_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-       buf = ut_params->ibuf;
+               /* 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_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-       /*
-        * Loop until no more fragments
-        */
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-       while (trn_data < tdata->plaintext.len) {
-               ++segs;
-               to_trn = (tdata->plaintext.len - trn_data < fragsz) ?
-                               (tdata->plaintext.len - trn_data) : fragsz;
+#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
 
-               to_trn_tbl[ecx++] = to_trn;
+static struct unit_test_suite cryptodev_testsuite  = {
+       .suite_name = "Crypto Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_queue_pair_descriptor_setup),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_queue_pair_ids),
 
-               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               buf = buf->next;
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_multi_session),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_multi_session_random_usage),
 
-               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
-                               rte_pktmbuf_tailroom(buf));
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_invalid_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
 
-               /* OOP */
-               if (oop && !fragsz_oop) {
-                       buf_last_oop = buf_oop->next =
-                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
-               }
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
 
-               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
-                               to_trn);
+               /** AES CCM Authenticated Encryption 128 bits key */
+               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_encryption_test_case_128_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
 
-               memcpy(plaintext, tdata->plaintext.data + trn_data,
-                               to_trn);
-               trn_data += to_trn;
-               if (trn_data  == tdata->plaintext.len) {
-                       if (oop) {
-                               if (!fragsz_oop)
-                                       digest_mem = rte_pktmbuf_append(buf_oop,
-                                               tdata->auth_tag.len);
-                       } else
-                               digest_mem = (uint8_t *)rte_pktmbuf_append(buf,
-                                       tdata->auth_tag.len);
-               }
-       }
-
-       uint64_t digest_phys = 0;
-
-       ut_params->ibuf->nb_segs = segs;
-
-       segs = 1;
-       if (fragsz_oop && oop) {
-               to_trn = 0;
-               ecx = 0;
-
-               if (frag_size_oop == tdata->plaintext.len) {
-                       digest_mem = rte_pktmbuf_append(ut_params->obuf,
-                               tdata->auth_tag.len);
-
-                       digest_phys = rte_pktmbuf_iova_offset(
-                                       ut_params->obuf,
-                                       tdata->plaintext.len + prepend_len);
-               }
-
-               trn_data = frag_size_oop;
-               while (trn_data < tdata->plaintext.len) {
-                       ++segs;
-                       to_trn =
-                               (tdata->plaintext.len - trn_data <
-                                               frag_size_oop) ?
-                               (tdata->plaintext.len - trn_data) :
-                                               frag_size_oop;
-
-                       to_trn_tbl[ecx++] = to_trn;
-
-                       buf_last_oop = buf_oop->next =
-                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
-
-                       trn_data += to_trn;
-
-                       if (trn_data  == tdata->plaintext.len) {
-                               digest_mem = rte_pktmbuf_append(buf_oop,
-                                       tdata->auth_tag.len);
-                       }
-               }
-
-               ut_params->obuf->nb_segs = segs;
-       }
-
-       /*
-        * Place digest at the end of the last buffer
-        */
-       if (!digest_phys)
-               digest_phys = rte_pktmbuf_iova(buf) + to_trn;
-       if (oop && buf_last_oop)
-               digest_phys = rte_pktmbuf_iova(buf_last_oop) + to_trn;
-
-       if (!digest_mem && !oop) {
-               digest_mem = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               + tdata->auth_tag.len);
-               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                               tdata->plaintext.len);
-       }
-
-       /* Create AEAD operation */
-       retval = create_aead_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata, digest_mem, digest_phys);
-
-       if (retval < 0)
-               return retval;
-
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       ut_params->op->sym->m_src = ut_params->ibuf;
-       if (oop)
-               ut_params->op->sym->m_dst = ut_params->obuf;
-
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
-
-
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
-                       uint8_t *, prepend_len);
-       if (oop) {
-               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, prepend_len);
-       }
-
-       if (fragsz_oop)
-               fragsz = fragsz_oop;
-
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       fragsz,
-                       "Ciphertext data not as expected");
-
-       buf = ut_params->op->sym->m_src->next;
-       if (oop)
-               buf = ut_params->op->sym->m_dst->next;
-
-       unsigned int off = fragsz;
-
-       ecx = 0;
-       while (buf) {
-               ciphertext = rte_pktmbuf_mtod(buf,
-                               uint8_t *);
-
-               TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                               ciphertext,
-                               tdata->ciphertext.data + off,
-                               to_trn_tbl[ecx],
-                               "Ciphertext data not as expected");
-
-               off += to_trn_tbl[ecx++];
-               buf = buf->next;
-       }
-
-       auth_tag = digest_mem;
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->auth_tag.data,
-                       tdata->auth_tag.len,
-                       "Generated auth tag not as expected");
-
-       return 0;
-}
-
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 400, 400);
-}
-
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 1500, 2000);
-}
-
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_8, OUT_OF_PLACE, 400,
-                       gcm_test_case_8.plaintext.len);
-}
-
-static int
-test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
-{
-       /* This test is not for OPENSSL PMD */
-       if (gbl_driver_id == rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)))
-               return -ENOTSUP;
-
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
-}
-
-static int
-test_authentication_verify_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authentication_verify_fail_when_data_corruption(
-                       ts_params, ut_params, reference, 1);
-}
-
-static int
-test_authentication_verify_fail_when_tag_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authentication_verify_fail_when_data_corruption(
-                       ts_params, ut_params, reference, 0);
-}
-
-static int
-test_authentication_verify_GMAC_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authentication_verify_GMAC_fail_when_corruption(
-                       ts_params, ut_params, reference, 1);
-}
-
-static int
-test_authentication_verify_GMAC_fail_when_tag_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authentication_verify_GMAC_fail_when_corruption(
-                       ts_params, ut_params, reference, 0);
-}
-
-static int
-test_authenticated_decryption_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authenticated_decryption_fail_when_corruption(
-                       ts_params, ut_params, reference, 1);
-}
-
-static int
-test_authenticated_decryption_fail_when_tag_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authenticated_decryption_fail_when_corruption(
-                       ts_params, ut_params, reference, 0);
-}
-
-static int
-authentication_verify_HMAC_SHA1_fail_data_corrupt(void)
-{
-       return test_authentication_verify_fail_when_data_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &hmac_sha1_test_crypto_vector);
-}
-
-static int
-authentication_verify_HMAC_SHA1_fail_tag_corrupt(void)
-{
-       return test_authentication_verify_fail_when_tag_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &hmac_sha1_test_crypto_vector);
-}
-
-static int
-authentication_verify_AES128_GMAC_fail_data_corrupt(void)
-{
-       return test_authentication_verify_GMAC_fail_when_data_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &aes128_gmac_test_vector);
-}
-
-static int
-authentication_verify_AES128_GMAC_fail_tag_corrupt(void)
-{
-       return test_authentication_verify_GMAC_fail_when_tag_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &aes128_gmac_test_vector);
-}
-
-static int
-auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt(void)
-{
-       return test_authenticated_decryption_fail_when_data_corrupted(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_test_vector);
-}
-
-static int
-auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
-{
-       return test_authenticated_decryption_fail_when_tag_corrupted(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_test_vector);
-}
-
-static int
-auth_encrypt_AES128CBC_HMAC_SHA1_esn_check(void)
-{
-       return test_authenticated_encryt_with_esn(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_aad_test_vector);
-}
-
-static int
-auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
-{
-       return test_authenticated_decrypt_with_esn(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_aad_test_vector);
-}
-
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-
-/* global AESNI slave IDs for the scheduler test */
-uint8_t aesni_ids[2];
-
-static int
-test_scheduler_attach_slave_op(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t nb_devs, i, nb_devs_attached = 0;
-       int ret;
-       char vdev_name[32];
-
-       /* create 2 AESNI_MB if necessary */
-       nb_devs = rte_cryptodev_device_count_by_driver(
-                       rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
-       if (nb_devs < 2) {
-               for (i = nb_devs; i < 2; i++) {
-                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
-                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
-                                       i);
-                       ret = rte_vdev_init(vdev_name, NULL);
-
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance %u of"
-                               " pmd : %s",
-                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-               }
-       }
-
-       /* attach 2 AESNI_MB cdevs */
-       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
-                       i++) {
-               struct rte_cryptodev_info info;
-               unsigned int session_size;
-
-               rte_cryptodev_info_get(i, &info);
-               if (info.driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
-                       continue;
-
-               session_size = rte_cryptodev_sym_get_private_session_size(i);
-               /*
-                * Create the session mempool again, since now there are new devices
-                * to use the mempool.
-                */
-               if (ts_params->session_mpool) {
-                       rte_mempool_free(ts_params->session_mpool);
-                       ts_params->session_mpool = NULL;
-               }
-               if (ts_params->session_priv_mpool) {
-                       rte_mempool_free(ts_params->session_priv_mpool);
-                       ts_params->session_priv_mpool = NULL;
-               }
-
-               if (info.sym.max_nb_sessions != 0 &&
-                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
-                       RTE_LOG(ERR, USER1,
-                                       "Device does not support "
-                                       "at least %u sessions\n",
-                                       MAX_NB_SESSIONS);
-                       return TEST_FAILED;
-               }
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include the session headers
-                */
-               if (ts_params->session_mpool == NULL) {
-                       ts_params->session_mpool =
-                               rte_cryptodev_sym_session_pool_create(
-                                               "test_sess_mp",
-                                               MAX_NB_SESSIONS, 0, 0, 0,
-                                               SOCKET_ID_ANY);
-                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
-                                       "session mempool allocation failed");
-               }
-
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include device specific session private data
-                */
-               if (ts_params->session_priv_mpool == NULL) {
-                       ts_params->session_priv_mpool = rte_mempool_create(
-                                       "test_sess_mp_priv",
-                                       MAX_NB_SESSIONS,
-                                       session_size,
-                                       0, 0, NULL, NULL, NULL,
-                                       NULL, SOCKET_ID_ANY,
-                                       0);
-
-                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
-                                       "session mempool allocation failed");
-               }
-
-               ts_params->qp_conf.mp_session = ts_params->session_mpool;
-               ts_params->qp_conf.mp_session_private =
-                               ts_params->session_priv_mpool;
-
-               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
-                               (uint8_t)i);
-
-               TEST_ASSERT(ret == 0,
-                       "Failed to attach device %u of pmd : %s", i,
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-
-               aesni_ids[nb_devs_attached] = (uint8_t)i;
-
-               nb_devs_attached++;
-       }
-
-       return 0;
-}
-
-static int
-test_scheduler_detach_slave_op(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t i;
-       int ret;
-
-       for (i = 0; i < 2; i++) {
-               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
-                               aesni_ids[i]);
-               TEST_ASSERT(ret == 0,
-                       "Failed to detach device %u", aesni_ids[i]);
-       }
-
-       return 0;
-}
-
-static int
-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];
-       /* 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;
-}
-
-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;
-}
-
-static struct unit_test_suite cryptodev_scheduler_testsuite  = {
-       .suite_name = "Crypto Device Scheduler Unit Test Suite",
-       .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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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_roundrobin_op),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
-
-static struct unit_test_suite cryptodev_testsuite  = {
-       .suite_name = "Crypto Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_queue_pair_ids),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_queue_pair_descriptor_setup),
-
-               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_null_invalid_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
-
-               /** AES CCM Authenticated Encryption 128 bits key */
-               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_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
-
-               /** AES CCM Authenticated Decryption 128 bits key*/
-               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_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
-
-               /** AES CCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_3),
-
-               /** AES CCM Authenticated Decryption 192 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_3),
-
-               /** AES CCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_3),
-
-               /** AES CCM Authenticated Decryption 256 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_3),
-
-               /** AES GCM Authenticated Encryption */
-               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_1500B_2000B),
-               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_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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_8),
-
-               /** 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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_8),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** AES GCM Authenticated Encryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
-
-               /** AES GCM Authenticated Decryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** Session-less tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
-
-               /** 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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
-
-               /** 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_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_offset_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** SNOW 3G generate auth, then encrypt (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt (UEA2), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_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_decryption_with_digest_test_case_1),
-               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),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
-               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),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_with_digest_test_case_1),
-
-               /** 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_encryption_test_case_6_sgl),
-
-               /** ZUC authenticate (EIA3) */
-               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_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
-
-               /** ZUC alg-chain (EEA3/EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_2),
-
-               /** ZUC generate auth, then encrypt (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop_sgl),
-
-               /** ZUC decrypt (EEA3), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
-
-               /** HMAC_MD5 Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_2),
-
-               /** 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),
-
-               /** 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_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               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),
-
-               /** 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_decryption_test_case_1_oop),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
-
-               /** KASUMI generate auth, then encrypt (F8) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
-
-               /** KASUMI decrypt (F8), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
-
-               /** ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               /** 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,
-                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_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),
-
-               /** Mixed CIPHER + HASH algorithms */
-               /** AUTH AES CMAC + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                  test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
-
-               /** AUTH ZUC + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_snow_test_case_1),
-               /** AUTH AES CMAC + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
-               /** AUTH ZUC + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
-               /** AUTH SNOW3G + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
-               /** AUTH SNOW3G + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_zuc_test_case_1),
-               /** AUTH AES CMAC + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
-
-               /** AUTH NULL + CIPHER SNOW3G */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_snow_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_snow_test_case_1),
-               /** AUTH NULL + CIPHER ZUC */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_zuc_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_zuc_test_case_1),
-               /** AUTH SNOW3G + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_snow_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_snow_cipher_null_test_case_1),
-               /** AUTH ZUC + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_zuc_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_zuc_cipher_null_test_case_1),
-               /** AUTH NULL + CIPHER AES CTR */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_null_cipher_aes_ctr_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
-               /** AUTH AES CMAC + CIPHER NULL */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_auth_aes_cmac_cipher_null_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-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_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
-       .suite_name = "Crypto CAAM JR Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
-               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_1500B_2000B),
-               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_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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_8),
-
-               /** 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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_8),
-
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
-
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** 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_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** 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),
-
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+               /** AES CCM Authenticated Decryption 128 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_AES_CCM_authenticated_decryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_AES_CCM_authenticated_decryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_AES_CCM_authenticated_decryption_test_case_128_3),
 
-               /* ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
+               /** AES CCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
-       .suite_name = "Crypto DPAA2_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_device_configure_invalid_dev_id),
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
 
-#ifdef RTE_LIBRTE_SECURITY
+               /** AES CCM Authenticated Decryption 192 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
-
+                       test_AES_CCM_authenticated_decryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
+                       test_AES_CCM_authenticated_decryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
+                       test_AES_CCM_authenticated_decryption_test_case_192_3),
 
+               /** AES CCM Authenticated Encryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
-
+                       test_AES_CCM_authenticated_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
+                       test_AES_CCM_authenticated_encryption_test_case_256_3),
+
+               /** AES CCM Authenticated Decryption 256 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
+                       test_AES_CCM_authenticated_decryption_test_case_256_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_256_3),
+
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
@@ -12481,6 +12036,8 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_encryption_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_encryption_test_case_1),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12499,6 +12056,8 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_decryption_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_decryption_test_case_1),
 
                /** AES GCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12564,246 +12123,30 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
-
-               /** 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_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
-
-               /** 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),
-
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
-
-               /** HMAC_MD5 Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_2),
-
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
-               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),
-
-               /* ESN Testcase */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_armv8_testsuite  = {
-       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-
-               /** Negative tests */
-               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 struct unit_test_suite cryptodev_mrvl_testsuite  = {
-       .suite_name = "Crypto Device Marvell Component 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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_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 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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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 struct unit_test_suite cryptodev_octeontx_testsuite  = {
-       .suite_name = "Crypto Device OCTEONTX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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),
+               /** AES GCM Authenticated Encryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
+               /** AES GCM Authenticated Decryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
+
+               /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
+
+               /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GMAC_authentication_test_case_1),
@@ -12817,7 +12160,15 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        test_AES_GMAC_authentication_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GMAC_authentication_verify_test_case_3),
-
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_4),
+               /** Chacha20-Poly1305 */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_chacha20_poly1305_encrypt_test_case_rfc8439),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_chacha20_poly1305_decrypt_test_case_rfc8439),
                /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_encryption_test_case_1),
@@ -12832,10 +12183,52 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
 
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_offset_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_decryption_test_case_1_oop),
+
+               /** SNOW 3G generate auth, then encrypt (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
+                       test_snow3g_auth_cipher_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_2_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_3_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
+
+               /** SNOW 3G decrypt (UEA2), then verify auth */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
 
                /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12848,19 +12241,38 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        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_decryption_with_digest_test_case_1),
                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),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
                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),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_cipher_auth_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_with_digest_test_case_1),
 
                /** ZUC encrypt only (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12873,6 +12285,10 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        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_encryption_test_case_6_sgl),
+
+               /** ZUC authenticate (EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12884,39 +12300,47 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                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_zuc_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_zuc_hash_generate_test_case_7),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_zuc_hash_generate_test_case_8),
+
+               /** ZUC alg-chain (EEA3/EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_zuc_cipher_auth_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_zuc_cipher_auth_test_case_2),
+
+               /** ZUC generate auth, then encrypt (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       test_zuc_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       test_zuc_auth_cipher_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_zuc_auth_cipher_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_zuc_auth_cipher_test_case_1_oop_sgl),
+
+               /** ZUC decrypt (EEA3), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_zuc_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_zuc_auth_cipher_verify_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_zuc_auth_cipher_verify_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
 
+               /** HMAC_MD5 Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
+                       test_MD5_HMAC_generate_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+                       test_MD5_HMAC_verify_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_generate_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_verify_case_2),
 
                /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12931,6 +12355,7 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                        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,
@@ -12942,237 +12367,261 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                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 */
+               /** KASUMI encrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_encryption_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       test_kasumi_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_nitrox_testsuite  = {
-       .suite_name = "Crypto NITROX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
+                       test_kasumi_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_queue_pair_ids),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-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_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+                       test_kasumi_encryption_test_case_5),
 
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
+               /** KASUMI decrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
+                       test_kasumi_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
+                       test_kasumi_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
+                       test_kasumi_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
+                       test_kasumi_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       test_kasumi_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       test_kasumi_decryption_test_case_1_oop),
 
-               /** 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_kasumi_cipher_auth_test_case_1),
+
+               /** KASUMI generate auth, then encrypt (F8) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
+                       test_kasumi_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
+                       test_kasumi_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
+                       test_kasumi_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               /** AES GMAC Authentication */
+                       test_kasumi_auth_cipher_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
+
+               /** KASUMI decrypt (F8), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                       test_kasumi_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
 
-               /** 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),
+               /** ESN Testcase */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
+                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
+                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
 
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
-
-               /** SNOW 3G decrypt only (UEA2) */
+                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
+                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
+                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
+                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
+                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-
+                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
+                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-
-               /** ZUC encrypt only (EEA3) */
+                       authentication_verify_AES128_GMAC_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
+                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               /** Mixed CIPHER + HASH algorithms */
+               /** AUTH AES CMAC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
+                  test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
 
-               /** KASUMI encrypt only (UEA1) */
+               /** AUTH ZUC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_auth_zuc_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_verify_auth_zuc_cipher_snow_test_case_1),
+               /** AUTH AES CMAC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_auth_aes_cmac_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
+               /** AUTH ZUC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       test_auth_zuc_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_auth_snow_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_auth_snow_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_verify_auth_snow_cipher_zuc_test_case_1),
+               /** AUTH AES CMAC + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_auth_aes_cmac_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
 
+               /** AUTH NULL + CIPHER SNOW3G */
                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_auth_null_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
+                       test_verify_auth_null_cipher_snow_test_case_1),
+               /** AUTH NULL + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
+                       test_auth_null_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
+                       test_verify_auth_null_cipher_zuc_test_case_1),
+               /** AUTH SNOW3G + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
+                       test_auth_snow_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
+                       test_verify_auth_snow_cipher_null_test_case_1),
+               /** AUTH ZUC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
+                       test_auth_zuc_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
+                       test_verify_auth_zuc_cipher_null_test_case_1),
+               /** AUTH NULL + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
+                       test_auth_null_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
+                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
+               /** AUTH AES CMAC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
+                       test_auth_aes_cmac_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
+
+#ifdef RTE_LIBRTE_SECURITY
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_PDCP_PROTO_all),
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_DOCSIS_PROTO_all),
+#endif
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-               /** NULL tests */
+static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
+       .suite_name = "Crypto CAAM JR Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_multi_session),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_armv8_testsuite  = {
+       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_mrvl_testsuite  = {
+       .suite_name = "Crypto Device Marvell Component 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_null_auth_cipher_operation),
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
 
                /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -13180,13 +12629,54 @@ static struct unit_test_suite cryptodev_octeontx2_testsuite  = {
                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),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_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 struct unit_test_suite cryptodev_nitrox_testsuite  = {
+       .suite_name = "Crypto NITROX Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_queue_pair_ids),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -13239,6 +12729,29 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
+static int
+test_cryptodev_cpu_aesni_mb(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+       if (gbl_driver_id == -1) {
+               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_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
+}
+
 static int
 test_cryptodev_openssl(void)
 {
@@ -13271,6 +12784,29 @@ test_cryptodev_aesni_gcm(void)
        return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
+static int
+test_cryptodev_cpu_aesni_gcm(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
+
+       if (gbl_driver_id == -1) {
+               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_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
+}
+
 static int
 test_cryptodev_null(void)
 {
@@ -13408,7 +12944,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13424,7 +12960,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13455,7 +12991,7 @@ test_cryptodev_octeontx(void)
                                "testsuite.\n");
                return TEST_FAILED;
        }
-       return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13470,7 +13006,7 @@ test_cryptodev_octeontx2(void)
                                "testsuite.\n");
                return TEST_FAILED;
        }
-       return unit_test_suite_runner(&cryptodev_octeontx2_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -13507,8 +13043,12 @@ test_cryptodev_nitrox(void)
 
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
+       test_cryptodev_cpu_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
 REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
+       test_cryptodev_cpu_aesni_gcm);
 REGISTER_TEST_COMMAND(cryptodev_null_autotest, test_cryptodev_null);
 REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);