cryptodev: check if symmetric sessions are supported

[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.c

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index 4959f2a..0b20f3f 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -361,12 +361,22 @@ 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";
        default:
                return NULL;
        }
@@ -700,50 +710,6 @@ rte_cryptodev_queue_pairs_config(struct rte_cryptodev *dev, uint16_t nb_qpairs,
        return 0;
 }
 
-int
-rte_cryptodev_queue_pair_start(uint8_t dev_id, uint16_t queue_pair_id)
-{
-       struct rte_cryptodev *dev;
-
-       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];
-       if (queue_pair_id >= dev->data->nb_queue_pairs) {
-               CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
-               return -EINVAL;
-       }
-
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_start, -ENOTSUP);
-
-       return dev->dev_ops->queue_pair_start(dev, queue_pair_id);
-
-}
-
-int
-rte_cryptodev_queue_pair_stop(uint8_t dev_id, uint16_t queue_pair_id)
-{
-       struct rte_cryptodev *dev;
-
-       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];
-       if (queue_pair_id >= dev->data->nb_queue_pairs) {
-               CDEV_LOG_ERR("Invalid queue_pair_id=%d", queue_pair_id);
-               return -EINVAL;
-       }
-
-       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_stop, -ENOTSUP);
-
-       return dev->dev_ops->queue_pair_stop(dev, queue_pair_id);
-
-}
-
 int
 rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
 {
@@ -964,6 +930,7 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
        (*dev->dev_ops->dev_infos_get)(dev, dev_info);
 
        dev_info->driver_name = dev->device->driver->name;
+       dev_info->device = dev->device;
 }
 
 
@@ -1096,8 +1063,11 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
 
        index = dev->driver_id;
 
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP);
+
        if (sess->sess_private_data[index] == NULL) {
-               ret = dev->dev_ops->session_configure(dev, xforms, sess, mp);
+               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",
@@ -1128,60 +1098,6 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
        return sess;
 }
 
-int
-rte_cryptodev_queue_pair_attach_sym_session(uint8_t dev_id, uint16_t qp_id,
-               struct rte_cryptodev_sym_session *sess)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[dev_id];
-
-       /* 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);
-
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
-
-       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;
-       }
-
-       return 0;
-}
-
-int
-rte_cryptodev_queue_pair_detach_sym_session(uint8_t dev_id, uint16_t qp_id,
-               struct rte_cryptodev_sym_session *sess)
-{
-       struct rte_cryptodev *dev;
-
-       if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
-               CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
-               return -EINVAL;
-       }
-
-       dev = &rte_crypto_devices[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);
-
-       void *sess_priv = get_session_private_data(sess, dev->driver_id);
-
-       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;
-       }
-
-       return 0;
-}
-
 int
 rte_cryptodev_sym_session_clear(uint8_t dev_id,
                struct rte_cryptodev_sym_session *sess)
@@ -1193,7 +1109,9 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id,
        if (dev == NULL || sess == NULL)
                return -EINVAL;
 
-       dev->dev_ops->session_clear(dev, sess);
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP);
+
+       dev->dev_ops->sym_session_clear(dev, sess);
 
        return 0;
 }
@@ -1210,7 +1128,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_sym_session_private_data(sess, i);
                if (sess_priv != NULL)
                        return -EBUSY;
        }
@@ -1223,7 +1141,7 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
 }
 
 unsigned int
-rte_cryptodev_get_header_session_size(void)
+rte_cryptodev_sym_get_header_session_size(void)
 {
        /*
         * Header contains pointers to the private data
@@ -1234,7 +1152,7 @@ rte_cryptodev_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)
 {
        struct rte_cryptodev *dev;
        unsigned int header_size = sizeof(void *) * nb_drivers;
@@ -1245,10 +1163,10 @@ rte_cryptodev_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->sym_session_get_size == NULL)
                return 0;
 
-       priv_sess_size = (*dev->dev_ops->session_get_size)(dev);
+       priv_sess_size = (*dev->dev_ops->sym_session_get_size)(dev);
 
        /*
         * If size is less than session header size,