Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/24541/?format=api
{ "id": 24541, "url": "https://patches.dpdk.org/api/patches/24541/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1495639634-74846-7-git-send-email-pablo.de.lara.guarch@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1495639634-74846-7-git-send-email-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1495639634-74846-7-git-send-email-pablo.de.lara.guarch@intel.com", "date": "2017-05-24T15:27:08", "name": "[dpdk-dev,06/12] cryptodev: move vdev functions to a separate file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ce5e3b1ad132041b343e288bd2449b7564d325f2", "submitter": { "id": 9, "url": "https://patches.dpdk.org/api/people/9/?format=api", "name": "De Lara Guarch, Pablo", "email": "pablo.de.lara.guarch@intel.com" }, "delegate": { "id": 22, "url": "https://patches.dpdk.org/api/users/22/?format=api", "username": "pdelarag", "first_name": "Pablo", "last_name": "de Lara Guarch", "email": "pablo.de.lara.guarch@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1495639634-74846-7-git-send-email-pablo.de.lara.guarch@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/24541/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/24541/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 94B809183;\n\tWed, 24 May 2017 17:27:20 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 7834C7D62\n\tfor <dev@dpdk.org>; Wed, 24 May 2017 17:27:04 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t24 May 2017 08:27:04 -0700", "from silpixa00381631.ir.intel.com (HELO\n\tsilpixa00381631.ger.corp.intel.com) ([10.237.222.122])\n\tby fmsmga004.fm.intel.com with ESMTP; 24 May 2017 08:27:02 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.38,386,1491289200\"; d=\"scan'208\";a=\"265893704\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "declan.doherty@intel.com,\n\tthomas@monjalon.net", "Cc": "dev@dpdk.org,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>", "Date": "Wed, 24 May 2017 16:27:08 +0100", "Message-Id": "<1495639634-74846-7-git-send-email-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1495639634-74846-1-git-send-email-pablo.de.lara.guarch@intel.com>", "References": "<1495639634-74846-1-git-send-email-pablo.de.lara.guarch@intel.com>", "Subject": "[dpdk-dev] [PATCH 06/12] cryptodev: move vdev functions to a\n\tseparate file", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Move all functions handling virtual devices to a separate\nheader file \"rte_cryptodev_vdev.h\", in order to leave only\ngeneric functions for any device in the rest of the files.\n\nSigned-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n---\n drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 1 +\n drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 1 +\n drivers/crypto/armv8/rte_armv8_pmd.c | 1 +\n drivers/crypto/kasumi/rte_kasumi_pmd.c | 1 +\n drivers/crypto/null/null_crypto_pmd.c | 1 +\n drivers/crypto/openssl/rte_openssl_pmd.c | 1 +\n drivers/crypto/scheduler/scheduler_pmd.c | 52 +-----\n drivers/crypto/scheduler/scheduler_pmd_ops.c | 1 +\n drivers/crypto/snow3g/rte_snow3g_pmd.c | 1 +\n drivers/crypto/zuc/rte_zuc_pmd.c | 1 +\n lib/librte_cryptodev/Makefile | 1 +\n lib/librte_cryptodev/rte_cryptodev.c | 149 ----------------\n lib/librte_cryptodev/rte_cryptodev.h | 29 ---\n lib/librte_cryptodev/rte_cryptodev_pmd.h | 18 --\n lib/librte_cryptodev/rte_cryptodev_vdev.h | 236 +++++++++++++++++++++++++\n lib/librte_cryptodev/rte_cryptodev_version.map | 10 +-\n 16 files changed, 248 insertions(+), 256 deletions(-)\n create mode 100644 lib/librte_cryptodev/rte_cryptodev_vdev.h", "diff": "diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\nindex 246f71e..4d7aa4f 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n@@ -35,6 +35,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c\nindex 49d3f32..80ab7ec 100644\n--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c\n+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c\n@@ -34,6 +34,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c\nindex 29905d6..8ed26db 100644\n--- a/drivers/crypto/armv8/rte_armv8_pmd.c\n+++ b/drivers/crypto/armv8/rte_armv8_pmd.c\n@@ -36,6 +36,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c\nindex a95f503..ac80473 100644\n--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c\n+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c\n@@ -35,6 +35,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c\nindex 8124eba..703434f 100644\n--- a/drivers/crypto/null/null_crypto_pmd.c\n+++ b/drivers/crypto/null/null_crypto_pmd.c\n@@ -33,6 +33,7 @@\n #include <rte_common.h>\n #include <rte_config.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n \ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c\nindex 13a5129..a6438a8 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd.c\n@@ -34,6 +34,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c\nindex acec102..53ebd5e 100644\n--- a/drivers/crypto/scheduler/scheduler_pmd.c\n+++ b/drivers/crypto/scheduler/scheduler_pmd.c\n@@ -33,6 +33,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\n@@ -221,57 +222,6 @@ cryptodev_scheduler_remove(struct rte_vdev_device *vdev)\n \treturn 0;\n }\n \n-static uint8_t\n-number_of_sockets(void)\n-{\n-\tint sockets = 0;\n-\tint i;\n-\tconst struct rte_memseg *ms = rte_eal_get_physmem_layout();\n-\n-\tfor (i = 0; ((i < RTE_MAX_MEMSEG) && (ms[i].addr != NULL)); i++) {\n-\t\tif (sockets < ms[i].socket_id)\n-\t\t\tsockets = ms[i].socket_id;\n-\t}\n-\n-\t/* Number of sockets = maximum socket_id + 1 */\n-\treturn ++sockets;\n-}\n-\n-/** Parse integer from integer argument */\n-static int\n-parse_integer_arg(const char *key __rte_unused,\n-\t\tconst char *value, void *extra_args)\n-{\n-\tint *i = (int *) extra_args;\n-\n-\t*i = atoi(value);\n-\tif (*i < 0) {\n-\t\tCS_LOG_ERR(\"Argument has to be positive.\\n\");\n-\t\treturn -EINVAL;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-/** Parse name */\n-static int\n-parse_name_arg(const char *key __rte_unused,\n-\t\tconst char *value, void *extra_args)\n-{\n-\tstruct rte_crypto_vdev_init_params *params = extra_args;\n-\n-\tif (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {\n-\t\tCS_LOG_ERR(\"Invalid name %s, should be less than \"\n-\t\t\t\t\"%u bytes.\\n\", value,\n-\t\t\t\tRTE_CRYPTODEV_NAME_MAX_LEN - 1);\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tstrncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);\n-\n-\treturn 0;\n-}\n-\n /** Parse slave */\n static int\n parse_slave_arg(const char *key __rte_unused,\ndiff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c\nindex 2b5858d..4fc8b91 100644\n--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c\n+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c\n@@ -37,6 +37,7 @@\n #include <rte_dev.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_reorder.h>\n \n #include \"scheduler_pmd_private.h\"\ndiff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c\nindex f17c541..855be72 100644\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c\n+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c\n@@ -35,6 +35,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c\nindex ab42d06..7681587 100644\n--- a/drivers/crypto/zuc/rte_zuc_pmd.c\n+++ b/drivers/crypto/zuc/rte_zuc_pmd.c\n@@ -35,6 +35,7 @@\n #include <rte_hexdump.h>\n #include <rte_cryptodev.h>\n #include <rte_cryptodev_pmd.h>\n+#include <rte_cryptodev_vdev.h>\n #include <rte_vdev.h>\n #include <rte_malloc.h>\n #include <rte_cpuflags.h>\ndiff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile\nindex 18f5e8c..4d37acf 100644\n--- a/lib/librte_cryptodev/Makefile\n+++ b/lib/librte_cryptodev/Makefile\n@@ -48,6 +48,7 @@ SYMLINK-y-include += rte_crypto.h\n SYMLINK-y-include += rte_crypto_sym.h\n SYMLINK-y-include += rte_cryptodev.h\n SYMLINK-y-include += rte_cryptodev_pmd.h\n+SYMLINK-y-include += rte_cryptodev_vdev.h\n \n # versioning export map\n EXPORT_MAP := rte_cryptodev_version.map\ndiff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c\nindex 85e4936..2a84ee6 100644\n--- a/lib/librte_cryptodev/rte_cryptodev.c\n+++ b/lib/librte_cryptodev/rte_cryptodev.c\n@@ -101,18 +101,6 @@ struct rte_cryptodev_callback {\n \tuint32_t active;\t\t\t/**< Callback is executing */\n };\n \n-#define RTE_CRYPTODEV_VDEV_NAME\t\t\t\t(\"name\")\n-#define RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG\t\t(\"max_nb_queue_pairs\")\n-#define RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG\t\t(\"max_nb_sessions\")\n-#define RTE_CRYPTODEV_VDEV_SOCKET_ID\t\t\t(\"socket_id\")\n-\n-static const char *cryptodev_vdev_valid_params[] = {\n-\tRTE_CRYPTODEV_VDEV_NAME,\n-\tRTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,\n-\tRTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,\n-\tRTE_CRYPTODEV_VDEV_SOCKET_ID\n-};\n-\n /**\n * The crypto cipher algorithm strings identifiers.\n * It could be used in application command line.\n@@ -233,111 +221,6 @@ rte_crypto_auth_operation_strings[] = {\n \t\t[RTE_CRYPTO_AUTH_OP_GENERATE]\t= \"generate\"\n };\n \n-static uint8_t\n-number_of_sockets(void)\n-{\n-\tint sockets = 0;\n-\tint i;\n-\tconst struct rte_memseg *ms = rte_eal_get_physmem_layout();\n-\n-\tfor (i = 0; ((i < RTE_MAX_MEMSEG) && (ms[i].addr != NULL)); i++) {\n-\t\tif (sockets < ms[i].socket_id)\n-\t\t\tsockets = ms[i].socket_id;\n-\t}\n-\n-\t/* Number of sockets = maximum socket_id + 1 */\n-\treturn ++sockets;\n-}\n-\n-/** Parse integer from integer argument */\n-static int\n-parse_integer_arg(const char *key __rte_unused,\n-\t\tconst char *value, void *extra_args)\n-{\n-\tint *i = extra_args;\n-\n-\t*i = atoi(value);\n-\tif (*i < 0) {\n-\t\tCDEV_LOG_ERR(\"Argument has to be positive.\");\n-\t\treturn -1;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-/** Parse name */\n-static int\n-parse_name_arg(const char *key __rte_unused,\n-\t\tconst char *value, void *extra_args)\n-{\n-\tstruct rte_crypto_vdev_init_params *params = extra_args;\n-\n-\tif (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {\n-\t\tCDEV_LOG_ERR(\"Invalid name %s, should be less than \"\n-\t\t\t\t\"%u bytes\", value,\n-\t\t\t\tRTE_CRYPTODEV_NAME_MAX_LEN - 1);\n-\t\treturn -1;\n-\t}\n-\n-\tstrncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);\n-\n-\treturn 0;\n-}\n-\n-int\n-rte_cryptodev_parse_vdev_init_params(struct rte_crypto_vdev_init_params *params,\n-\t\tconst char *input_args)\n-{\n-\tstruct rte_kvargs *kvlist = NULL;\n-\tint ret = 0;\n-\n-\tif (params == NULL)\n-\t\treturn -EINVAL;\n-\n-\tif (input_args) {\n-\t\tkvlist = rte_kvargs_parse(input_args,\n-\t\t\t\tcryptodev_vdev_valid_params);\n-\t\tif (kvlist == NULL)\n-\t\t\treturn -1;\n-\n-\t\tret = rte_kvargs_process(kvlist,\n-\t\t\t\t\tRTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,\n-\t\t\t\t\t&parse_integer_arg,\n-\t\t\t\t\t¶ms->max_nb_queue_pairs);\n-\t\tif (ret < 0)\n-\t\t\tgoto free_kvlist;\n-\n-\t\tret = rte_kvargs_process(kvlist,\n-\t\t\t\t\tRTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,\n-\t\t\t\t\t&parse_integer_arg,\n-\t\t\t\t\t¶ms->max_nb_sessions);\n-\t\tif (ret < 0)\n-\t\t\tgoto free_kvlist;\n-\n-\t\tret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,\n-\t\t\t\t\t&parse_integer_arg,\n-\t\t\t\t\t¶ms->socket_id);\n-\t\tif (ret < 0)\n-\t\t\tgoto free_kvlist;\n-\n-\t\tret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_NAME,\n-\t\t\t\t\t&parse_name_arg,\n-\t\t\t\t\tparams);\n-\t\tif (ret < 0)\n-\t\t\tgoto free_kvlist;\n-\n-\t\tif (params->socket_id >= number_of_sockets()) {\n-\t\t\tCDEV_LOG_ERR(\"Invalid socket id specified to create \"\n-\t\t\t\t\"the virtual crypto device on\");\n-\t\t\tgoto free_kvlist;\n-\t\t}\n-\t}\n-\n-free_kvlist:\n-\trte_kvargs_free(kvlist);\n-\treturn ret;\n-}\n-\n const struct rte_cryptodev_symmetric_capability *\n rte_cryptodev_sym_capability_get(uint8_t dev_id,\n \t\tconst struct rte_cryptodev_sym_capability_idx *idx)\n@@ -666,38 +549,6 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev)\n \treturn 0;\n }\n \n-struct rte_cryptodev *\n-rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size,\n-\t\tint socket_id, struct rte_vdev_device *vdev)\n-{\n-\tstruct rte_cryptodev *cryptodev;\n-\n-\t/* allocate device structure */\n-\tcryptodev = rte_cryptodev_pmd_allocate(name, socket_id);\n-\tif (cryptodev == NULL)\n-\t\treturn NULL;\n-\n-\t/* allocate private device structure */\n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n-\t\tcryptodev->data->dev_private =\n-\t\t\t\trte_zmalloc_socket(\"cryptodev device private\",\n-\t\t\t\t\t\tdev_private_size,\n-\t\t\t\t\t\tRTE_CACHE_LINE_SIZE,\n-\t\t\t\t\t\tsocket_id);\n-\n-\t\tif (cryptodev->data->dev_private == NULL)\n-\t\t\trte_panic(\"Cannot allocate memzone for private device\"\n-\t\t\t\t\t\" data\");\n-\t}\n-\n-\tcryptodev->device = &vdev->device;\n-\n-\t/* initialise user call-back tail queue */\n-\tTAILQ_INIT(&(cryptodev->link_intr_cbs));\n-\n-\treturn cryptodev;\n-}\n-\n int\n rte_cryptodev_pci_probe(struct rte_pci_driver *pci_drv,\n \t\t\tstruct rte_pci_device *pci_dev)\ndiff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h\nindex 89093f6..7f6fbf0 100644\n--- a/lib/librte_cryptodev/rte_cryptodev.h\n+++ b/lib/librte_cryptodev/rte_cryptodev.h\n@@ -386,35 +386,6 @@ struct rte_cryptodev_stats {\n \n #define RTE_CRYPTODEV_NAME_MAX_LEN\t(64)\n /**< Max length of name of crypto PMD */\n-#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS\t8\n-#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_SESSIONS\t2048\n-\n-/**\n- * @internal\n- * Initialisation parameters for virtual crypto devices\n- */\n-struct rte_crypto_vdev_init_params {\n-\tunsigned max_nb_queue_pairs;\n-\tunsigned max_nb_sessions;\n-\tuint8_t socket_id;\n-\tchar name[RTE_CRYPTODEV_NAME_MAX_LEN];\n-};\n-\n-/**\n- * Parse virtual device initialisation parameters input arguments\n- * @internal\n- *\n- * @params\tparams\t\tInitialisation parameters with defaults set.\n- * @params\tinput_args\tCommand line arguments\n- *\n- * @return\n- * 0 on successful parse\n- * <0 on failure to parse\n- */\n-int\n-rte_cryptodev_parse_vdev_init_params(\n-\t\tstruct rte_crypto_vdev_init_params *params,\n-\t\tconst char *input_args);\n \n /**\n * Create a virtual crypto device\ndiff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h\nindex ec4ca97..0efe282 100644\n--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h\n+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h\n@@ -456,24 +456,6 @@ struct rte_cryptodev *\n rte_cryptodev_pmd_allocate(const char *name, int socket_id);\n \n /**\n- * Creates a new virtual crypto device and returns the pointer\n- * to that device.\n- *\n- * @param\tname\t\t\tPMD type name\n- * @param\tdev_private_size\tSize of crypto PMDs private data\n- * @param\tsocket_id\t\tSocket to allocate resources on.\n- * @param\tvdev\t\t\tPointer to virtual device structure.\n- *\n- * @return\n- * - Cryptodev pointer if device is successfully created.\n- * - NULL if device cannot be created.\n- */\n-struct rte_cryptodev *\n-rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size,\n-\t\tint socket_id, struct rte_vdev_device *vdev);\n-\n-\n-/**\n * Function for internal use by dummy drivers primarily, e.g. ring-based\n * driver.\n * Release the specified cryptodev device.\ndiff --git a/lib/librte_cryptodev/rte_cryptodev_vdev.h b/lib/librte_cryptodev/rte_cryptodev_vdev.h\nnew file mode 100644\nindex 0000000..6ac337b\n--- /dev/null\n+++ b/lib/librte_cryptodev/rte_cryptodev_vdev.h\n@@ -0,0 +1,236 @@\n+/*-\n+ * BSD LICENSE\n+ *\n+ * Copyright(c) 2017 Intel Corporation. All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of the copyright holder nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+#ifndef _RTE_CRYPTODEV_VDEV_H_\n+#define _RTE_CRYPTODEV_VDEV_H_\n+\n+#include <rte_vdev.h>\n+\n+#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS\t8\n+#define RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_SESSIONS\t2048\n+\n+#define RTE_CRYPTODEV_VDEV_NAME\t\t\t\t(\"name\")\n+#define RTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG\t\t(\"max_nb_queue_pairs\")\n+#define RTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG\t\t(\"max_nb_sessions\")\n+#define RTE_CRYPTODEV_VDEV_SOCKET_ID\t\t\t(\"socket_id\")\n+\n+static const char *cryptodev_vdev_valid_params[] = {\n+\tRTE_CRYPTODEV_VDEV_NAME,\n+\tRTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,\n+\tRTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,\n+\tRTE_CRYPTODEV_VDEV_SOCKET_ID\n+};\n+\n+/**\n+ * @internal\n+ * Initialisation parameters for virtual crypto devices\n+ */\n+struct rte_crypto_vdev_init_params {\n+\tunsigned int max_nb_queue_pairs;\n+\tunsigned int max_nb_sessions;\n+\tuint8_t socket_id;\n+\tchar name[RTE_CRYPTODEV_NAME_MAX_LEN];\n+};\n+\n+/**\n+ * @internal\n+ * Parse name from argument\n+ */\n+static int\n+parse_name_arg(const char *key __rte_unused,\n+\t\tconst char *value, void *extra_args)\n+{\n+\tstruct rte_crypto_vdev_init_params *params = extra_args;\n+\n+\tif (strlen(value) >= RTE_CRYPTODEV_NAME_MAX_LEN - 1) {\n+\t\tCDEV_LOG_ERR(\"Invalid name %s, should be less than \"\n+\t\t\t\t\"%u bytes\", value,\n+\t\t\t\tRTE_CRYPTODEV_NAME_MAX_LEN - 1);\n+\t\treturn -1;\n+\t}\n+\n+\tstrncpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * @internal\n+ * Parse integer from argument\n+ */\n+static int\n+parse_integer_arg(const char *key __rte_unused,\n+\t\tconst char *value, void *extra_args)\n+{\n+\tint *i = extra_args;\n+\n+\t*i = atoi(value);\n+\tif (*i < 0) {\n+\t\tCDEV_LOG_ERR(\"Argument has to be positive.\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * @internal\n+ * Return number of sockets with memory reserved\n+ */\n+static uint8_t\n+number_of_sockets(void)\n+{\n+\tint sockets = 0;\n+\tint i;\n+\tconst struct rte_memseg *ms = rte_eal_get_physmem_layout();\n+\n+\tfor (i = 0; ((i < RTE_MAX_MEMSEG) && (ms[i].addr != NULL)); i++) {\n+\t\tif (sockets < ms[i].socket_id)\n+\t\t\tsockets = ms[i].socket_id;\n+\t}\n+\n+\t/* Number of sockets = maximum socket_id + 1 */\n+\treturn ++sockets;\n+}\n+\n+/**\n+ * @internal\n+ * Creates a new virtual crypto device and returns the pointer\n+ * to that device.\n+ *\n+ * @param\tname\t\t\tPMD type name\n+ * @param\tdev_private_size\tSize of crypto PMDs private data\n+ * @param\tsocket_id\t\tSocket to allocate resources on.\n+ * @param\tvdev\t\t\tPointer to virtual device structure.\n+ *\n+ * @return\n+ * - Cryptodev pointer if device is successfully created.\n+ * - NULL if device cannot be created.\n+ */\n+static inline struct rte_cryptodev *\n+rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size,\n+\t\tint socket_id, struct rte_vdev_device *vdev)\n+{\n+\tstruct rte_cryptodev *cryptodev;\n+\n+\t/* allocate device structure */\n+\tcryptodev = rte_cryptodev_pmd_allocate(name, socket_id);\n+\tif (cryptodev == NULL)\n+\t\treturn NULL;\n+\n+\t/* allocate private device structure */\n+\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n+\t\tcryptodev->data->dev_private =\n+\t\t\t\trte_zmalloc_socket(\"cryptodev device private\",\n+\t\t\t\t\t\tdev_private_size,\n+\t\t\t\t\t\tRTE_CACHE_LINE_SIZE,\n+\t\t\t\t\t\tsocket_id);\n+\n+\t\tif (cryptodev->data->dev_private == NULL)\n+\t\t\trte_panic(\"Cannot allocate memzone for private device\"\n+\t\t\t\t\t\" data\");\n+\t}\n+\n+\tcryptodev->device = &vdev->device;\n+\n+\t/* initialise user call-back tail queue */\n+\tTAILQ_INIT(&(cryptodev->link_intr_cbs));\n+\n+\treturn cryptodev;\n+}\n+\n+/**\n+ * @internal\n+ * Parse virtual device initialisation parameters input arguments\n+ *\n+ * @params\tparams\t\tInitialisation parameters with defaults set.\n+ * @params\tinput_args\tCommand line arguments\n+ *\n+ * @return\n+ * 0 on successful parse\n+ * <0 on failure to parse\n+ */\n+static inline int\n+rte_cryptodev_parse_vdev_init_params(struct rte_crypto_vdev_init_params *params,\n+\t\tconst char *input_args)\n+{\n+\tstruct rte_kvargs *kvlist = NULL;\n+\tint ret = 0;\n+\n+\tif (params == NULL)\n+\t\treturn -EINVAL;\n+\n+\tif (input_args) {\n+\t\tkvlist = rte_kvargs_parse(input_args,\n+\t\t\t\tcryptodev_vdev_valid_params);\n+\t\tif (kvlist == NULL)\n+\t\t\treturn -1;\n+\n+\t\tret = rte_kvargs_process(kvlist,\n+\t\t\t\t\tRTE_CRYPTODEV_VDEV_MAX_NB_QP_ARG,\n+\t\t\t\t\t&parse_integer_arg,\n+\t\t\t\t\t¶ms->max_nb_queue_pairs);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\n+\t\tret = rte_kvargs_process(kvlist,\n+\t\t\t\t\tRTE_CRYPTODEV_VDEV_MAX_NB_SESS_ARG,\n+\t\t\t\t\t&parse_integer_arg,\n+\t\t\t\t\t¶ms->max_nb_sessions);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\n+\t\tret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,\n+\t\t\t\t\t&parse_integer_arg,\n+\t\t\t\t\t¶ms->socket_id);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\n+\t\tret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_NAME,\n+\t\t\t\t\t&parse_name_arg,\n+\t\t\t\t\tparams);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\n+\t\tif (params->socket_id >= number_of_sockets()) {\n+\t\t\tCDEV_LOG_ERR(\"Invalid socket id specified to create \"\n+\t\t\t\t\"the virtual crypto device on\");\n+\t\t\tgoto free_kvlist;\n+\t\t}\n+\t}\n+\n+free_kvlist:\n+\trte_kvargs_free(kvlist);\n+\treturn ret;\n+}\n+\n+#endif /* _RTE_CRYPTODEV_VDEV_H_ */\ndiff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map\nindex 9ac510e..d519234 100644\n--- a/lib/librte_cryptodev/rte_cryptodev_version.map\n+++ b/lib/librte_cryptodev/rte_cryptodev_version.map\n@@ -15,7 +15,6 @@ DPDK_16.04 {\n \trte_cryptodev_pmd_allocate;\n \trte_cryptodev_pmd_callback_process;\n \trte_cryptodev_pmd_release_device;\n-\trte_cryptodev_pmd_virtual_dev_init;\n \trte_cryptodev_sym_session_create;\n \trte_cryptodev_sym_session_free;\n \trte_cryptodev_socket_id;\n@@ -32,20 +31,13 @@ DPDK_16.04 {\n \tlocal: *;\n };\n \n-DPDK_16.07 {\n-\tglobal:\n-\n-\trte_cryptodev_parse_vdev_init_params;\n-\n-} DPDK_16.04;\n-\n DPDK_16.11 {\n \tglobal:\n \n \trte_cryptodev_pci_probe;\n \trte_cryptodev_pci_remove;\n \n-} DPDK_16.07;\n+} DPDK_16.04;\n \n DPDK_17.02 {\n \tglobal:\n", "prefixes": [ "dpdk-dev", "06/12" ] }