cryptodev: move vdev functions to a separate file
authorPablo de Lara <pablo.de.lara.guarch@intel.com>
Tue, 27 Jun 2017 21:16:33 +0000 (22:16 +0100)
committerPablo de Lara <pablo.de.lara.guarch@intel.com>
Wed, 28 Jun 2017 17:59:22 +0000 (19:59 +0200)
Move all functions handling virtual devices to a separate
header file "rte_cryptodev_vdev.h", in order to leave only
generic functions for any device in the rest of the files.

It also creates the file "rte_cryptodev_pmd.c", with the
implementations of these functions.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>
17 files changed:
drivers/crypto/aesni_gcm/aesni_gcm_pmd.c
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
drivers/crypto/armv8/rte_armv8_pmd.c
drivers/crypto/kasumi/rte_kasumi_pmd.c
drivers/crypto/null/null_crypto_pmd.c
drivers/crypto/openssl/rte_openssl_pmd.c
drivers/crypto/scheduler/scheduler_pmd.c
drivers/crypto/scheduler/scheduler_pmd_ops.c
drivers/crypto/snow3g/rte_snow3g_pmd.c
drivers/crypto/zuc/rte_zuc_pmd.c
lib/librte_cryptodev/Makefile
lib/librte_cryptodev/rte_cryptodev.c
lib/librte_cryptodev/rte_cryptodev.h
lib/librte_cryptodev/rte_cryptodev_pmd.c [new file with mode: 0644]
lib/librte_cryptodev/rte_cryptodev_pmd.h
lib/librte_cryptodev/rte_cryptodev_vdev.h [new file with mode: 0644]
lib/librte_cryptodev/rte_cryptodev_version.map

index 246f71e..1b95c23 100644 (file)
@@ -35,6 +35,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -449,7 +450,7 @@ aesni_gcm_create(const char *name,
                return -EFAULT;
        }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct aesni_gcm_private), init_params->socket_id,
                        vdev);
        if (dev == NULL) {
@@ -499,7 +500,7 @@ aesni_gcm_probe(struct rte_vdev_device *vdev)
        if (name == NULL)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index be38c31..267f890 100644 (file)
@@ -34,6 +34,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -698,7 +699,7 @@ cryptodev_aesni_mb_create(const char *name,
                return -EFAULT;
        }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct aesni_mb_private), init_params->socket_id,
                        vdev);
        if (dev == NULL) {
@@ -766,7 +767,7 @@ cryptodev_aesni_mb_probe(struct rte_vdev_device *vdev)
        if (name == NULL)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index 29905d6..83dae87 100644 (file)
@@ -36,6 +36,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -806,7 +807,7 @@ cryptodev_armv8_crypto_create(const char *name,
                snprintf(init_params->name, sizeof(init_params->name),
                                "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                                sizeof(struct armv8_crypto_private),
                                init_params->socket_id,
                                vdev);
@@ -861,7 +862,7 @@ cryptodev_armv8_crypto_init(struct rte_vdev_device *vdev)
        if (name == NULL)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index a95f503..70bf228 100644 (file)
@@ -35,6 +35,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -573,7 +574,7 @@ cryptodev_kasumi_create(const char *name,
                return -EFAULT;
        }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct kasumi_private), init_params->socket_id,
                        vdev);
        if (dev == NULL) {
@@ -623,7 +624,7 @@ cryptodev_kasumi_probe(struct rte_vdev_device *vdev)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index 49da8d4..53bdc3e 100644 (file)
@@ -33,6 +33,7 @@
 #include <rte_common.h>
 #include <rte_config.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 
@@ -176,7 +177,7 @@ cryptodev_null_create(const char *name,
                snprintf(init_params->name, sizeof(init_params->name),
                                "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct null_crypto_private),
                        init_params->socket_id,
                        vdev);
index 13a5129..5d29171 100644 (file)
@@ -34,6 +34,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -1275,7 +1276,7 @@ cryptodev_openssl_create(const char *name,
                snprintf(init_params->name, sizeof(init_params->name),
                                "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct openssl_private),
                        init_params->socket_id,
                        vdev);
@@ -1330,7 +1331,7 @@ cryptodev_openssl_probe(struct rte_vdev_device *vdev)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index 50a196c..fefd6cc 100644 (file)
@@ -33,6 +33,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -102,7 +103,7 @@ cryptodev_scheduler_create(const char *name,
                                sizeof(init_params->def_p.name),
                                "%s", name);
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->def_p.name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->def_p.name,
                        sizeof(struct scheduler_ctx),
                        init_params->def_p.socket_id,
                        vdev);
index 2b5858d..4fc8b91 100644 (file)
@@ -37,6 +37,7 @@
 #include <rte_dev.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_reorder.h>
 
 #include "scheduler_pmd_private.h"
index f17c541..8945f19 100644 (file)
@@ -35,6 +35,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -562,7 +563,7 @@ cryptodev_snow3g_create(const char *name,
                return -EFAULT;
        }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct snow3g_private), init_params->socket_id,
                        vdev);
        if (dev == NULL) {
@@ -612,7 +613,7 @@ cryptodev_snow3g_probe(struct rte_vdev_device *vdev)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index ab42d06..ec6d54f 100644 (file)
@@ -35,6 +35,7 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
@@ -462,7 +463,7 @@ cryptodev_zuc_create(const char *name,
                return -EFAULT;
        }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
                        sizeof(struct zuc_private), init_params->socket_id,
                        vdev);
        if (dev == NULL) {
@@ -512,7 +513,7 @@ cryptodev_zuc_probe(struct rte_vdev_device *vdev)
                return -EINVAL;
        input_args = rte_vdev_device_args(vdev);
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
index 18f5e8c..ff3d7b8 100644 (file)
@@ -41,13 +41,14 @@ CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 
 # library source files
-SRCS-y += rte_cryptodev.c
+SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c
 
 # export include files
 SYMLINK-y-include += rte_crypto.h
 SYMLINK-y-include += rte_crypto_sym.h
 SYMLINK-y-include += rte_cryptodev.h
 SYMLINK-y-include += rte_cryptodev_pmd.h
+SYMLINK-y-include += rte_cryptodev_vdev.h
 
 # versioning export map
 EXPORT_MAP := rte_cryptodev_version.map
index 8e5382d..c0cfe94 100644 (file)
@@ -101,18 +101,6 @@ struct rte_cryptodev_callback {
        uint32_t active;                        /**< Callback is executing */
 };
 
-#define RTE_CRYPTODEV_VDEV_NAME                                ("name")
-#define RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG               ("max_nb_queue_pairs")
-#define RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG             ("max_nb_sessions")
-#define RTE_CRYPTODEV_VDEV_SOCKET_ID                   ("socket_id")
-
-static const char *cryptodev_vdev_valid_params[] = {
-       RTE_CRYPTODEV_VDEV_NAME,
-       RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,
-       RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,
-       RTE_CRYPTODEV_VDEV_SOCKET_ID
-};
-
 /**
  * The crypto cipher algorithm strings identifiers.
  * It could be used in application command line.
@@ -233,89 +221,6 @@ rte_crypto_auth_operation_strings[] = {
                [RTE_CRYPTO_AUTH_OP_GENERATE]   = "generate"
 };
 
-/** Parse integer from integer argument */
-static int
-parse_integer_arg(const char *key __rte_unused,
-               const char *value, void *extra_args)
-{
-       int *i = extra_args;
-
-       *i = atoi(value);
-       if (*i < 0) {
-               CDEV_LOG_ERR("Argument has to be positive.");
-               return -1;
-       }
-
-       return 0;
-}
-
-/** Parse name */
-static int
-parse_name_arg(const char *key __rte_unused,
-               const char *value, void *extra_args)
-{
-       struct rte_crypto_vdev_init_params *params = extra_args;
-
-       if (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
-               CDEV_LOG_ERR("Invalid name %s, should be less than "
-                               "%u bytes", value,
-                               RTE_CRYPTODEV_NAME_MAX_LEN - 1);
-               return -1;
-       }
-
-       strncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);
-
-       return 0;
-}
-
-int
-rte_cryptodev_parse_vdev_init_params(struct rte_crypto_vdev_init_params *params,
-               const char *input_args)
-{
-       struct rte_kvargs *kvlist = NULL;
-       int ret = 0;
-
-       if (params == NULL)
-               return -EINVAL;
-
-       if (input_args) {
-               kvlist = rte_kvargs_parse(input_args,
-                               cryptodev_vdev_valid_params);
-               if (kvlist == NULL)
-                       return -1;
-
-               ret = rte_kvargs_process(kvlist,
-                                       RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,
-                                       &parse_integer_arg,
-                                       &params->max_nb_queue_pairs);
-               if (ret < 0)
-                       goto free_kvlist;
-
-               ret = rte_kvargs_process(kvlist,
-                                       RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,
-                                       &parse_integer_arg,
-                                       &params->max_nb_sessions);
-               if (ret < 0)
-                       goto free_kvlist;
-
-               ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,
-                                       &parse_integer_arg,
-                                       &params->socket_id);
-               if (ret < 0)
-                       goto free_kvlist;
-
-               ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_NAME,
-                                       &parse_name_arg,
-                                       params);
-               if (ret < 0)
-                       goto free_kvlist;
-       }
-
-free_kvlist:
-       rte_kvargs_free(kvlist);
-       return ret;
-}
-
 const struct rte_cryptodev_symmetric_capability *
 rte_cryptodev_sym_capability_get(uint8_t dev_id,
                const struct rte_cryptodev_sym_capability_idx *idx)
@@ -645,38 +550,6 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev)
        return 0;
 }
 
-struct rte_cryptodev *
-rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size,
-               int socket_id, struct rte_vdev_device *vdev)
-{
-       struct rte_cryptodev *cryptodev;
-
-       /* allocate device structure */
-       cryptodev = rte_cryptodev_pmd_allocate(name, socket_id);
-       if (cryptodev == NULL)
-               return NULL;
-
-       /* allocate private device structure */
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               cryptodev->data->dev_private =
-                               rte_zmalloc_socket("cryptodev device private",
-                                               dev_private_size,
-                                               RTE_CACHE_LINE_SIZE,
-                                               socket_id);
-
-               if (cryptodev->data->dev_private == NULL)
-                       rte_panic("Cannot allocate memzone for private device"
-                                       " data");
-       }
-
-       cryptodev->device = &vdev->device;
-
-       /* initialise user call-back tail queue */
-       TAILQ_INIT(&(cryptodev->link_intr_cbs));
-
-       return cryptodev;
-}
-
 int
 rte_cryptodev_pci_probe(struct rte_pci_driver *pci_drv,
                        struct rte_pci_device *pci_dev)
index 89093f6..7f6fbf0 100644 (file)
@@ -386,35 +386,6 @@ struct rte_cryptodev_stats {
 
 #define RTE_CRYPTODEV_NAME_MAX_LEN     (64)
 /**< Max length of name of crypto PMD */
-#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS  8
-#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_SESSIONS     2048
-
-/**
- * @internal
- * Initialisation parameters for virtual crypto devices
- */
-struct rte_crypto_vdev_init_params {
-       unsigned max_nb_queue_pairs;
-       unsigned max_nb_sessions;
-       uint8_t socket_id;
-       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
-};
-
-/**
- * Parse virtual device initialisation parameters input arguments
- * @internal
- *
- * @params     params          Initialisation parameters with defaults set.
- * @params     input_args      Command line arguments
- *
- * @return
- * 0 on successful parse
- * <0 on failure to parse
- */
-int
-rte_cryptodev_parse_vdev_init_params(
-               struct rte_crypto_vdev_init_params *params,
-               const char *input_args);
 
 /**
  * Create a virtual crypto device
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c
new file mode 100644 (file)
index 0000000..ec5c33b
--- /dev/null
@@ -0,0 +1,155 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of the copyright holder nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <rte_malloc.h>
+
+#include "rte_cryptodev_vdev.h"
+#include "rte_cryptodev_pmd.h"
+
+/**
+ * Parse name from argument
+ */
+static int
+rte_cryptodev_vdev_parse_name_arg(const char *key __rte_unused,
+               const char *value, void *extra_args)
+{
+       struct rte_crypto_vdev_init_params *params = extra_args;
+
+       if (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {
+               CDEV_LOG_ERR("Invalid name %s, should be less than "
+                               "%u bytes", value,
+                               RTE_CRYPTODEV_NAME_MAX_LEN - 1);
+               return -1;
+       }
+
+       strncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);
+
+       return 0;
+}
+
+/**
+ * Parse integer from argument
+ */
+static int
+rte_cryptodev_vdev_parse_integer_arg(const char *key __rte_unused,
+               const char *value, void *extra_args)
+{
+       int *i = extra_args;
+
+       *i = atoi(value);
+       if (*i < 0) {
+               CDEV_LOG_ERR("Argument has to be positive.");
+               return -1;
+       }
+
+       return 0;
+}
+
+struct rte_cryptodev *
+rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size,
+               int socket_id, struct rte_vdev_device *vdev)
+{
+       struct rte_cryptodev *cryptodev;
+
+       /* allocate device structure */
+       cryptodev = rte_cryptodev_pmd_allocate(name, socket_id);
+       if (cryptodev == NULL)
+               return NULL;
+
+       /* allocate private device structure */
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               cryptodev->data->dev_private =
+                               rte_zmalloc_socket("cryptodev device private",
+                                               dev_private_size,
+                                               RTE_CACHE_LINE_SIZE,
+                                               socket_id);
+
+               if (cryptodev->data->dev_private == NULL)
+                       rte_panic("Cannot allocate memzone for private device"
+                                       " data");
+       }
+
+       cryptodev->device = &vdev->device;
+
+       /* initialise user call-back tail queue */
+       TAILQ_INIT(&(cryptodev->link_intr_cbs));
+
+       return cryptodev;
+}
+
+int
+rte_cryptodev_vdev_parse_init_params(struct rte_crypto_vdev_init_params *params,
+               const char *input_args)
+{
+       struct rte_kvargs *kvlist = NULL;
+       int ret = 0;
+
+       if (params == NULL)
+               return -EINVAL;
+
+       if (input_args) {
+               kvlist = rte_kvargs_parse(input_args,
+                               cryptodev_vdev_valid_params);
+               if (kvlist == NULL)
+                       return -1;
+
+               ret = rte_kvargs_process(kvlist,
+                                       RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,
+                                       &rte_cryptodev_vdev_parse_integer_arg,
+                                       &params->max_nb_queue_pairs);
+               if (ret < 0)
+                       goto free_kvlist;
+
+               ret = rte_kvargs_process(kvlist,
+                                       RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,
+                                       &rte_cryptodev_vdev_parse_integer_arg,
+                                       &params->max_nb_sessions);
+               if (ret < 0)
+                       goto free_kvlist;
+
+               ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,
+                                       &rte_cryptodev_vdev_parse_integer_arg,
+                                       &params->socket_id);
+               if (ret < 0)
+                       goto free_kvlist;
+
+               ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_NAME,
+                                       &rte_cryptodev_vdev_parse_name_arg,
+                                       params);
+               if (ret < 0)
+                       goto free_kvlist;
+       }
+
+free_kvlist:
+       rte_kvargs_free(kvlist);
+       return ret;
+}
index ec4ca97..0efe282 100644 (file)
@@ -455,24 +455,6 @@ struct rte_cryptodev_ops {
 struct rte_cryptodev *
 rte_cryptodev_pmd_allocate(const char *name, int socket_id);
 
-/**
- * Creates a new virtual crypto device and returns the pointer
- * to that device.
- *
- * @param      name                    PMD type name
- * @param      dev_private_size        Size of crypto PMDs private data
- * @param      socket_id               Socket to allocate resources on.
- * @param      vdev                    Pointer to virtual device structure.
- *
- * @return
- *   - Cryptodev pointer if device is successfully created.
- *   - NULL if device cannot be created.
- */
-struct rte_cryptodev *
-rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size,
-               int socket_id, struct rte_vdev_device *vdev);
-
-
 /**
  * Function for internal use by dummy drivers primarily, e.g. ring-based
  * driver.
diff --git a/lib/librte_cryptodev/rte_cryptodev_vdev.h b/lib/librte_cryptodev/rte_cryptodev_vdev.h
new file mode 100644 (file)
index 0000000..94ab9d3
--- /dev/null
@@ -0,0 +1,100 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2017 Intel Corporation. All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of the copyright holder nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_CRYPTODEV_VDEV_H_
+#define _RTE_CRYPTODEV_VDEV_H_
+
+#include <rte_vdev.h>
+#include <inttypes.h>
+
+#include "rte_cryptodev.h"
+
+#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS  8
+#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_SESSIONS     2048
+
+#define RTE_CRYPTODEV_VDEV_NAME                                ("name")
+#define RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG               ("max_nb_queue_pairs")
+#define RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG             ("max_nb_sessions")
+#define RTE_CRYPTODEV_VDEV_SOCKET_ID                   ("socket_id")
+
+static const char * const cryptodev_vdev_valid_params[] = {
+       RTE_CRYPTODEV_VDEV_NAME,
+       RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,
+       RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,
+       RTE_CRYPTODEV_VDEV_SOCKET_ID
+};
+
+/**
+ * @internal
+ * Initialisation parameters for virtual crypto devices
+ */
+struct rte_crypto_vdev_init_params {
+       unsigned int max_nb_queue_pairs;
+       unsigned int max_nb_sessions;
+       uint8_t socket_id;
+       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+};
+
+/**
+ * @internal
+ * Creates a new virtual crypto device and returns the pointer
+ * to that device.
+ *
+ * @param      name                    PMD type name
+ * @param      dev_private_size        Size of crypto PMDs private data
+ * @param      socket_id               Socket to allocate resources on.
+ * @param      vdev                    Pointer to virtual device structure.
+ *
+ * @return
+ *   - Cryptodev pointer if device is successfully created.
+ *   - NULL if device cannot be created.
+ */
+struct rte_cryptodev *
+rte_cryptodev_vdev_pmd_init(const char *name, size_t dev_private_size,
+               int socket_id, struct rte_vdev_device *vdev);
+
+/**
+ * @internal
+ * Parse virtual device initialisation parameters input arguments
+ *
+ * @params     params          Initialisation parameters with defaults set.
+ * @params     input_args      Command line arguments
+ *
+ * @return
+ * 0 on successful parse
+ * <0 on failure to parse
+ */
+int
+rte_cryptodev_vdev_parse_init_params(struct rte_crypto_vdev_init_params *params,
+               const char *input_args);
+
+#endif /* _RTE_CRYPTODEV_VDEV_H_ */
index 9ac510e..8c48b79 100644 (file)
@@ -15,7 +15,6 @@ DPDK_16.04 {
        rte_cryptodev_pmd_allocate;
        rte_cryptodev_pmd_callback_process;
        rte_cryptodev_pmd_release_device;
-       rte_cryptodev_pmd_virtual_dev_init;
        rte_cryptodev_sym_session_create;
        rte_cryptodev_sym_session_free;
        rte_cryptodev_socket_id;
@@ -32,20 +31,13 @@ DPDK_16.04 {
        local: *;
 };
 
-DPDK_16.07 {
-       global:
-
-       rte_cryptodev_parse_vdev_init_params;
-
-} DPDK_16.04;
-
 DPDK_16.11 {
        global:
 
        rte_cryptodev_pci_probe;
        rte_cryptodev_pci_remove;
 
-} DPDK_16.07;
+} DPDK_16.04;
 
 DPDK_17.02 {
        global:
@@ -74,3 +66,11 @@ DPDK_17.05 {
        rte_cryptodev_queue_pair_detach_sym_session;
 
 } DPDK_17.02;
+
+DPDK_17.08 {
+       global:
+
+       rte_cryptodev_vdev_parse_init_params;
+       rte_cryptodev_vdev_pmd_init;
+
+} DPDK_17.05;