cryptodev: add function to retrieve device name

[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 373c05b..e48d562 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -311,8 +311,7 @@ rte_cryptodev_sym_capability_check_cipher(
 int
 rte_cryptodev_sym_capability_check_auth(
                const struct rte_cryptodev_symmetric_capability *capability,
-               uint16_t key_size, uint16_t digest_size, uint16_t aad_size,
-               uint16_t iv_size)
+               uint16_t key_size, uint16_t digest_size, uint16_t iv_size)
 {
        if (param_range_check(key_size, capability->auth.key_size))
                return -1;
@@ -320,9 +319,6 @@ rte_cryptodev_sym_capability_check_auth(
        if (param_range_check(digest_size, capability->auth.digest_size))
                return -1;
 
-       if (param_range_check(aad_size, capability->auth.aad_size))
-               return -1;
-
        if (param_range_check(iv_size, capability->auth.iv_size))
                return -1;
 
@@ -747,8 +743,7 @@ rte_cryptodev_queue_pair_stop(uint8_t dev_id, uint16_t queue_pair_id)
 }
 
 int
-rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config,
-               struct rte_mempool *session_pool)
+rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config)
 {
        struct rte_cryptodev *dev;
        int diag;
@@ -768,8 +763,6 @@ rte_cryptodev_configure(uint8_t dev_id, struct rte_cryptodev_config *config,
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
 
-       dev->data->session_pool = session_pool;
-
        /* Setup new number of queue pairs and reconfigure device. */
        diag = rte_cryptodev_queue_pairs_config(dev, config->nb_queue_pairs,
                        config->socket_id);
@@ -881,7 +874,9 @@ 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)
+               const struct rte_cryptodev_qp_conf *qp_conf, int socket_id,
+               struct rte_mempool *session_pool)
+
 {
        struct rte_cryptodev *dev;
 
@@ -905,7 +900,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_pair_setup, -ENOTSUP);
 
        return (*dev->dev_ops->queue_pair_setup)(dev, queue_pair_id, qp_conf,
-                       socket_id);
+                       socket_id, session_pool);
 }
 
 
@@ -1090,20 +1085,22 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
 {
        struct rte_cryptodev *dev;
        uint8_t index;
+       int ret;
 
        dev = rte_cryptodev_pmd_get_dev(dev_id);
 
        if (sess == NULL || xforms == NULL || dev == NULL)
-               return -1;
+               return -EINVAL;
 
        index = dev->driver_id;
 
        if (sess->sess_private_data[index] == NULL) {
-               if (dev->dev_ops->session_configure(dev, xforms, sess, mp) < 0) {
+               ret = dev->dev_ops->session_configure(dev, xforms, sess, mp);
+               if (ret < 0) {
                        CDEV_LOG_ERR(
                                "dev_id %d failed to configure session details",
                                dev_id);
-                       return -1;
+                       return ret;
                }
        }
 
@@ -1365,12 +1362,6 @@ TAILQ_HEAD(cryptodev_driver_list, cryptodev_driver);
 static struct cryptodev_driver_list cryptodev_driver_list =
        TAILQ_HEAD_INITIALIZER(cryptodev_driver_list);
 
-struct cryptodev_driver {
-       TAILQ_ENTRY(cryptodev_driver) next; /**< Next in list. */
-       const struct rte_driver *driver;
-       uint8_t id;
-};
-
 int
 rte_cryptodev_driver_id_get(const char *name)
 {
@@ -1390,6 +1381,17 @@ rte_cryptodev_driver_id_get(const char *name)
        return -1;
 }
 
+const char *
+rte_cryptodev_name_get(uint8_t dev_id)
+{
+       struct rte_cryptodev *dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+       if (dev == NULL)
+               return NULL;
+
+       return dev->data->name;
+}
+
 const char *
 rte_cryptodev_driver_name_get(uint8_t driver_id)
 {
@@ -1402,15 +1404,13 @@ rte_cryptodev_driver_name_get(uint8_t driver_id)
 }
 
 uint8_t
-rte_cryptodev_allocate_driver(const struct rte_driver *drv)
+rte_cryptodev_allocate_driver(struct cryptodev_driver *crypto_drv,
+               const struct rte_driver *drv)
 {
-       struct cryptodev_driver *driver;
-
-       driver = malloc(sizeof(*driver));
-       driver->driver = drv;
-       driver->id = nb_drivers;
+       crypto_drv->driver = drv;
+       crypto_drv->id = nb_drivers;
 
-       TAILQ_INSERT_TAIL(&cryptodev_driver_list, driver, next);
+       TAILQ_INSERT_TAIL(&cryptodev_driver_list, crypto_drv, next);
 
        return nb_drivers++;
 }