replace snprintf with strlcpy without adding extra include

[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 2a8e07d..2675e1e 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -486,6 +486,10 @@ rte_cryptodev_get_feature_name(uint64_t flag)
                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";
        default:
                return NULL;
        }
@@ -586,7 +590,7 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
 
                        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;
@@ -694,8 +698,8 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id)
 
                cryptodev->data = cryptodev_data;
 
-               snprintf(cryptodev->data->name, RTE_CRYPTODEV_NAME_MAX_LEN,
-                               "%s", name);
+               strlcpy(cryptodev->data->name, name,
+                       RTE_CRYPTODEV_NAME_MAX_LEN);
 
                cryptodev->data->dev_id = dev_id;
                cryptodev->data->socket_id = socket_id;
@@ -992,6 +996,7 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id,
                }
 
                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) ||
@@ -1215,7 +1220,7 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP);
 
-       if (sess->sess_data[index].data == NULL) {
+       if (sess->sess_data[index].refcnt == 0) {
                ret = dev->dev_ops->sym_session_configure(dev, xforms,
                                                        sess, mp);
                if (ret < 0) {
@@ -1226,6 +1231,7 @@ rte_cryptodev_sym_session_init(uint8_t dev_id,
                }
        }
 
+       sess->sess_data[index].refcnt++;
        return 0;
 }
 
@@ -1307,7 +1313,8 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts,
 static unsigned int
 rte_cryptodev_sym_session_data_size(struct rte_cryptodev_sym_session *sess)
 {
-       return (sizeof(sess->sess_data[0]) * sess->nb_drivers);
+       return (sizeof(sess->sess_data[0]) * sess->nb_drivers) +
+                       sess->user_data_sz;
 }
 
 struct rte_cryptodev_sym_session *
@@ -1335,7 +1342,8 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp)
        }
 
        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
@@ -1370,12 +1378,17 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id,
                struct rte_cryptodev_sym_session *sess)
 {
        struct rte_cryptodev *dev;
+       uint8_t driver_id;
 
        dev = rte_cryptodev_pmd_get_dev(dev_id);
 
        if (dev == NULL || sess == NULL)
                return -EINVAL;
 
+       driver_id = dev->driver_id;
+       if (--sess->sess_data[driver_id].refcnt != 0)
+               return -EBUSY;
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP);
 
        dev->dev_ops->sym_session_clear(dev, sess);
@@ -1405,16 +1418,14 @@ int
 rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess)
 {
        uint8_t i;
-       void *sess_priv;
        struct rte_mempool *sess_mp;
 
        if (sess == NULL)
                return -EINVAL;
 
        /* Check that all device private data has been freed */
-       for (i = 0; i < nb_drivers; i++) {
-               sess_priv = get_sym_session_private_data(sess, i);
-               if (sess_priv != NULL)
+       for (i = 0; i < sess->nb_drivers; i++) {
+               if (sess->sess_data[i].refcnt != 0)
                        return -EBUSY;
        }
 
@@ -1538,6 +1549,9 @@ rte_cryptodev_sym_session_set_user_data(
        if (sess == NULL)
                return -EINVAL;
 
+       if (sess->user_data_sz < size)
+               return -ENOMEM;
+
        rte_memcpy(sess->sess_data + sess->nb_drivers, data, size);
        return 0;
 }
@@ -1546,7 +1560,7 @@ void * __rte_experimental
 rte_cryptodev_sym_session_get_user_data(
                                        struct rte_cryptodev_sym_session *sess)
 {
-       if (sess == NULL)
+       if (sess == NULL || sess->user_data_sz == 0)
                return NULL;
 
        return (void *)(sess->sess_data + sess->nb_drivers);
@@ -1681,7 +1695,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;