cryptodev: add enqueue and dequeue callbacks
[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.c
index a07904f..40f55a3 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2017 Intel Corporation
+ * Copyright(c) 2015-2020 Intel Corporation
  */
 
 #include <sys/types.h>
 #include "rte_crypto.h"
 #include "rte_cryptodev.h"
 #include "rte_cryptodev_pmd.h"
+#include "rte_cryptodev_trace.h"
 
 static uint8_t nb_drivers;
 
-struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS];
+static struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS];
 
-struct rte_cryptodev *rte_cryptodevs = &rte_crypto_devices[0];
+struct rte_cryptodev *rte_cryptodevs = rte_crypto_devices;
 
 static struct rte_cryptodev_global cryptodev_globals = {
-               .devs                   = &rte_crypto_devices[0],
+               .devs                   = rte_crypto_devices,
                .data                   = { NULL },
-               .nb_devs                = 0,
-               .max_devs               = RTE_CRYPTO_MAX_DEVS
+               .nb_devs                = 0
 };
 
-struct rte_cryptodev_global *rte_cryptodev_globals = &cryptodev_globals;
-
 /* spinlock for crypto device callbacks */
 static rte_spinlock_t rte_cryptodev_cb_lock = RTE_SPINLOCK_INITIALIZER;
 
-
 /**
  * The user application callback description.
  *
@@ -154,6 +151,7 @@ const char *
 rte_crypto_aead_algorithm_strings[] = {
        [RTE_CRYPTO_AEAD_AES_CCM]       = "aes-ccm",
        [RTE_CRYPTO_AEAD_AES_GCM]       = "aes-gcm",
+       [RTE_CRYPTO_AEAD_CHACHA20_POLY1305] = "chacha20-poly1305"
 };
 
 /**
@@ -166,6 +164,43 @@ rte_crypto_aead_operation_strings[] = {
        [RTE_CRYPTO_AEAD_OP_DECRYPT]    = "decrypt"
 };
 
+/**
+ * Asymmetric crypto transform operation strings identifiers.
+ */
+const char *rte_crypto_asym_xform_strings[] = {
+       [RTE_CRYPTO_ASYM_XFORM_NONE]    = "none",
+       [RTE_CRYPTO_ASYM_XFORM_RSA]     = "rsa",
+       [RTE_CRYPTO_ASYM_XFORM_MODEX]   = "modexp",
+       [RTE_CRYPTO_ASYM_XFORM_MODINV]  = "modinv",
+       [RTE_CRYPTO_ASYM_XFORM_DH]      = "dh",
+       [RTE_CRYPTO_ASYM_XFORM_DSA]     = "dsa",
+       [RTE_CRYPTO_ASYM_XFORM_ECDSA]   = "ecdsa",
+       [RTE_CRYPTO_ASYM_XFORM_ECPM]    = "ecpm",
+};
+
+/**
+ * Asymmetric crypto operation strings identifiers.
+ */
+const char *rte_crypto_asym_op_strings[] = {
+       [RTE_CRYPTO_ASYM_OP_ENCRYPT]    = "encrypt",
+       [RTE_CRYPTO_ASYM_OP_DECRYPT]    = "decrypt",
+       [RTE_CRYPTO_ASYM_OP_SIGN]       = "sign",
+       [RTE_CRYPTO_ASYM_OP_VERIFY]     = "verify",
+       [RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE]       = "priv_key_generate",
+       [RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE] = "pub_key_generate",
+       [RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE] = "sharedsecret_compute",
+};
+
+/**
+ * The private data structure stored in the session mempool private data.
+ */
+struct rte_cryptodev_sym_session_pool_private_data {
+       uint16_t nb_drivers;
+       /**< number of elements in sess_data array */
+       uint16_t user_data_sz;
+       /**< session user data will be placed after sess_data */
+};
+
 int
 rte_cryptodev_get_cipher_algo_enum(enum rte_crypto_cipher_algorithm *algo_enum,
                const char *algo_string)
@@ -217,6 +252,24 @@ rte_cryptodev_get_aead_algo_enum(enum rte_crypto_aead_algorithm *algo_enum,
        return -1;
 }
 
+int
+rte_cryptodev_asym_get_xform_enum(enum rte_crypto_asym_xform_type *xform_enum,
+               const char *xform_string)
+{
+       unsigned int i;
+
+       for (i = 1; i < RTE_DIM(rte_crypto_asym_xform_strings); i++) {
+               if (strcmp(xform_string,
+                       rte_crypto_asym_xform_strings[i]) == 0) {
+                       *xform_enum = (enum rte_crypto_asym_xform_type) i;
+                       return 0;
+               }
+       }
+
+       /* Invalid string */
+       return -1;
+}
+
 /**
  * The crypto auth operation strings identifiers.
  * It could be used in application command line.
@@ -259,7 +312,6 @@ rte_cryptodev_sym_capability_get(uint8_t dev_id,
        }
 
        return NULL;
-
 }
 
 static int
@@ -287,6 +339,28 @@ param_range_check(uint16_t size, const struct rte_crypto_param_range *range)
        return -1;
 }
 
+const struct rte_cryptodev_asymmetric_xform_capability *
+rte_cryptodev_asym_capability_get(uint8_t dev_id,
+               const struct rte_cryptodev_asym_capability_idx *idx)
+{
+       const struct rte_cryptodev_capabilities *capability;
+       struct rte_cryptodev_info dev_info;
+       unsigned int i = 0;
+
+       memset(&dev_info, 0, sizeof(struct rte_cryptodev_info));
+       rte_cryptodev_info_get(dev_id, &dev_info);
+
+       while ((capability = &dev_info.capabilities[i++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (capability->op != RTE_CRYPTO_OP_TYPE_ASYMMETRIC)
+                       continue;
+
+               if (capability->asym.xform_capa.xform_type == idx->type)
+                       return &capability->asym.xform_capa;
+       }
+       return NULL;
+};
+
 int
 rte_cryptodev_sym_capability_check_cipher(
                const struct rte_cryptodev_symmetric_capability *capability,
@@ -338,6 +412,158 @@ rte_cryptodev_sym_capability_check_aead(
 
        return 0;
 }
+int
+rte_cryptodev_asym_xform_capability_check_optype(
+       const struct rte_cryptodev_asymmetric_xform_capability *capability,
+       enum rte_crypto_asym_op_type op_type)
+{
+       if (capability->op_types & (1 << op_type))
+               return 1;
+
+       return 0;
+}
+
+int
+rte_cryptodev_asym_xform_capability_check_modlen(
+       const struct rte_cryptodev_asymmetric_xform_capability *capability,
+       uint16_t modlen)
+{
+       /* no need to check for limits, if min or max = 0 */
+       if (capability->modlen.min != 0) {
+               if (modlen < capability->modlen.min)
+                       return -1;
+       }
+
+       if (capability->modlen.max != 0) {
+               if (modlen > capability->modlen.max)
+                       return -1;
+       }
+
+       /* in any case, check if given modlen is module increment */
+       if (capability->modlen.increment != 0) {
+               if (modlen % (capability->modlen.increment))
+                       return -1;
+       }
+
+       return 0;
+}
+
+/* spinlock for crypto device enq callbacks */
+static rte_spinlock_t rte_cryptodev_callback_lock = RTE_SPINLOCK_INITIALIZER;
+
+static void
+cryptodev_cb_cleanup(struct rte_cryptodev *dev)
+{
+       struct rte_cryptodev_cb_rcu *list;
+       struct rte_cryptodev_cb *cb, *next;
+       uint16_t qp_id;
+
+       if (dev->enq_cbs == NULL && dev->deq_cbs == NULL)
+               return;
+
+       for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+               list = &dev->enq_cbs[qp_id];
+               cb = list->next;
+               while (cb != NULL) {
+                       next = cb->next;
+                       rte_free(cb);
+                       cb = next;
+               }
+
+               rte_free(list->qsbr);
+       }
+
+       for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+               list = &dev->deq_cbs[qp_id];
+               cb = list->next;
+               while (cb != NULL) {
+                       next = cb->next;
+                       rte_free(cb);
+                       cb = next;
+               }
+
+               rte_free(list->qsbr);
+       }
+
+       rte_free(dev->enq_cbs);
+       dev->enq_cbs = NULL;
+       rte_free(dev->deq_cbs);
+       dev->deq_cbs = NULL;
+}
+
+static int
+cryptodev_cb_init(struct rte_cryptodev *dev)
+{
+       struct rte_cryptodev_cb_rcu *list;
+       struct rte_rcu_qsbr *qsbr;
+       uint16_t qp_id;
+       size_t size;
+
+       /* Max thread set to 1, as one DP thread accessing a queue-pair */
+       const uint32_t max_threads = 1;
+
+       dev->enq_cbs = rte_zmalloc(NULL,
+                                  sizeof(struct rte_cryptodev_cb_rcu) *
+                                  dev->data->nb_queue_pairs, 0);
+       if (dev->enq_cbs == NULL) {
+               CDEV_LOG_ERR("Failed to allocate memory for enq callbacks");
+               return -ENOMEM;
+       }
+
+       dev->deq_cbs = rte_zmalloc(NULL,
+                                  sizeof(struct rte_cryptodev_cb_rcu) *
+                                  dev->data->nb_queue_pairs, 0);
+       if (dev->deq_cbs == NULL) {
+               CDEV_LOG_ERR("Failed to allocate memory for deq callbacks");
+               rte_free(dev->enq_cbs);
+               return -ENOMEM;
+       }
+
+       /* Create RCU QSBR variable */
+       size = rte_rcu_qsbr_get_memsize(max_threads);
+
+       for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+               list = &dev->enq_cbs[qp_id];
+               qsbr = rte_zmalloc(NULL, size, RTE_CACHE_LINE_SIZE);
+               if (qsbr == NULL) {
+                       CDEV_LOG_ERR("Failed to allocate memory for RCU on "
+                               "queue_pair_id=%d", qp_id);
+                       goto cb_init_err;
+               }
+
+               if (rte_rcu_qsbr_init(qsbr, max_threads)) {
+                       CDEV_LOG_ERR("Failed to initialize for RCU on "
+                               "queue_pair_id=%d", qp_id);
+                       goto cb_init_err;
+               }
+
+               list->qsbr = qsbr;
+       }
+
+       for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+               list = &dev->deq_cbs[qp_id];
+               qsbr = rte_zmalloc(NULL, size, RTE_CACHE_LINE_SIZE);
+               if (qsbr == NULL) {
+                       CDEV_LOG_ERR("Failed to allocate memory for RCU on "
+                               "queue_pair_id=%d", qp_id);
+                       goto cb_init_err;
+               }
+
+               if (rte_rcu_qsbr_init(qsbr, max_threads)) {
+                       CDEV_LOG_ERR("Failed to initialize for RCU on "
+                               "queue_pair_id=%d", qp_id);
+                       goto cb_init_err;
+               }
+
+               list->qsbr = qsbr;
+       }
+
+       return 0;
+
+cb_init_err:
+       cryptodev_cb_cleanup(dev);
+       return -ENOMEM;
+}
 
 const char *
 rte_cryptodev_get_feature_name(uint64_t flag)
@@ -361,14 +587,36 @@ rte_cryptodev_get_feature_name(uint64_t flag)
                return "CPU_AESNI";
        case RTE_CRYPTODEV_FF_HW_ACCELERATED:
                return "HW_ACCELERATED";
-       case RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER:
-               return "MBUF_SCATTER_GATHER";
+       case RTE_CRYPTODEV_FF_IN_PLACE_SGL:
+               return "IN_PLACE_SGL";
+       case RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT:
+               return "OOP_SGL_IN_SGL_OUT";
+       case RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT:
+               return "OOP_SGL_IN_LB_OUT";
+       case RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT:
+               return "OOP_LB_IN_SGL_OUT";
+       case RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT:
+               return "OOP_LB_IN_LB_OUT";
        case RTE_CRYPTODEV_FF_CPU_NEON:
                return "CPU_NEON";
        case RTE_CRYPTODEV_FF_CPU_ARM_CE:
                return "CPU_ARM_CE";
        case RTE_CRYPTODEV_FF_SECURITY:
                return "SECURITY_PROTOCOL";
+       case RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_EXP:
+               return "RSA_PRIV_OP_KEY_EXP";
+       case RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT:
+               return "RSA_PRIV_OP_KEY_QT";
+       case RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED:
+               return "DIGEST_ENCRYPTED";
+       case RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO:
+               return "SYM_CPU_CRYPTO";
+       case RTE_CRYPTODEV_FF_ASYM_SESSIONLESS:
+               return "ASYM_SESSIONLESS";
+       case RTE_CRYPTODEV_FF_SYM_SESSIONLESS:
+               return "SYM_SESSIONLESS";
+       case RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA:
+               return "NON_BYTE_ALIGNED_DATA";
        default:
                return NULL;
        }
@@ -377,7 +625,7 @@ rte_cryptodev_get_feature_name(uint64_t flag)
 struct rte_cryptodev *
 rte_cryptodev_pmd_get_dev(uint8_t dev_id)
 {
-       return &rte_cryptodev_globals->devs[dev_id];
+       return &cryptodev_globals.devs[dev_id];
 }
 
 struct rte_cryptodev *
@@ -389,8 +637,8 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
        if (name == NULL)
                return NULL;
 
-       for (i = 0; i < rte_cryptodev_globals->max_devs; i++) {
-               dev = &rte_cryptodev_globals->devs[i];
+       for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++) {
+               dev = &cryptodev_globals.devs[i];
 
                if ((dev->attached == RTE_CRYPTODEV_ATTACHED) &&
                                (strcmp(dev->data->name, name) == 0))
@@ -400,12 +648,22 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
        return NULL;
 }
 
+static inline uint8_t
+rte_cryptodev_is_valid_device_data(uint8_t dev_id)
+{
+       if (dev_id >= RTE_CRYPTO_MAX_DEVS ||
+                       rte_crypto_devices[dev_id].data == NULL)
+               return 0;
+
+       return 1;
+}
+
 unsigned int
 rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
 {
        struct rte_cryptodev *dev = NULL;
 
-       if (dev_id >= rte_cryptodev_globals->nb_devs)
+       if (!rte_cryptodev_is_valid_device_data(dev_id))
                return 0;
 
        dev = rte_cryptodev_pmd_get_dev(dev_id);
@@ -424,12 +682,15 @@ rte_cryptodev_get_dev_id(const char *name)
        if (name == NULL)
                return -1;
 
-       for (i = 0; i < rte_cryptodev_globals->nb_devs; i++)
-               if ((strcmp(rte_cryptodev_globals->devs[i].data->name, name)
+       for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++) {
+               if (!rte_cryptodev_is_valid_device_data(i))
+                       continue;
+               if ((strcmp(cryptodev_globals.devs[i].data->name, name)
                                == 0) &&
-                               (rte_cryptodev_globals->devs[i].attached ==
+                               (cryptodev_globals.devs[i].attached ==
                                                RTE_CRYPTODEV_ATTACHED))
                        return i;
+       }
 
        return -1;
 }
@@ -437,7 +698,7 @@ rte_cryptodev_get_dev_id(const char *name)
 uint8_t
 rte_cryptodev_count(void)
 {
-       return rte_cryptodev_globals->nb_devs;
+       return cryptodev_globals.nb_devs;
 }
 
 uint8_t
@@ -445,9 +706,9 @@ rte_cryptodev_device_count_by_driver(uint8_t driver_id)
 {
        uint8_t i, dev_count = 0;
 
-       for (i = 0; i < rte_cryptodev_globals->max_devs; i++)
-               if (rte_cryptodev_globals->devs[i].driver_id == driver_id &&
-                       rte_cryptodev_globals->devs[i].attached ==
+       for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++)
+               if (cryptodev_globals.devs[i].driver_id == driver_id &&
+                       cryptodev_globals.devs[i].attached ==
                                        RTE_CRYPTODEV_ATTACHED)
                        dev_count++;
 
@@ -459,17 +720,18 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
        uint8_t nb_devices)
 {
        uint8_t i, count = 0;
-       struct rte_cryptodev *devs = rte_cryptodev_globals->devs;
-       uint8_t max_devs = rte_cryptodev_globals->max_devs;
+       struct rte_cryptodev *devs = cryptodev_globals.devs;
 
-       for (i = 0; i < max_devs && count < nb_devices; i++) {
+       for (i = 0; i < RTE_CRYPTO_MAX_DEVS && count < nb_devices; i++) {
+               if (!rte_cryptodev_is_valid_device_data(i))
+                       continue;
 
                if (devs[i].attached == RTE_CRYPTODEV_ATTACHED) {
                        int cmp;
 
                        cmp = strncmp(devs[i].device->driver->name,
                                        driver_name,
-                                       strlen(driver_name));
+                                       strlen(driver_name) + 1);
 
                        if (cmp == 0)
                                devices[count++] = devs[i].data->dev_id;
@@ -482,8 +744,9 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
 void *
 rte_cryptodev_get_sec_ctx(uint8_t dev_id)
 {
-       if (rte_crypto_devices[dev_id].feature_flags &
-                       RTE_CRYPTODEV_FF_SECURITY)
+       if (dev_id < RTE_CRYPTO_MAX_DEVS &&
+                       (rte_crypto_devices[dev_id].feature_flags &
+                       RTE_CRYPTODEV_FF_SECURITY))
                return rte_crypto_devices[dev_id].security_ctx;
 
        return NULL;
@@ -506,7 +769,7 @@ static inline int
 rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data,
                int socket_id)
 {
-       char mz_name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
        int n;
 
@@ -519,8 +782,13 @@ rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data,
                mz = rte_memzone_reserve(mz_name,
                                sizeof(struct rte_cryptodev_data),
                                socket_id, 0);
-       } else
+               CDEV_LOG_DEBUG("PRIMARY:reserved memzone for %s (%p)",
+                               mz_name, mz);
+       } else {
                mz = rte_memzone_lookup(mz_name);
+               CDEV_LOG_DEBUG("SECONDARY:looked up memzone for %s (%p)",
+                               mz_name, mz);
+       }
 
        if (mz == NULL)
                return -ENOMEM;
@@ -532,6 +800,37 @@ rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data,
        return 0;
 }
 
+static inline int
+rte_cryptodev_data_free(uint8_t dev_id, struct rte_cryptodev_data **data)
+{
+       char mz_name[RTE_MEMZONE_NAMESIZE];
+       const struct rte_memzone *mz;
+       int n;
+
+       /* generate memzone name */
+       n = snprintf(mz_name, sizeof(mz_name), "rte_cryptodev_data_%u", dev_id);
+       if (n >= (int)sizeof(mz_name))
+               return -EINVAL;
+
+       mz = rte_memzone_lookup(mz_name);
+       if (mz == NULL)
+               return -ENOMEM;
+
+       RTE_ASSERT(*data == mz->addr);
+       *data = NULL;
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               CDEV_LOG_DEBUG("PRIMARY:free memzone of %s (%p)",
+                               mz_name, mz);
+               return rte_memzone_free(mz);
+       } else {
+               CDEV_LOG_DEBUG("SECONDARY:don't free memzone of %s (%p)",
+                               mz_name, mz);
+       }
+
+       return 0;
+}
+
 static uint8_t
 rte_cryptodev_find_free_device_index(void)
 {
@@ -566,23 +865,32 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id)
        cryptodev = rte_cryptodev_pmd_get_dev(dev_id);
 
        if (cryptodev->data == NULL) {
-               struct rte_cryptodev_data *cryptodev_data =
-                               cryptodev_globals.data[dev_id];
+               struct rte_cryptodev_data **cryptodev_data =
+                               &cryptodev_globals.data[dev_id];
 
-               int retval = rte_cryptodev_data_alloc(dev_id, &cryptodev_data,
+               int retval = rte_cryptodev_data_alloc(dev_id, cryptodev_data,
                                socket_id);
 
-               if (retval < 0 || cryptodev_data == NULL)
+               if (retval < 0 || *cryptodev_data == NULL)
                        return NULL;
 
-               cryptodev->data = cryptodev_data;
+               cryptodev->data = *cryptodev_data;
+
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       strlcpy(cryptodev->data->name, name,
+                               RTE_CRYPTODEV_NAME_MAX_LEN);
 
-               snprintf(cryptodev->data->name, RTE_CRYPTODEV_NAME_MAX_LEN,
-                               "%s", name);
+                       cryptodev->data->dev_id = dev_id;
+                       cryptodev->data->socket_id = socket_id;
+                       cryptodev->data->dev_started = 0;
+                       CDEV_LOG_DEBUG("PRIMARY:init data");
+               }
 
-               cryptodev->data->dev_id = dev_id;
-               cryptodev->data->socket_id = socket_id;
-               cryptodev->data->dev_started = 0;
+               CDEV_LOG_DEBUG("Data for %s: dev_id %d, socket %d, started %d",
+                               cryptodev->data->name,
+                               cryptodev->data->dev_id,
+                               cryptodev->data->socket_id,
+                               cryptodev->data->dev_started);
 
                /* init user callbacks */
                TAILQ_INIT(&(cryptodev->link_intr_cbs));
@@ -599,17 +907,24 @@ int
 rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev)
 {
        int ret;
+       uint8_t dev_id;
 
        if (cryptodev == NULL)
                return -EINVAL;
 
+       dev_id = cryptodev->data->dev_id;
+
        /* Close device only if device operations have been set */
        if (cryptodev->dev_ops) {
-               ret = rte_cryptodev_close(cryptodev->data->dev_id);
+               ret = rte_cryptodev_close(dev_id);
                if (ret < 0)
                        return ret;
        }
 
+       ret = rte_cryptodev_data_free(dev_id, &cryptodev_globals.data[dev_id]);
+       if (ret < 0)
+               return ret;
+
        cryptodev->attached = RTE_CRYPTODEV_DETACHED;
        cryptodev_globals.nb_devs--;
        return 0;
@@ -620,6 +935,11 @@ rte_cryptodev_queue_pair_count(uint8_t dev_id)
 {
        struct rte_cryptodev *dev;
 
+       if (!rte_cryptodev_is_valid_device_data(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return 0;
+       }
+
        dev = &rte_crypto_devices[dev_id];
        return dev->data->nb_queue_pairs;
 }
@@ -723,6 +1043,10 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
 
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
+       cryptodev_cb_cleanup(dev);
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
+
        /* Setup new number of queue pairs and reconfigure device. */
        diag = rte_cryptodev_queue_pairs_config(dev, config->nb_queue_pairs,
                        config->socket_id);
@@ -732,10 +1056,18 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
                return diag;
        }
 
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
+       diag = cryptodev_cb_init(dev);
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
+       if (diag) {
+               CDEV_LOG_ERR("Callback init failed for dev_id=%d", dev_id);
+               return diag;
+       }
+
+       rte_cryptodev_trace_configure(dev_id, config);
        return (*dev->dev_ops->dev_configure)(dev, config);
 }
 
-
 int
 rte_cryptodev_start(uint8_t dev_id)
 {
@@ -760,6 +1092,7 @@ rte_cryptodev_start(uint8_t dev_id)
        }
 
        diag = (*dev->dev_ops->dev_start)(dev);
+       rte_cryptodev_trace_start(dev_id, diag);
        if (diag == 0)
                dev->data->dev_started = 1;
        else
@@ -789,6 +1122,7 @@ rte_cryptodev_stop(uint8_t dev_id)
        }
 
        (*dev->dev_ops->dev_stop)(dev);
+       rte_cryptodev_trace_stop(dev_id);
        dev->data->dev_started = 0;
 }
 
@@ -825,6 +1159,7 @@ rte_cryptodev_close(uint8_t dev_id)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_close, -ENOTSUP);
        retval = (*dev->dev_ops->dev_close)(dev);
+       rte_cryptodev_trace_close(dev_id, retval);
 
        if (retval < 0)
                return retval;
@@ -833,10 +1168,7 @@ rte_cryptodev_close(uint8_t dev_id)
 }
 
 int
-rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
-               const struct rte_cryptodev_qp_conf *qp_conf, int socket_id,
-               struct rte_mempool *session_pool)
-
+rte_cryptodev_get_qp_status(uint8_t dev_id, uint16_t queue_pair_id)
 {
        struct rte_cryptodev *dev;
 
@@ -850,113 +1182,448 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
                CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
                return -EINVAL;
        }
+       void **qps = dev->data->queue_pairs;
 
-       if (dev->data->dev_started) {
-               CDEV_LOG_ERR(
-                   "device %d must be stopped to allow configuration", dev_id);
-               return -EBUSY;
+       if (qps[queue_pair_id]) {
+               CDEV_LOG_DEBUG("qp %d on dev %d is initialised",
+                       queue_pair_id, dev_id);
+               return 1;
        }
 
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_setup, -ENOTSUP);
+       CDEV_LOG_DEBUG("qp %d on dev %d is not initialised",
+               queue_pair_id, dev_id);
 
-       return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf,
-                       socket_id, session_pool);
+       return 0;
 }
 
-
 int
-rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats)
+rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
+               const struct rte_cryptodev_qp_conf *qp_conf, int socket_id)
+
 {
        struct rte_cryptodev *dev;
 
        if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return -ENODEV;
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return -EINVAL;
        }
 
-       if (stats == NULL) {
-               CDEV_LOG_ERR("Invalid stats ptr");
+       dev = &rte_crypto_devices[dev_id];
+       if (queue_pair_id >= dev->data->nb_queue_pairs) {
+               CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
                return -EINVAL;
        }
 
-       dev = &rte_crypto_devices[dev_id];
-       memset(stats, 0, sizeof(*stats));
+       if (!qp_conf) {
+               CDEV_LOG_ERR("qp_conf cannot be NULL\n");
+               return -EINVAL;
+       }
 
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP);
-       (*dev->dev_ops->stats_get)(dev, stats);
-       return 0;
-}
+       if ((qp_conf->mp_session && !qp_conf->mp_session_private) ||
+                       (!qp_conf->mp_session && qp_conf->mp_session_private)) {
+               CDEV_LOG_ERR("Invalid mempools\n");
+               return -EINVAL;
+       }
 
-void
-rte_cryptodev_stats_reset(uint8_t dev_id)
-{
-       struct rte_cryptodev *dev;
+       if (qp_conf->mp_session) {
+               struct rte_cryptodev_sym_session_pool_private_data *pool_priv;
+               uint32_t obj_size = qp_conf->mp_session->elt_size;
+               uint32_t obj_priv_size = qp_conf->mp_session_private->elt_size;
+               struct rte_cryptodev_sym_session s = {0};
+
+               pool_priv = rte_mempool_get_priv(qp_conf->mp_session);
+               if (!pool_priv || qp_conf->mp_session->private_data_size <
+                               sizeof(*pool_priv)) {
+                       CDEV_LOG_ERR("Invalid mempool\n");
+                       return -EINVAL;
+               }
 
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
-               return;
+               s.nb_drivers = pool_priv->nb_drivers;
+               s.user_data_sz = pool_priv->user_data_sz;
+
+               if ((rte_cryptodev_sym_get_existing_header_session_size(&s) >
+                       obj_size) || (s.nb_drivers <= dev->driver_id) ||
+                       rte_cryptodev_sym_get_private_session_size(dev_id) >
+                               obj_priv_size) {
+                       CDEV_LOG_ERR("Invalid mempool\n");
+                       return -EINVAL;
+               }
        }
 
-       dev = &rte_crypto_devices[dev_id];
+       if (dev->data->dev_started) {
+               CDEV_LOG_ERR(
+                   "device %d must be stopped to allow configuration", dev_id);
+               return -EBUSY;
+       }
 
-       RTE_FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
-       (*dev->dev_ops->stats_reset)(dev);
-}
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_setup, -ENOTSUP);
 
+       rte_cryptodev_trace_queue_pair_setup(dev_id, queue_pair_id, qp_conf);
+       return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf,
+                       socket_id);
+}
 
-void
-rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
+struct rte_cryptodev_cb *
+rte_cryptodev_add_enq_callback(uint8_t dev_id,
+                              uint16_t qp_id,
+                              rte_cryptodev_callback_fn cb_fn,
+                              void *cb_arg)
 {
        struct rte_cryptodev *dev;
+       struct rte_cryptodev_cb_rcu *list;
+       struct rte_cryptodev_cb *cb, *tail;
 
-       if (dev_id >= cryptodev_globals.nb_devs) {
+       if (!cb_fn) {
+               CDEV_LOG_ERR("Callback is NULL on dev_id=%d", dev_id);
+               rte_errno = EINVAL;
+               return NULL;
+       }
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
                CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return;
+               rte_errno = ENODEV;
+               return NULL;
        }
 
        dev = &rte_crypto_devices[dev_id];
+       if (qp_id >= dev->data->nb_queue_pairs) {
+               CDEV_LOG_ERR("Invalid queue_pair_id=%d", qp_id);
+               rte_errno = ENODEV;
+               return NULL;
+       }
 
-       memset(dev_info, 0, sizeof(struct rte_cryptodev_info));
+       cb = rte_zmalloc(NULL, sizeof(*cb), 0);
+       if (cb == NULL) {
+               CDEV_LOG_ERR("Failed to allocate memory for callback on "
+                            "dev=%d, queue_pair_id=%d", dev_id, qp_id);
+               rte_errno = ENOMEM;
+               return NULL;
+       }
 
-       RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
-       (*dev->dev_ops->dev_infos_get)(dev, dev_info);
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
 
-       dev_info->driver_name = dev->device->driver->name;
-       dev_info->device = dev->device;
-}
+       cb->fn = cb_fn;
+       cb->arg = cb_arg;
+
+       /* Add the callbacks in fifo order. */
+       list = &dev->enq_cbs[qp_id];
+       tail = list->next;
+
+       if (tail) {
+               while (tail->next)
+                       tail = tail->next;
+               /* Stores to cb->fn and cb->param should complete before
+                * cb is visible to data plane.
+                */
+               __atomic_store_n(&tail->next, cb, __ATOMIC_RELEASE);
+       } else {
+               /* Stores to cb->fn and cb->param should complete before
+                * cb is visible to data plane.
+                */
+               __atomic_store_n(&list->next, cb, __ATOMIC_RELEASE);
+       }
+
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
 
+       return cb;
+}
 
 int
-rte_cryptodev_callback_register(uint8_t dev_id,
-                       enum rte_cryptodev_event_type event,
-                       rte_cryptodev_cb_fn cb_fn, void *cb_arg)
+rte_cryptodev_remove_enq_callback(uint8_t dev_id,
+                                 uint16_t qp_id,
+                                 struct rte_cryptodev_cb *cb)
 {
        struct rte_cryptodev *dev;
-       struct rte_cryptodev_callback *user_cb;
+       struct rte_cryptodev_cb **prev_cb, *curr_cb;
+       struct rte_cryptodev_cb_rcu *list;
+       int ret;
 
-       if (!cb_fn)
+       ret = -EINVAL;
+
+       if (!cb) {
+               CDEV_LOG_ERR("Callback is NULL");
                return -EINVAL;
+       }
 
        if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
-               return -EINVAL;
+               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               return -ENODEV;
        }
 
        dev = &rte_crypto_devices[dev_id];
-       rte_spinlock_lock(&rte_cryptodev_cb_lock);
+       if (qp_id >= dev->data->nb_queue_pairs) {
+               CDEV_LOG_ERR("Invalid queue_pair_id=%d", qp_id);
+               return -ENODEV;
+       }
 
-       TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) {
-               if (user_cb->cb_fn == cb_fn &&
-                       user_cb->cb_arg == cb_arg &&
-                       user_cb->event == event) {
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
+       if (dev->enq_cbs == NULL) {
+               CDEV_LOG_ERR("Callback not initialized");
+               goto cb_err;
+       }
+
+       list = &dev->enq_cbs[qp_id];
+       if (list == NULL) {
+               CDEV_LOG_ERR("Callback list is NULL");
+               goto cb_err;
+       }
+
+       if (list->qsbr == NULL) {
+               CDEV_LOG_ERR("Rcu qsbr is NULL");
+               goto cb_err;
+       }
+
+       prev_cb = &list->next;
+       for (; *prev_cb != NULL; prev_cb = &curr_cb->next) {
+               curr_cb = *prev_cb;
+               if (curr_cb == cb) {
+                       /* Remove the user cb from the callback list. */
+                       __atomic_store_n(prev_cb, curr_cb->next,
+                               __ATOMIC_RELAXED);
+                       ret = 0;
                        break;
                }
        }
 
-       /* create a new callback. */
-       if (user_cb == NULL) {
-               user_cb = rte_zmalloc("INTR_USER_CALLBACK",
-                               sizeof(struct rte_cryptodev_callback), 0);
+       if (!ret) {
+               /* Call sync with invalid thread id as this is part of
+                * control plane API
+                */
+               rte_rcu_qsbr_synchronize(list->qsbr, RTE_QSBR_THRID_INVALID);
+               rte_free(cb);
+       }
+
+cb_err:
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
+       return ret;
+}
+
+struct rte_cryptodev_cb *
+rte_cryptodev_add_deq_callback(uint8_t dev_id,
+                              uint16_t qp_id,
+                              rte_cryptodev_callback_fn cb_fn,
+                              void *cb_arg)
+{
+       struct rte_cryptodev *dev;
+       struct rte_cryptodev_cb_rcu *list;
+       struct rte_cryptodev_cb *cb, *tail;
+
+       if (!cb_fn) {
+               CDEV_LOG_ERR("Callback is NULL on dev_id=%d", dev_id);
+               rte_errno = EINVAL;
+               return NULL;
+       }
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               rte_errno = ENODEV;
+               return NULL;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+       if (qp_id >= dev->data->nb_queue_pairs) {
+               CDEV_LOG_ERR("Invalid queue_pair_id=%d", qp_id);
+               rte_errno = ENODEV;
+               return NULL;
+       }
+
+       cb = rte_zmalloc(NULL, sizeof(*cb), 0);
+       if (cb == NULL) {
+               CDEV_LOG_ERR("Failed to allocate memory for callback on "
+                            "dev=%d, queue_pair_id=%d", dev_id, qp_id);
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
+
+       cb->fn = cb_fn;
+       cb->arg = cb_arg;
+
+       /* Add the callbacks in fifo order. */
+       list = &dev->deq_cbs[qp_id];
+       tail = list->next;
+
+       if (tail) {
+               while (tail->next)
+                       tail = tail->next;
+               /* Stores to cb->fn and cb->param should complete before
+                * cb is visible to data plane.
+                */
+               __atomic_store_n(&tail->next, cb, __ATOMIC_RELEASE);
+       } else {
+               /* Stores to cb->fn and cb->param should complete before
+                * cb is visible to data plane.
+                */
+               __atomic_store_n(&list->next, cb, __ATOMIC_RELEASE);
+       }
+
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
+
+       return cb;
+}
+
+int
+rte_cryptodev_remove_deq_callback(uint8_t dev_id,
+                                 uint16_t qp_id,
+                                 struct rte_cryptodev_cb *cb)
+{
+       struct rte_cryptodev *dev;
+       struct rte_cryptodev_cb **prev_cb, *curr_cb;
+       struct rte_cryptodev_cb_rcu *list;
+       int ret;
+
+       ret = -EINVAL;
+
+       if (!cb) {
+               CDEV_LOG_ERR("Callback is NULL");
+               return -EINVAL;
+       }
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+       if (qp_id >= dev->data->nb_queue_pairs) {
+               CDEV_LOG_ERR("Invalid queue_pair_id=%d", qp_id);
+               return -ENODEV;
+       }
+
+       rte_spinlock_lock(&rte_cryptodev_callback_lock);
+       if (dev->enq_cbs == NULL) {
+               CDEV_LOG_ERR("Callback not initialized");
+               goto cb_err;
+       }
+
+       list = &dev->deq_cbs[qp_id];
+       if (list == NULL) {
+               CDEV_LOG_ERR("Callback list is NULL");
+               goto cb_err;
+       }
+
+       if (list->qsbr == NULL) {
+               CDEV_LOG_ERR("Rcu qsbr is NULL");
+               goto cb_err;
+       }
+
+       prev_cb = &list->next;
+       for (; *prev_cb != NULL; prev_cb = &curr_cb->next) {
+               curr_cb = *prev_cb;
+               if (curr_cb == cb) {
+                       /* Remove the user cb from the callback list. */
+                       __atomic_store_n(prev_cb, curr_cb->next,
+                               __ATOMIC_RELAXED);
+                       ret = 0;
+                       break;
+               }
+       }
+
+       if (!ret) {
+               /* Call sync with invalid thread id as this is part of
+                * control plane API
+                */
+               rte_rcu_qsbr_synchronize(list->qsbr, RTE_QSBR_THRID_INVALID);
+               rte_free(cb);
+       }
+
+cb_err:
+       rte_spinlock_unlock(&rte_cryptodev_callback_lock);
+       return ret;
+}
+
+int
+rte_cryptodev_stats_get(uint8_t dev_id, struct rte_cryptodev_stats *stats)
+{
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               return -ENODEV;
+       }
+
+       if (stats == NULL) {
+               CDEV_LOG_ERR("Invalid stats ptr");
+               return -EINVAL;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+       memset(stats, 0, sizeof(*stats));
+
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP);
+       (*dev->dev_ops->stats_get)(dev, stats);
+       return 0;
+}
+
+void
+rte_cryptodev_stats_reset(uint8_t dev_id)
+{
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+
+       RTE_FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
+       (*dev->dev_ops->stats_reset)(dev);
+}
+
+void
+rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
+{
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               return;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+
+       memset(dev_info, 0, sizeof(struct rte_cryptodev_info));
+
+       RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
+       (*dev->dev_ops->dev_infos_get)(dev, dev_info);
+
+       dev_info->driver_name = dev->device->driver->name;
+       dev_info->device = dev->device;
+}
+
+int
+rte_cryptodev_callback_register(uint8_t dev_id,
+                       enum rte_cryptodev_event_type event,
+                       rte_cryptodev_cb_fn cb_fn, void *cb_arg)
+{
+       struct rte_cryptodev *dev;
+       struct rte_cryptodev_callback *user_cb;
+
+       if (!cb_fn)
+               return -EINVAL;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return -EINVAL;
+       }
+
+       dev = &rte_crypto_devices[dev_id];
+       rte_spinlock_lock(&rte_cryptodev_cb_lock);
+
+       TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) {
+               if (user_cb->cb_fn == cb_fn &&
+                       user_cb->cb_arg == cb_arg &&
+                       user_cb->event == event) {
+                       break;
+               }
+       }
+
+       /* create a new callback. */
+       if (user_cb == NULL) {
+               user_cb = rte_zmalloc("INTR_USER_CALLBACK",
+                               sizeof(struct rte_cryptodev_callback), 0);
                if (user_cb != NULL) {
                        user_cb->cb_fn = cb_fn;
                        user_cb->cb_arg = cb_arg;
@@ -1037,7 +1704,6 @@ rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev,
        rte_spinlock_unlock(&rte_cryptodev_cb_lock);
 }
 
-
 int
 rte_cryptodev_sym_session_init(uint8_t dev_id,
                struct rte_cryptodev_sym_session *sess,
@@ -1045,9 +1711,61 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
                struct rte_mempool *mp)
 {
        struct rte_cryptodev *dev;
+       uint32_t sess_priv_sz = rte_cryptodev_sym_get_private_session_size(
+                       dev_id);
        uint8_t index;
        int ret;
 
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return -EINVAL;
+       }
+
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (sess == NULL || xforms == NULL || dev == NULL || mp == NULL)
+               return -EINVAL;
+
+       if (mp->elt_size < sess_priv_sz)
+               return -EINVAL;
+
+       index = dev->driver_id;
+       if (index >= sess->nb_drivers)
+               return -EINVAL;
+
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP);
+
+       if (sess->sess_data[index].refcnt == 0) {
+               ret = dev->dev_ops->sym_session_configure(dev, xforms,
+                                                       sess, mp);
+               if (ret < 0) {
+                       CDEV_LOG_ERR(
+                               "dev_id %d failed to configure session details",
+                               dev_id);
+                       return ret;
+               }
+       }
+
+       rte_cryptodev_trace_sym_session_init(dev_id, sess, xforms, mp);
+       sess->sess_data[index].refcnt++;
+       return 0;
+}
+
+int
+rte_cryptodev_asym_session_init(uint8_t dev_id,
+               struct rte_cryptodev_asym_session *sess,
+               struct rte_crypto_asym_xform *xforms,
+               struct rte_mempool *mp)
+{
+       struct rte_cryptodev *dev;
+       uint8_t index;
+       int ret;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return -EINVAL;
+       }
+
        dev = rte_cryptodev_pmd_get_dev(dev_id);
 
        if (sess == NULL || xforms == NULL || dev == NULL)
@@ -1055,8 +1773,13 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
 
        index = dev->driver_id;
 
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->asym_session_configure,
+                               -ENOTSUP);
+
        if (sess->sess_private_data[index] == NULL) {
-               ret = dev->dev_ops->session_configure(dev, xforms, sess, mp);
+               ret = dev->dev_ops->asym_session_configure(dev,
+                                                       xforms,
+                                                       sess, mp);
                if (ret < 0) {
                        CDEV_LOG_ERR(
                                "dev_id %d failed to configure session details",
@@ -1065,13 +1788,130 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
                }
        }
 
+       rte_cryptodev_trace_asym_session_init(dev_id, sess, xforms, mp);
        return 0;
 }
 
+struct rte_mempool *
+rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
+       uint32_t elt_size, uint32_t cache_size, uint16_t user_data_size,
+       int socket_id)
+{
+       struct rte_mempool *mp;
+       struct rte_cryptodev_sym_session_pool_private_data *pool_priv;
+       uint32_t obj_sz;
+
+       obj_sz = rte_cryptodev_sym_get_header_session_size() + user_data_size;
+       if (obj_sz > elt_size)
+               CDEV_LOG_INFO("elt_size %u is expanded to %u\n", elt_size,
+                               obj_sz);
+       else
+               obj_sz = elt_size;
+
+       mp = rte_mempool_create(name, nb_elts, obj_sz, cache_size,
+                       (uint32_t)(sizeof(*pool_priv)),
+                       NULL, NULL, NULL, NULL,
+                       socket_id, 0);
+       if (mp == NULL) {
+               CDEV_LOG_ERR("%s(name=%s) failed, rte_errno=%d\n",
+                       __func__, name, rte_errno);
+               return NULL;
+       }
+
+       pool_priv = rte_mempool_get_priv(mp);
+       if (!pool_priv) {
+               CDEV_LOG_ERR("%s(name=%s) failed to get private data\n",
+                       __func__, name);
+               rte_mempool_free(mp);
+               return NULL;
+       }
+
+       pool_priv->nb_drivers = nb_drivers;
+       pool_priv->user_data_sz = user_data_size;
+
+       rte_cryptodev_trace_sym_session_pool_create(name, nb_elts,
+               elt_size, cache_size, user_data_size, mp);
+       return mp;
+}
+
+static unsigned int
+rte_cryptodev_sym_session_data_size(struct rte_cryptodev_sym_session *sess)
+{
+       return (sizeof(sess->sess_data[0]) * sess->nb_drivers) +
+                       sess->user_data_sz;
+}
+
+static uint8_t
+rte_cryptodev_sym_is_valid_session_pool(struct rte_mempool *mp)
+{
+       struct rte_cryptodev_sym_session_pool_private_data *pool_priv;
+
+       if (!mp)
+               return 0;
+
+       pool_priv = rte_mempool_get_priv(mp);
+
+       if (!pool_priv || mp->private_data_size < sizeof(*pool_priv) ||
+                       pool_priv->nb_drivers != nb_drivers ||
+                       mp->elt_size <
+                               rte_cryptodev_sym_get_header_session_size()
+                               + pool_priv->user_data_sz)
+               return 0;
+
+       return 1;
+}
+
 struct rte_cryptodev_sym_session *
 rte_cryptodev_sym_session_create(struct rte_mempool *mp)
 {
        struct rte_cryptodev_sym_session *sess;
+       struct rte_cryptodev_sym_session_pool_private_data *pool_priv;
+
+       if (!rte_cryptodev_sym_is_valid_session_pool(mp)) {
+               CDEV_LOG_ERR("Invalid mempool\n");
+               return NULL;
+       }
+
+       pool_priv = rte_mempool_get_priv(mp);
+
+       /* Allocate a session structure from the session pool */
+       if (rte_mempool_get(mp, (void **)&sess)) {
+               CDEV_LOG_ERR("couldn't get object from session mempool");
+               return NULL;
+       }
+
+       sess->nb_drivers = pool_priv->nb_drivers;
+       sess->user_data_sz = pool_priv->user_data_sz;
+       sess->opaque_data = 0;
+
+       /* Clear device session pointer.
+        * Include the flag indicating presence of user data
+        */
+       memset(sess->sess_data, 0,
+                       rte_cryptodev_sym_session_data_size(sess));
+
+       rte_cryptodev_trace_sym_session_create(mp, sess);
+       return sess;
+}
+
+struct rte_cryptodev_asym_session *
+rte_cryptodev_asym_session_create(struct rte_mempool *mp)
+{
+       struct rte_cryptodev_asym_session *sess;
+       unsigned int session_size =
+                       rte_cryptodev_asym_get_header_session_size();
+
+       if (!mp) {
+               CDEV_LOG_ERR("invalid mempool\n");
+               return NULL;
+       }
+
+       /* Verify if provided mempool can hold elements big enough. */
+       if (mp->elt_size < session_size) {
+               CDEV_LOG_ERR(
+                       "mempool elements too small to hold session objects");
+               return NULL;
+       }
 
        /* Allocate a session structure from the session pool */
        if (rte_mempool_get(mp, (void **)&sess)) {
@@ -1082,83 +1922,92 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
        /* Clear device session pointer.
         * Include the flag indicating presence of private data
         */
-       memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t));
+       memset(sess, 0, session_size);
 
+       rte_cryptodev_trace_asym_session_create(mp, sess);
        return sess;
 }
 
 int
-rte_cryptodev_queue_pair_attach_sym_session(uint8_t dev_id, uint16_t qp_id,
+rte_cryptodev_sym_session_clear(uint8_t dev_id,
                struct rte_cryptodev_sym_session *sess)
 {
        struct rte_cryptodev *dev;
+       uint8_t driver_id;
 
        if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
                return -EINVAL;
        }
 
-       dev = &rte_crypto_devices[dev_id];
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (dev == NULL || sess == NULL)
+               return -EINVAL;
 
-       /* The API is optional, not returning error if driver do not suuport */
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->qp_attach_session, 0);
+       driver_id = dev->driver_id;
+       if (sess->sess_data[driver_id].refcnt == 0)
+               return 0;
+       if (--sess->sess_data[driver_id].refcnt != 0)
+               return -EBUSY;
 
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP);
 
-       if (dev->dev_ops->qp_attach_session(dev, qp_id, sess_priv)) {
-               CDEV_LOG_ERR("dev_id %d failed to attach qp: %d with session",
-                               dev_id, qp_id);
-               return -EPERM;
-       }
+       dev->dev_ops->sym_session_clear(dev, sess);
 
+       rte_cryptodev_trace_sym_session_clear(dev_id, sess);
        return 0;
 }
 
 int
-rte_cryptodev_queue_pair_detach_sym_session(uint8_t dev_id, uint16_t qp_id,
-               struct rte_cryptodev_sym_session *sess)
+rte_cryptodev_asym_session_clear(uint8_t dev_id,
+               struct rte_cryptodev_asym_session *sess)
 {
        struct rte_cryptodev *dev;
 
        if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
                return -EINVAL;
        }
 
-       dev = &rte_crypto_devices[dev_id];
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
 
-       /* The API is optional, not returning error if driver do not suuport */
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->qp_detach_session, 0);
+       if (dev == NULL || sess == NULL)
+               return -EINVAL;
 
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->asym_session_clear, -ENOTSUP);
 
-       if (dev->dev_ops->qp_detach_session(dev, qp_id, sess_priv)) {
-               CDEV_LOG_ERR("dev_id %d failed to detach qp: %d from session",
-                               dev_id, qp_id);
-               return -EPERM;
-       }
+       dev->dev_ops->asym_session_clear(dev, sess);
 
+       rte_cryptodev_trace_sym_session_clear(dev_id, sess);
        return 0;
 }
 
 int
-rte_cryptodev_sym_session_clear(uint8_t dev_id,
-               struct rte_cryptodev_sym_session *sess)
+rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
 {
-       struct rte_cryptodev *dev;
-
-       dev = rte_cryptodev_pmd_get_dev(dev_id);
+       uint8_t i;
+       struct rte_mempool *sess_mp;
 
-       if (dev == NULL || sess == NULL)
+       if (sess == NULL)
                return -EINVAL;
 
-       dev->dev_ops->session_clear(dev, sess);
+       /* Check that all device private data has been freed */
+       for (i = 0; i < sess->nb_drivers; i++) {
+               if (sess->sess_data[i].refcnt != 0)
+                       return -EBUSY;
+       }
+
+       /* Return session to mempool */
+       sess_mp = rte_mempool_from_obj(sess);
+       rte_mempool_put(sess_mp, sess);
 
+       rte_cryptodev_trace_sym_session_free(sess);
        return 0;
 }
 
 int
-rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
+rte_cryptodev_asym_session_free(struct rte_cryptodev_asym_session *sess)
 {
        uint8_t i;
        void *sess_priv;
@@ -1169,7 +2018,7 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
 
        /* Check that all device private data has been freed */
        for (i = 0; i < nb_drivers; i++) {
-               sess_priv = get_session_private_data(sess, i);
+               sess_priv = get_asym_session_private_data(sess, i);
                if (sess_priv != NULL)
                        return -EBUSY;
        }
@@ -1178,17 +2027,39 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
        sess_mp = rte_mempool_from_obj(sess);
        rte_mempool_put(sess_mp, sess);
 
+       rte_cryptodev_trace_asym_session_free(sess);
        return 0;
 }
 
 unsigned int
-rte_cryptodev_get_header_session_size(void)
+rte_cryptodev_sym_get_header_session_size(void)
+{
+       /*
+        * Header contains pointers to the private data of all registered
+        * drivers and all necessary information to ensure safely clear
+        * or free al session.
+        */
+       struct rte_cryptodev_sym_session s = {0};
+
+       s.nb_drivers = nb_drivers;
+
+       return (unsigned int)(sizeof(s) +
+                       rte_cryptodev_sym_session_data_size(&s));
+}
+
+unsigned int
+rte_cryptodev_sym_get_existing_header_session_size(
+               struct rte_cryptodev_sym_session *sess)
 {
-       return rte_cryptodev_sym_get_header_session_size();
+       if (!sess)
+               return 0;
+       else
+               return (unsigned int)(sizeof(*sess) +
+                               rte_cryptodev_sym_session_data_size(sess));
 }
 
 unsigned int
-rte_cryptodev_sym_get_header_session_size(void)
+rte_cryptodev_asym_get_header_session_size(void)
 {
        /*
         * Header contains pointers to the private data
@@ -1199,13 +2070,26 @@ rte_cryptodev_sym_get_header_session_size(void)
 }
 
 unsigned int
-rte_cryptodev_get_private_session_size(uint8_t dev_id)
+rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
 {
-       return rte_cryptodev_sym_get_private_session_size(dev_id);
+       struct rte_cryptodev *dev;
+       unsigned int priv_sess_size;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id))
+               return 0;
+
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (*dev->dev_ops->sym_session_get_size == NULL)
+               return 0;
+
+       priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev);
+
+       return priv_sess_size;
 }
 
 unsigned int
-rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
+rte_cryptodev_asym_get_private_session_size(uint8_t dev_id)
 {
        struct rte_cryptodev *dev;
        unsigned int header_size = sizeof(void *) * nb_drivers;
@@ -1216,16 +2100,10 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
 
        dev = rte_cryptodev_pmd_get_dev(dev_id);
 
-       if (*dev->dev_ops->session_get_size == NULL)
+       if (*dev->dev_ops->asym_session_get_size == NULL)
                return 0;
 
-       priv_sess_size = (*dev->dev_ops->session_get_size)(dev);
-
-       /*
-        * If size is less than session header size,
-        * return the latter, as this guarantees that
-        * sessionless operations will work
-        */
+       priv_sess_size = (*dev->dev_ops->asym_session_get_size)(dev);
        if (priv_sess_size < header_size)
                return header_size;
 
@@ -1233,36 +2111,141 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id)
 
 }
 
-int __rte_experimental
-rte_cryptodev_sym_session_set_private_data(
+int
+rte_cryptodev_sym_session_set_user_data(
                                        struct rte_cryptodev_sym_session *sess,
                                        void *data,
                                        uint16_t size)
 {
-       uint16_t off_set = sizeof(void *) * nb_drivers;
-       uint8_t *private_data_present = (uint8_t *)sess + off_set;
-
        if (sess == NULL)
                return -EINVAL;
 
-       *private_data_present = 1;
-       off_set += sizeof(uint8_t);
-       rte_memcpy((uint8_t *)sess + off_set, data, size);
+       if (sess->user_data_sz < size)
+               return -ENOMEM;
+
+       rte_memcpy(sess->sess_data + sess->nb_drivers, data, size);
        return 0;
 }
 
-void * __rte_experimental
-rte_cryptodev_sym_session_get_private_data(
+void *
+rte_cryptodev_sym_session_get_user_data(
                                        struct rte_cryptodev_sym_session *sess)
 {
-       uint16_t off_set = sizeof(void *) * nb_drivers;
-       uint8_t *private_data_present = (uint8_t *)sess + off_set;
-
-       if (sess == NULL || !*private_data_present)
+       if (sess == NULL || sess->user_data_sz == 0)
                return NULL;
 
-       off_set += sizeof(uint8_t);
-       return (uint8_t *)sess + off_set;
+       return (void *)(sess->sess_data + sess->nb_drivers);
+}
+
+static inline void
+sym_crypto_fill_status(struct rte_crypto_sym_vec *vec, int32_t errnum)
+{
+       uint32_t i;
+       for (i = 0; i < vec->num; i++)
+               vec->status[i] = errnum;
+}
+
+uint32_t
+rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id,
+       struct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs ofs,
+       struct rte_crypto_sym_vec *vec)
+{
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
+               sym_crypto_fill_status(vec, EINVAL);
+               return 0;
+       }
+
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (*dev->dev_ops->sym_cpu_process == NULL ||
+               !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO)) {
+               sym_crypto_fill_status(vec, ENOTSUP);
+               return 0;
+       }
+
+       return dev->dev_ops->sym_cpu_process(dev, sess, ofs, vec);
+}
+
+int
+rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id)
+{
+       struct rte_cryptodev *dev;
+       int32_t size = sizeof(struct rte_crypto_raw_dp_ctx);
+       int32_t priv_size;
+
+       if (!rte_cryptodev_pmd_is_valid_dev(dev_id))
+               return -EINVAL;
+
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (*dev->dev_ops->sym_get_raw_dp_ctx_size == NULL ||
+               !(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)) {
+               return -ENOTSUP;
+       }
+
+       priv_size = (*dev->dev_ops->sym_get_raw_dp_ctx_size)(dev);
+       if (priv_size < 0)
+               return -ENOTSUP;
+
+       return RTE_ALIGN_CEIL((size + priv_size), 8);
+}
+
+int
+rte_cryptodev_configure_raw_dp_ctx(uint8_t dev_id, uint16_t qp_id,
+       struct rte_crypto_raw_dp_ctx *ctx,
+       enum rte_crypto_op_sess_type sess_type,
+       union rte_cryptodev_session_ctx session_ctx,
+       uint8_t is_update)
+{
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_get_qp_status(dev_id, qp_id))
+               return -EINVAL;
+
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
+       if (!(dev->feature_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)
+                       || dev->dev_ops->sym_configure_raw_dp_ctx == NULL)
+               return -ENOTSUP;
+
+       return (*dev->dev_ops->sym_configure_raw_dp_ctx)(dev, qp_id, ctx,
+                       sess_type, session_ctx, is_update);
+}
+
+uint32_t
+rte_cryptodev_raw_enqueue_burst(struct rte_crypto_raw_dp_ctx *ctx,
+       struct rte_crypto_sym_vec *vec, union rte_crypto_sym_ofs ofs,
+       void **user_data, int *enqueue_status)
+{
+       return (*ctx->enqueue_burst)(ctx->qp_data, ctx->drv_ctx_data, vec,
+                       ofs, user_data, enqueue_status);
+}
+
+int
+rte_cryptodev_raw_enqueue_done(struct rte_crypto_raw_dp_ctx *ctx,
+               uint32_t n)
+{
+       return (*ctx->enqueue_done)(ctx->qp_data, ctx->drv_ctx_data, n);
+}
+
+uint32_t
+rte_cryptodev_raw_dequeue_burst(struct rte_crypto_raw_dp_ctx *ctx,
+       rte_cryptodev_raw_get_dequeue_count_t get_dequeue_count,
+       rte_cryptodev_raw_post_dequeue_t post_dequeue,
+       void **out_user_data, uint8_t is_user_data_array,
+       uint32_t *n_success_jobs, int *status)
+{
+       return (*ctx->dequeue_burst)(ctx->qp_data, ctx->drv_ctx_data,
+               get_dequeue_count, post_dequeue, out_user_data,
+               is_user_data_array, n_success_jobs, status);
+}
+
+int
+rte_cryptodev_raw_dequeue_done(struct rte_crypto_raw_dp_ctx *ctx,
+               uint32_t n)
+{
+       return (*ctx->dequeue_done)(ctx->qp_data, ctx->drv_ctx_data, n);
 }
 
 /** Initialise rte_crypto_op mempool element */
@@ -1292,9 +2275,20 @@ rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
        struct rte_crypto_op_pool_private *priv;
 
        unsigned elt_size = sizeof(struct rte_crypto_op) +
-                       sizeof(struct rte_crypto_sym_op) +
                        priv_size;
 
+       if (type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
+               elt_size += sizeof(struct rte_crypto_sym_op);
+       } else if (type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
+               elt_size += sizeof(struct rte_crypto_asym_op);
+       } else if (type == RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               elt_size += RTE_MAX(sizeof(struct rte_crypto_sym_op),
+                                   sizeof(struct rte_crypto_asym_op));
+       } else {
+               CDEV_LOG_ERR("Invalid op_type\n");
+               return NULL;
+       }
+
        /* lookup mempool in case already allocated */
        struct rte_mempool *mp = rte_mempool_lookup(name);
 
@@ -1383,7 +2377,7 @@ rte_cryptodev_driver_id_get(const char *name)
 
        TAILQ_FOREACH(driver, &cryptodev_driver_list, next) {
                driver_name = driver->driver->name;
-               if (strncmp(driver_name, name, strlen(driver_name)) == 0)
+               if (strncmp(driver_name, name, strlen(driver_name) + 1) == 0)
                        return driver->id;
        }
        return -1;
@@ -1392,8 +2386,14 @@ rte_cryptodev_driver_id_get(const char *name)
 const char *
 rte_cryptodev_name_get(uint8_t dev_id)
 {
-       struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(dev_id);
+       struct rte_cryptodev *dev;
+
+       if (!rte_cryptodev_is_valid_device_data(dev_id)) {
+               CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id);
+               return NULL;
+       }
 
+       dev = rte_cryptodev_pmd_get_dev(dev_id);
        if (dev == NULL)
                return NULL;