cryptodev: move session init out of pool creation
[dpdk.git] / lib / librte_cryptodev / rte_cryptodev.c
index d02a4d0..cf444c0 100644 (file)
@@ -47,7 +47,6 @@
 #include <rte_debug.h>
 #include <rte_dev.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
@@ -112,11 +111,9 @@ rte_crypto_cipher_algorithm_strings[] = {
        [RTE_CRYPTO_CIPHER_3DES_CTR]    = "3des-ctr",
 
        [RTE_CRYPTO_CIPHER_AES_CBC]     = "aes-cbc",
-       [RTE_CRYPTO_CIPHER_AES_CCM]     = "aes-ccm",
        [RTE_CRYPTO_CIPHER_AES_CTR]     = "aes-ctr",
        [RTE_CRYPTO_CIPHER_AES_DOCSISBPI]       = "aes-docsisbpi",
        [RTE_CRYPTO_CIPHER_AES_ECB]     = "aes-ecb",
-       [RTE_CRYPTO_CIPHER_AES_GCM]     = "aes-gcm",
        [RTE_CRYPTO_CIPHER_AES_F8]      = "aes-f8",
        [RTE_CRYPTO_CIPHER_AES_XTS]     = "aes-xts",
 
@@ -149,9 +146,7 @@ rte_crypto_cipher_operation_strings[] = {
 const char *
 rte_crypto_auth_algorithm_strings[] = {
        [RTE_CRYPTO_AUTH_AES_CBC_MAC]   = "aes-cbc-mac",
-       [RTE_CRYPTO_AUTH_AES_CCM]       = "aes-ccm",
        [RTE_CRYPTO_AUTH_AES_CMAC]      = "aes-cmac",
-       [RTE_CRYPTO_AUTH_AES_GCM]       = "aes-gcm",
        [RTE_CRYPTO_AUTH_AES_GMAC]      = "aes-gmac",
        [RTE_CRYPTO_AUTH_AES_XCBC_MAC]  = "aes-xcbc-mac",
 
@@ -177,6 +172,26 @@ rte_crypto_auth_algorithm_strings[] = {
        [RTE_CRYPTO_AUTH_ZUC_EIA3]      = "zuc-eia3"
 };
 
+/**
+ * The crypto AEAD algorithm strings identifiers.
+ * It could be used in application command line.
+ */
+const char *
+rte_crypto_aead_algorithm_strings[] = {
+       [RTE_CRYPTO_AEAD_AES_CCM]       = "aes-ccm",
+       [RTE_CRYPTO_AEAD_AES_GCM]       = "aes-gcm",
+};
+
+/**
+ * The crypto AEAD operation strings identifiers.
+ * It could be used in application command line.
+ */
+const char *
+rte_crypto_aead_operation_strings[] = {
+       [RTE_CRYPTO_AEAD_OP_ENCRYPT]    = "encrypt",
+       [RTE_CRYPTO_AEAD_OP_DECRYPT]    = "decrypt"
+};
+
 int
 rte_cryptodev_get_cipher_algo_enum(enum rte_crypto_cipher_algorithm *algo_enum,
                const char *algo_string)
@@ -211,6 +226,23 @@ rte_cryptodev_get_auth_algo_enum(enum rte_crypto_auth_algorithm *algo_enum,
        return -1;
 }
 
+int
+rte_cryptodev_get_aead_algo_enum(enum rte_crypto_aead_algorithm *algo_enum,
+               const char *algo_string)
+{
+       unsigned int i;
+
+       for (i = 1; i < RTE_DIM(rte_crypto_aead_algorithm_strings); i++) {
+               if (strcmp(algo_string, rte_crypto_aead_algorithm_strings[i]) == 0) {
+                       *algo_enum = (enum rte_crypto_aead_algorithm) i;
+                       return 0;
+               }
+       }
+
+       /* Invalid string */
+       return -1;
+}
+
 /**
  * The crypto auth operation strings identifiers.
  * It could be used in application command line.
@@ -246,6 +278,10 @@ rte_cryptodev_sym_capability_get(uint8_t dev_id,
                if (idx->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
                        capability->sym.cipher.algo == idx->algo.cipher)
                        return &capability->sym;
+
+               if (idx->type == RTE_CRYPTO_SYM_XFORM_AEAD &&
+                               capability->sym.aead.algo == idx->algo.aead)
+                       return &capability->sym;
        }
 
        return NULL;
@@ -273,7 +309,8 @@ 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 key_size, uint16_t digest_size, uint16_t aad_size,
+               uint16_t iv_size)
 {
        if (param_range_check(key_size, capability->auth.key_size))
                return -1;
@@ -284,9 +321,32 @@ rte_cryptodev_sym_capability_check_auth(
        if (param_range_check(aad_size, capability->auth.aad_size))
                return -1;
 
+       if (param_range_check(iv_size, capability->auth.iv_size))
+               return -1;
+
        return 0;
 }
 
+int
+rte_cryptodev_sym_capability_check_aead(
+               const struct rte_cryptodev_symmetric_capability *capability,
+               uint16_t key_size, uint16_t digest_size, uint16_t aad_size,
+               uint16_t iv_size)
+{
+       if (param_range_check(key_size, capability->aead.key_size))
+               return -1;
+
+       if (param_range_check(digest_size, capability->aead.digest_size))
+               return -1;
+
+       if (param_range_check(aad_size, capability->aead.aad_size))
+               return -1;
+
+       if (param_range_check(iv_size, capability->aead.iv_size))
+               return -1;
+
+       return 0;
+}
 
 const char *
 rte_cryptodev_get_feature_name(uint64_t flag)
@@ -392,12 +452,12 @@ rte_cryptodev_count(void)
 }
 
 uint8_t
-rte_cryptodev_count_devtype(enum rte_cryptodev_type type)
+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].dev_type == type &&
+               if (rte_cryptodev_globals->devs[i].driver_id == driver_id &&
                        rte_cryptodev_globals->devs[i].attached ==
                                        RTE_CRYPTODEV_ATTACHED)
                        dev_count++;
@@ -553,108 +613,6 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev)
        return 0;
 }
 
-int
-rte_cryptodev_pci_probe(struct rte_pci_driver *pci_drv,
-                       struct rte_pci_device *pci_dev)
-{
-       struct rte_cryptodev_driver *cryptodrv;
-       struct rte_cryptodev *cryptodev;
-
-       char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
-
-       int retval;
-
-       cryptodrv = (struct rte_cryptodev_driver *)pci_drv;
-       if (cryptodrv == NULL)
-               return -ENODEV;
-
-       rte_pci_device_name(&pci_dev->addr, cryptodev_name,
-                       sizeof(cryptodev_name));
-
-       cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id());
-       if (cryptodev == NULL)
-               return -ENOMEM;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               cryptodev->data->dev_private =
-                               rte_zmalloc_socket(
-                                               "cryptodev private structure",
-                                               cryptodrv->dev_private_size,
-                                               RTE_CACHE_LINE_SIZE,
-                                               rte_socket_id());
-
-               if (cryptodev->data->dev_private == NULL)
-                       rte_panic("Cannot allocate memzone for private "
-                                       "device data");
-       }
-
-       cryptodev->device = &pci_dev->device;
-       cryptodev->driver = cryptodrv;
-
-       /* init user callbacks */
-       TAILQ_INIT(&(cryptodev->link_intr_cbs));
-
-       /* Invoke PMD device initialization function */
-       retval = (*cryptodrv->cryptodev_init)(cryptodrv, cryptodev);
-       if (retval == 0)
-               return 0;
-
-       CDEV_LOG_ERR("driver %s: crypto_dev_init(vendor_id=0x%x device_id=0x%x)"
-                       " failed", pci_drv->driver.name,
-                       (unsigned) pci_dev->id.vendor_id,
-                       (unsigned) pci_dev->id.device_id);
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(cryptodev->data->dev_private);
-
-       /* free crypto device */
-       rte_cryptodev_pmd_release_device(cryptodev);
-
-       return -ENXIO;
-}
-
-int
-rte_cryptodev_pci_remove(struct rte_pci_device *pci_dev)
-{
-       const struct rte_cryptodev_driver *cryptodrv;
-       struct rte_cryptodev *cryptodev;
-       char cryptodev_name[RTE_CRYPTODEV_NAME_MAX_LEN];
-       int ret;
-
-       if (pci_dev == NULL)
-               return -EINVAL;
-
-       rte_pci_device_name(&pci_dev->addr, cryptodev_name,
-                       sizeof(cryptodev_name));
-
-       cryptodev = rte_cryptodev_pmd_get_named_dev(cryptodev_name);
-       if (cryptodev == NULL)
-               return -ENODEV;
-
-       cryptodrv = (const struct rte_cryptodev_driver *)pci_dev->driver;
-       if (cryptodrv == NULL)
-               return -ENODEV;
-
-       /* Invoke PMD device uninit function */
-       if (*cryptodrv->cryptodev_uninit) {
-               ret = (*cryptodrv->cryptodev_uninit)(cryptodrv, cryptodev);
-               if (ret)
-                       return ret;
-       }
-
-       /* free crypto device */
-       rte_cryptodev_pmd_release_device(cryptodev);
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(cryptodev->data->dev_private);
-
-       cryptodev->device = NULL;
-       cryptodev->driver = NULL;
-       cryptodev->data = NULL;
-
-       return 0;
-}
-
 uint16_t
 rte_cryptodev_queue_pair_count(uint8_t dev_id)
 {
@@ -884,8 +842,8 @@ rte_cryptodev_stop(uint8_t dev_id)
                return;
        }
 
-       dev->data->dev_started = 0;
        (*dev->dev_ops->dev_stop)(dev);
+       dev->data->dev_started = 0;
 }
 
 int
@@ -1133,17 +1091,13 @@ rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev,
 
 static void
 rte_cryptodev_sym_session_init(struct rte_mempool *mp,
-               void *opaque_arg,
-               void *_sess,
-               __rte_unused unsigned i)
+               const struct rte_cryptodev *dev,
+               struct rte_cryptodev_sym_session *sess)
 {
-       struct rte_cryptodev_sym_session *sess = _sess;
-       struct rte_cryptodev *dev = opaque_arg;
-
        memset(sess, 0, mp->elt_size);
 
        sess->dev_id = dev->data->dev_id;
-       sess->dev_type = dev->dev_type;
+       sess->driver_id = dev->driver_id;
        sess->mp = mp;
 
        if (dev->dev_ops->session_initialize)
@@ -1196,8 +1150,7 @@ rte_cryptodev_sym_session_pool_create(struct rte_cryptodev *dev,
                                0, /* private data size */
                                NULL, /* obj initialization constructor */
                                NULL, /* obj initialization constructor arg */
-                               rte_cryptodev_sym_session_init,
-                               /**< obj constructor*/
+                               NULL, /**< obj constructor*/
                                dev, /* obj constructor arg */
                                socket_id, /* socket id */
                                0); /* flags */
@@ -1235,6 +1188,8 @@ rte_cryptodev_sym_session_create(uint8_t dev_id,
 
        sess = _sess;
 
+       rte_cryptodev_sym_session_init(dev->data->session_pool, dev,
+                                       sess);
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->session_configure, NULL);
        if (dev->dev_ops->session_configure(dev, xform, sess->_private) ==
                        NULL) {
@@ -1310,7 +1265,7 @@ rte_cryptodev_sym_session_free(uint8_t dev_id,
        dev = &rte_crypto_devices[dev_id];
 
        /* Check the session belongs to this device type */
-       if (sess->dev_type != dev->dev_type)
+       if (sess->driver_id != dev->driver_id)
                return sess;
 
        /* Let device implementation clear session material */
@@ -1422,3 +1377,60 @@ rte_cryptodev_pmd_create_dev_name(char *name, const char *dev_name_prefix)
 
        return -1;
 }
+
+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;
+};
+
+static uint8_t nb_drivers;
+
+int
+rte_cryptodev_driver_id_get(const char *name)
+{
+       struct cryptodev_driver *driver;
+       const char *driver_name;
+
+       if (name == NULL) {
+               RTE_LOG(DEBUG, CRYPTODEV, "name pointer NULL");
+               return -1;
+       }
+
+       TAILQ_FOREACH(driver, &cryptodev_driver_list, next) {
+               driver_name = driver->driver->name;
+               if (strncmp(driver_name, name, strlen(driver_name)) == 0)
+                       return driver->id;
+       }
+       return -1;
+}
+
+const char *
+rte_cryptodev_driver_name_get(uint8_t driver_id)
+{
+       struct cryptodev_driver *driver;
+
+       TAILQ_FOREACH(driver, &cryptodev_driver_list, next)
+               if (driver->id == driver_id)
+                       return driver->driver->name;
+       return NULL;
+}
+
+uint8_t
+rte_cryptodev_allocate_driver(const struct rte_driver *drv)
+{
+       struct cryptodev_driver *driver;
+
+       driver = malloc(sizeof(*driver));
+       driver->driver = drv;
+       driver->id = nb_drivers;
+
+       TAILQ_INSERT_TAIL(&cryptodev_driver_list, driver, next);
+
+       return nb_drivers++;
+}