Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114627/?format=api
{ "id": 114627, "url": "http://patches.dpdk.org/api/patches/114627/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220804165839.1074817-5-cristian.dumitrescu@intel.com/", "project": { "id": 1, "url": "http://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": "<20220804165839.1074817-5-cristian.dumitrescu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220804165839.1074817-5-cristian.dumitrescu@intel.com", "date": "2022-08-04T16:58:22", "name": "[04/21] net/softnic: remove cryptodev support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "43a81649bd35a05bcd5dbf34e854805992b0d22e", "submitter": { "id": 19, "url": "http://patches.dpdk.org/api/people/19/?format=api", "name": "Cristian Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220804165839.1074817-5-cristian.dumitrescu@intel.com/mbox/", "series": [ { "id": 24205, "url": "http://patches.dpdk.org/api/series/24205/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24205", "date": "2022-08-04T16:58:18", "name": "net/softnic: replace the legacy pipeline with SWX pipeline", "version": 1, "mbox": "http://patches.dpdk.org/series/24205/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/114627/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/114627/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8D706A00C4;\n\tThu, 4 Aug 2022 18:59:21 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C71AE42C09;\n\tThu, 4 Aug 2022 18:58:58 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id 1945B42BE8\n for <dev@dpdk.org>; Thu, 4 Aug 2022 18:58:53 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 04 Aug 2022 09:58:49 -0700", "from silpixa00400573.ir.intel.com (HELO\n silpixa00400573.ger.corp.intel.com) ([10.237.223.157])\n by orsmga001.jf.intel.com with ESMTP; 04 Aug 2022 09:58:48 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1659632334; x=1691168334;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=HvyFX9xalBofYK7SjFBXjTpxxHepbB7sYFI/oC0GSMU=;\n b=c9SsVJ3fHGzQQAIVBWV8ikWHpzQvwupE1eT7BYGullEpZkexvs48zr77\n 4m/YoWIiPI0R3IUFF793/Y4xroZfNoUrVq6we4O+OkeU4BcRce4+KcUT4\n XE8MWDFGn6kW09DR3j780Eb6yiUPPruRyGaRPNbL6R5ls75VfowrwLeDj\n IhD4xNwroLOqtDo0sXJYU5/9EOimPlpz6l6ZygLVqV6h+YmXLQnXIXoYA\n +4y1Vg5G6cXgSZGd73TYFz8PJM6Jq1glbIwMXeqfsm3pY7Nj+yX+rC0dY\n AIGBiQi2/uGPdFL0MDhYQXn2iO52EWPc8z3C4p8Bo2Ke6JD+8Uv5c43jA Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10429\"; a=\"290000097\"", "E=Sophos;i=\"5.93,216,1654585200\"; d=\"scan'208\";a=\"290000097\"", "E=Sophos;i=\"5.93,216,1654585200\"; d=\"scan'208\";a=\"636163110\"" ], "X-ExtLoop1": "1", "From": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "To": "dev@dpdk.org", "Cc": "jasvinder.singh@intel.com,\n\tyogesh.jangra@intel.com", "Subject": "[PATCH 04/21] net/softnic: remove cryptodev support", "Date": "Thu, 4 Aug 2022 16:58:22 +0000", "Message-Id": "<20220804165839.1074817-5-cristian.dumitrescu@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220804165839.1074817-1-cristian.dumitrescu@intel.com>", "References": "<20220804165839.1074817-1-cristian.dumitrescu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Remove the cryptographic device API support.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Yogesh Jangra <yogesh.jangra@intel.com>\n---\n drivers/net/softnic/meson.build | 3 +-\n drivers/net/softnic/rte_eth_softnic.c | 1 -\n drivers/net/softnic/rte_eth_softnic_cli.c | 171 ------------------\n .../net/softnic/rte_eth_softnic_cryptodev.c | 168 -----------------\n .../net/softnic/rte_eth_softnic_internals.h | 54 ------\n .../net/softnic/rte_eth_softnic_pipeline.c | 54 ------\n 6 files changed, 1 insertion(+), 450 deletions(-)\n delete mode 100644 drivers/net/softnic/rte_eth_softnic_cryptodev.c", "diff": "diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build\nindex d466dc7700..b3d235841d 100644\n--- a/drivers/net/softnic/meson.build\n+++ b/drivers/net/softnic/meson.build\n@@ -12,7 +12,6 @@ sources = files(\n 'rte_eth_softnic.c',\n 'rte_eth_softnic_action.c',\n 'rte_eth_softnic_cli.c',\n- 'rte_eth_softnic_cryptodev.c',\n 'rte_eth_softnic_link.c',\n 'rte_eth_softnic_mempool.c',\n 'rte_eth_softnic_pipeline.c',\n@@ -20,4 +19,4 @@ sources = files(\n 'rte_eth_softnic_tap.c',\n 'rte_eth_softnic_thread.c',\n )\n-deps += ['pipeline', 'port', 'table', 'cryptodev']\n+deps += ['pipeline', 'port', 'table']\ndiff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex a7136bb0c0..1ea5989223 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -264,7 +264,6 @@ pmd_init(struct pmd_params *params)\n \tsoftnic_swq_init(p);\n \tsoftnic_link_init(p);\n \tsoftnic_tap_init(p);\n-\tsoftnic_cryptodev_init(p);\n \tsoftnic_port_in_action_profile_init(p);\n \tsoftnic_table_action_profile_init(p);\n \tsoftnic_pipeline_init(p);\ndiff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c\nindex 671f96cf77..bca0b176d6 100644\n--- a/drivers/net/softnic/rte_eth_softnic_cli.c\n+++ b/drivers/net/softnic/rte_eth_softnic_cli.c\n@@ -213,80 +213,6 @@ cmd_tap(struct pmd_internals *softnic,\n \t}\n }\n \n-/**\n- * cryptodev <tap_name> dev <device_name> | dev_id <device_id>\n- * queue <n_queues> <queue_size> max_sessions <n_sessions>\n- **/\n-\n-static void\n-cmd_cryptodev(struct pmd_internals *softnic,\n-\t\tchar **tokens,\n-\t\tuint32_t n_tokens,\n-\t\tchar *out,\n-\t\tsize_t out_size)\n-{\n-\tstruct softnic_cryptodev_params params;\n-\tchar *name;\n-\n-\tmemset(¶ms, 0, sizeof(params));\n-\tif (n_tokens != 9) {\n-\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n-\t\treturn;\n-\t}\n-\n-\tname = tokens[1];\n-\n-\tif (strcmp(tokens[2], \"dev\") == 0)\n-\t\tparams.dev_name = tokens[3];\n-\telse if (strcmp(tokens[2], \"dev_id\") == 0) {\n-\t\tif (softnic_parser_read_uint32(¶ms.dev_id, tokens[3]) < 0) {\n-\t\t\tsnprintf(out, out_size,\tMSG_ARG_INVALID,\n-\t\t\t\t\"dev_id\");\n-\t\t\treturn;\n-\t\t}\n-\t} else {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_INVALID,\n-\t\t\t\"cryptodev\");\n-\t\treturn;\n-\t}\n-\n-\tif (strcmp(tokens[4], \"queue\")) {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_NOT_FOUND,\n-\t\t\t\"4\");\n-\t\treturn;\n-\t}\n-\n-\tif (softnic_parser_read_uint32(¶ms.n_queues, tokens[5]) < 0) {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_INVALID,\n-\t\t\t\"q\");\n-\t\treturn;\n-\t}\n-\n-\tif (softnic_parser_read_uint32(¶ms.queue_size, tokens[6]) < 0) {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_INVALID,\n-\t\t\t\"queue_size\");\n-\t\treturn;\n-\t}\n-\n-\tif (strcmp(tokens[7], \"max_sessions\")) {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_NOT_FOUND,\n-\t\t\t\"4\");\n-\t\treturn;\n-\t}\n-\n-\tif (softnic_parser_read_uint32(¶ms.session_pool_size, tokens[8])\n-\t\t\t< 0) {\n-\t\tsnprintf(out, out_size,\tMSG_ARG_INVALID,\n-\t\t\t\"q\");\n-\t\treturn;\n-\t}\n-\n-\tif (softnic_cryptodev_create(softnic, name, ¶ms) == NULL) {\n-\t\tsnprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);\n-\t\treturn;\n-\t}\n-}\n-\n /**\n * port in action profile <profile_name>\n * [filter match | mismatch offset <key_offset> mask <key_mask> key <key_value> port <port_id>]\n@@ -879,41 +805,6 @@ cmd_table_action_profile(struct pmd_internals *softnic,\n \t\tt0 += 1;\n \t} /* decap */\n \n-\tif (t0 < n_tokens && (strcmp(tokens[t0], \"sym_crypto\") == 0)) {\n-\t\tstruct softnic_cryptodev *cryptodev;\n-\n-\t\tif (n_tokens < t0 + 5 ||\n-\t\t\t\tstrcmp(tokens[t0 + 1], \"dev\") ||\n-\t\t\t\tstrcmp(tokens[t0 + 3], \"offset\")) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n-\t\t\t\t\"table action profile sym_crypto\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tcryptodev = softnic_cryptodev_find(softnic, tokens[t0 + 2]);\n-\t\tif (cryptodev == NULL) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID,\n-\t\t\t\t\"table action profile sym_crypto\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tp.sym_crypto.cryptodev_id = cryptodev->dev_id;\n-\n-\t\tif (softnic_parser_read_uint32(&p.sym_crypto.op_offset,\n-\t\t\t\ttokens[t0 + 4]) != 0) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID,\n-\t\t\t\t\t\"table action profile sym_crypto\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tp.sym_crypto.mp_create = cryptodev->mp_create;\n-\t\tp.sym_crypto.mp_init = cryptodev->mp_init;\n-\n-\t\tp.action_mask |= 1LLU << RTE_TABLE_ACTION_SYM_CRYPTO;\n-\n-\t\tt0 += 5;\n-\t} /* sym_crypto */\n-\n \tif (t0 < n_tokens) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n@@ -985,7 +876,6 @@ cmd_pipeline(struct pmd_internals *softnic,\n * | swq <swq_name>\n * | tap <tap_name> mempool <mempool_name> mtu <mtu>\n * | source mempool <mempool_name> file <file_name> bpp <n_bytes_per_pkt>\n- * | cryptodev <cryptodev_name> rxq <queue_id>\n * [action <port_in_action_profile_name>]\n * [disabled]\n */\n@@ -1138,27 +1028,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \t\t}\n \n \t\tt0 += 7;\n-\t} else if (strcmp(tokens[t0], \"cryptodev\") == 0) {\n-\t\tif (n_tokens < t0 + 3) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n-\t\t\t\t\"pipeline port in cryptodev\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tp.type = PORT_IN_CRYPTODEV;\n-\n-\t\tstrlcpy(p.dev_name, tokens[t0 + 1], sizeof(p.dev_name));\n-\t\tif (softnic_parser_read_uint16(&p.rxq.queue_id,\n-\t\t\t\ttokens[t0 + 3]) != 0) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID,\n-\t\t\t\t\"rxq\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tp.cryptodev.arg_callback = NULL;\n-\t\tp.cryptodev.f_callback = NULL;\n-\n-\t\tt0 += 4;\n \t} else {\n \t\tsnprintf(out, out_size, MSG_ARG_INVALID, tokens[0]);\n \t\treturn;\n@@ -1207,7 +1076,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n * | swq <swq_name>\n * | tap <tap_name>\n * | sink [file <file_name> pkts <max_n_pkts>]\n- * | cryptodev <cryptodev_name> txq <txq_id> offset <crypto_op_offset>\n */\n static void\n cmd_pipeline_port_out(struct pmd_internals *softnic,\n@@ -1322,40 +1190,6 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \t\t\t\treturn;\n \t\t\t}\n \t\t}\n-\t} else if (strcmp(tokens[6], \"cryptodev\") == 0) {\n-\t\tif (n_tokens != 12) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n-\t\t\t\t\"pipeline port out cryptodev\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tp.type = PORT_OUT_CRYPTODEV;\n-\n-\t\tstrlcpy(p.dev_name, tokens[7], sizeof(p.dev_name));\n-\n-\t\tif (strcmp(tokens[8], \"txq\")) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n-\t\t\t\t\"pipeline port out cryptodev\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tif (softnic_parser_read_uint16(&p.cryptodev.queue_id, tokens[9])\n-\t\t\t\t!= 0) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"queue_id\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tif (strcmp(tokens[10], \"offset\")) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n-\t\t\t\t\"pipeline port out cryptodev\");\n-\t\t\treturn;\n-\t\t}\n-\n-\t\tif (softnic_parser_read_uint32(&p.cryptodev.op_offset,\n-\t\t\t\ttokens[11]) != 0) {\n-\t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"queue_id\");\n-\t\t\treturn;\n-\t\t}\n \t} else {\n \t\tsnprintf(out, out_size, MSG_ARG_INVALID, tokens[0]);\n \t\treturn;\n@@ -4771,11 +4605,6 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)\n \t\treturn;\n \t}\n \n-\tif (strcmp(tokens[0], \"cryptodev\") == 0) {\n-\t\tcmd_cryptodev(softnic, tokens, n_tokens, out, out_size);\n-\t\treturn;\n-\t}\n-\n \tif (strcmp(tokens[0], \"port\") == 0) {\n \t\tcmd_port_in_action_profile(softnic, tokens, n_tokens, out, out_size);\n \t\treturn;\ndiff --git a/drivers/net/softnic/rte_eth_softnic_cryptodev.c b/drivers/net/softnic/rte_eth_softnic_cryptodev.c\ndeleted file mode 100644\nindex e4754055e9..0000000000\n--- a/drivers/net/softnic/rte_eth_softnic_cryptodev.c\n+++ /dev/null\n@@ -1,168 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2018 Intel Corporation\n- */\n-\n-#include <stdlib.h>\n-#include <stdio.h>\n-\n-#include <rte_cryptodev.h>\n-#include <cryptodev_pmd.h>\n-#include <rte_string_fns.h>\n-\n-#include \"rte_eth_softnic_internals.h\"\n-\n-#define SOFTNIC_CRYPTO_SESSION_CACHE_SIZE 128\n-\n-int\n-softnic_cryptodev_init(struct pmd_internals *p)\n-{\n-\tTAILQ_INIT(&p->cryptodev_list);\n-\n-\treturn 0;\n-}\n-\n-void\n-softnic_cryptodev_free(struct pmd_internals *p)\n-{\n-\tfor ( ; ; ) {\n-\t\tstruct softnic_cryptodev *cryptodev;\n-\n-\t\tcryptodev = TAILQ_FIRST(&p->cryptodev_list);\n-\t\tif (cryptodev == NULL)\n-\t\t\tbreak;\n-\n-\t\tTAILQ_REMOVE(&p->cryptodev_list, cryptodev, node);\n-\t\tfree(cryptodev);\n-\t}\n-}\n-\n-struct softnic_cryptodev *\n-softnic_cryptodev_find(struct pmd_internals *p,\n-\tconst char *name)\n-{\n-\tstruct softnic_cryptodev *cryptodev;\n-\n-\tif (name == NULL)\n-\t\treturn NULL;\n-\n-\tTAILQ_FOREACH(cryptodev, &p->cryptodev_list, node)\n-\t\tif (strcmp(cryptodev->name, name) == 0)\n-\t\t\treturn cryptodev;\n-\n-\treturn NULL;\n-}\n-\n-struct softnic_cryptodev *\n-softnic_cryptodev_create(struct pmd_internals *p,\n-\tconst char *name,\n-\tstruct softnic_cryptodev_params *params)\n-{\n-\tstruct rte_cryptodev_info dev_info;\n-\tstruct rte_cryptodev_config dev_conf;\n-\tstruct rte_cryptodev_qp_conf queue_conf;\n-\tstruct softnic_cryptodev *cryptodev;\n-\tuint32_t dev_id, i;\n-\tuint32_t socket_id;\n-\tuint32_t cache_size;\n-\tchar mp_name[NAME_SIZE];\n-\tint status;\n-\n-\t/* Check input params */\n-\tif ((name == NULL) ||\n-\t\tsoftnic_cryptodev_find(p, name) ||\n-\t\t(params->n_queues == 0) ||\n-\t\t(params->queue_size == 0) ||\n-\t\t(params->session_pool_size == 0))\n-\t\treturn NULL;\n-\n-\tif (params->dev_name) {\n-\t\tstatus = rte_cryptodev_get_dev_id(params->dev_name);\n-\t\tif (status == -1)\n-\t\t\treturn NULL;\n-\n-\t\tdev_id = (uint32_t)status;\n-\t} else {\n-\t\tif (rte_cryptodev_is_valid_dev(params->dev_id) == 0)\n-\t\t\treturn NULL;\n-\n-\t\tdev_id = params->dev_id;\n-\t}\n-\n-\tcache_size = (params->session_pool_size / 2 <\n-\t\t\tSOFTNIC_CRYPTO_SESSION_CACHE_SIZE) ?\n-\t\t\t\t\t(params->session_pool_size / 2) :\n-\t\t\t\t\tSOFTNIC_CRYPTO_SESSION_CACHE_SIZE;\n-\n-\tsocket_id = rte_cryptodev_socket_id(dev_id);\n-\trte_cryptodev_info_get(dev_id, &dev_info);\n-\n-\tif (dev_info.max_nb_queue_pairs < params->n_queues)\n-\t\treturn NULL;\n-\tif (dev_info.feature_flags & RTE_CRYPTODEV_FF_HW_ACCELERATED)\n-\t\treturn NULL;\n-\n-\tdev_conf.socket_id = socket_id;\n-\tdev_conf.nb_queue_pairs = params->n_queues;\n-\n-\tstatus = rte_cryptodev_configure(dev_id, &dev_conf);\n-\tif (status < 0)\n-\t\treturn NULL;\n-\n-\tqueue_conf.nb_descriptors = params->queue_size;\n-\tfor (i = 0; i < params->n_queues; i++) {\n-\t\tstatus = rte_cryptodev_queue_pair_setup(dev_id, i,\n-\t\t\t\t&queue_conf, socket_id);\n-\t\tif (status < 0)\n-\t\t\treturn NULL;\n-\t}\n-\n-\tif (rte_cryptodev_start(dev_id) < 0)\n-\t\treturn NULL;\n-\n-\tcryptodev = calloc(1, sizeof(struct softnic_cryptodev));\n-\tif (cryptodev == NULL) {\n-\t\trte_cryptodev_stop(dev_id);\n-\t\treturn NULL;\n-\t}\n-\n-\tstrlcpy(cryptodev->name, name, sizeof(cryptodev->name));\n-\tcryptodev->dev_id = dev_id;\n-\tcryptodev->n_queues = params->n_queues;\n-\n-\tsnprintf(mp_name, NAME_SIZE, \"%s_mp%u\", name, dev_id);\n-\tcryptodev->mp_create = rte_cryptodev_sym_session_pool_create(mp_name,\n-\t\t\tparams->session_pool_size,\n-\t\t\t0,\n-\t\t\tcache_size,\n-\t\t\t0,\n-\t\t\tsocket_id);\n-\tif (!cryptodev->mp_create)\n-\t\tgoto error_exit;\n-\n-\tsnprintf(mp_name, NAME_SIZE, \"%s_priv_mp%u\", name, dev_id);\n-\tcryptodev->mp_init = rte_mempool_create(mp_name,\n-\t\t\tparams->session_pool_size,\n-\t\t\trte_cryptodev_sym_get_private_session_size(dev_id),\n-\t\t\tcache_size,\n-\t\t\t0,\n-\t\t\tNULL,\n-\t\t\tNULL,\n-\t\t\tNULL,\n-\t\t\tNULL,\n-\t\t\tsocket_id,\n-\t\t\t0);\n-\tif (!cryptodev->mp_init)\n-\t\tgoto error_exit;\n-\n-\tTAILQ_INSERT_TAIL(&p->cryptodev_list, cryptodev, node);\n-\n-\treturn cryptodev;\n-\n-error_exit:\n-\trte_mempool_free(cryptodev->mp_create);\n-\trte_mempool_free(cryptodev->mp_init);\n-\n-\tfree(cryptodev);\n-\n-\treturn NULL;\n-}\ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex d578cb1f25..ddcde99b98 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -100,28 +100,6 @@ struct softnic_tap {\n \n TAILQ_HEAD(softnic_tap_list, softnic_tap);\n \n-/**\n- * Cryptodev\n- */\n-struct softnic_cryptodev_params {\n-\tconst char *dev_name;\n-\tuint32_t dev_id; /**< Valid only when *dev_name* is NULL. */\n-\tuint32_t n_queues;\n-\tuint32_t queue_size;\n-\tuint32_t session_pool_size;\n-};\n-\n-struct softnic_cryptodev {\n-\tTAILQ_ENTRY(softnic_cryptodev) node;\n-\tchar name[NAME_SIZE];\n-\tuint16_t dev_id;\n-\tuint32_t n_queues;\n-\tstruct rte_mempool *mp_create;\n-\tstruct rte_mempool *mp_init;\n-};\n-\n-TAILQ_HEAD(softnic_cryptodev_list, softnic_cryptodev);\n-\n /**\n * Input port action\n */\n@@ -187,7 +165,6 @@ enum softnic_port_in_type {\n \tPORT_IN_SWQ,\n \tPORT_IN_TAP,\n \tPORT_IN_SOURCE,\n-\tPORT_IN_CRYPTODEV,\n };\n \n struct softnic_port_in_params {\n@@ -209,12 +186,6 @@ struct softnic_port_in_params {\n \t\t\tconst char *file_name;\n \t\t\tuint32_t n_bytes_per_pkt;\n \t\t} source;\n-\n-\t\tstruct {\n-\t\t\tuint16_t queue_id;\n-\t\t\tvoid *f_callback;\n-\t\t\tvoid *arg_callback;\n-\t\t} cryptodev;\n \t};\n \tuint32_t burst_size;\n \n@@ -227,7 +198,6 @@ enum softnic_port_out_type {\n \tPORT_OUT_SWQ,\n \tPORT_OUT_TAP,\n \tPORT_OUT_SINK,\n-\tPORT_OUT_CRYPTODEV,\n };\n \n struct softnic_port_out_params {\n@@ -242,11 +212,6 @@ struct softnic_port_out_params {\n \t\t\tconst char *file_name;\n \t\t\tuint32_t max_n_pkts;\n \t\t} sink;\n-\n-\t\tstruct {\n-\t\t\tuint16_t queue_id;\n-\t\t\tuint32_t op_offset;\n-\t\t} cryptodev;\n \t};\n \tuint32_t burst_size;\n \tint retry;\n@@ -421,7 +386,6 @@ struct pmd_internals {\n \tstruct softnic_swq_list swq_list;\n \tstruct softnic_link_list link_list;\n \tstruct softnic_tap_list tap_list;\n-\tstruct softnic_cryptodev_list cryptodev_list;\n \tstruct softnic_port_in_action_profile_list port_in_action_profile_list;\n \tstruct softnic_table_action_profile_list table_action_profile_list;\n \tstruct pipeline_list pipeline_list;\n@@ -519,24 +483,6 @@ struct softnic_tap *\n softnic_tap_create(struct pmd_internals *p,\n \tconst char *name);\n \n-/**\n- * Sym Crypto\n- */\n-int\n-softnic_cryptodev_init(struct pmd_internals *p);\n-\n-void\n-softnic_cryptodev_free(struct pmd_internals *p);\n-\n-struct softnic_cryptodev *\n-softnic_cryptodev_find(struct pmd_internals *p,\n-\tconst char *name);\n-\n-struct softnic_cryptodev *\n-softnic_cryptodev_create(struct pmd_internals *p,\n-\tconst char *name,\n-\tstruct softnic_cryptodev_params *params);\n-\n /**\n * Input port action\n */\ndiff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c\nindex 2cf7fa52d1..51a1ea73c0 100644\n--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c\n+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c\n@@ -227,7 +227,6 @@ softnic_pipeline_port_in_create(struct pmd_internals *softnic,\n \t\tstruct rte_port_sched_reader_params sched;\n \t\tstruct rte_port_fd_reader_params fd;\n \t\tstruct rte_port_source_params source;\n-\t\tstruct rte_port_sym_crypto_reader_params cryptodev;\n \t} pp;\n \n \tstruct pipeline *pipeline;\n@@ -330,23 +329,6 @@ softnic_pipeline_port_in_create(struct pmd_internals *softnic,\n \t\tbreak;\n \t}\n \n-\tcase PORT_IN_CRYPTODEV:\n-\t{\n-\t\tstruct softnic_cryptodev *cryptodev;\n-\n-\t\tcryptodev = softnic_cryptodev_find(softnic, params->dev_name);\n-\t\tif (cryptodev == NULL)\n-\t\t\treturn -1;\n-\n-\t\tpp.cryptodev.cryptodev_id = cryptodev->dev_id;\n-\t\tpp.cryptodev.queue_id = params->cryptodev.queue_id;\n-\t\tpp.cryptodev.f_callback = params->cryptodev.f_callback;\n-\t\tpp.cryptodev.arg_callback = params->cryptodev.arg_callback;\n-\t\tp.ops = &rte_port_sym_crypto_reader_ops;\n-\t\tp.arg_create = &pp.cryptodev;\n-\t\tbreak;\n-\t}\n-\n \tdefault:\n \t\treturn -1;\n \t}\n@@ -433,14 +415,12 @@ softnic_pipeline_port_out_create(struct pmd_internals *softnic,\n \t\tstruct rte_port_sched_writer_params sched;\n \t\tstruct rte_port_fd_writer_params fd;\n \t\tstruct rte_port_sink_params sink;\n-\t\tstruct rte_port_sym_crypto_writer_params cryptodev;\n \t} pp;\n \n \tunion {\n \t\tstruct rte_port_ethdev_writer_nodrop_params ethdev;\n \t\tstruct rte_port_ring_writer_nodrop_params ring;\n \t\tstruct rte_port_fd_writer_nodrop_params fd;\n-\t\tstruct rte_port_sym_crypto_writer_nodrop_params cryptodev;\n \t} pp_nodrop;\n \n \tstruct pipeline *pipeline;\n@@ -554,40 +534,6 @@ softnic_pipeline_port_out_create(struct pmd_internals *softnic,\n \t\tbreak;\n \t}\n \n-\tcase PORT_OUT_CRYPTODEV:\n-\t{\n-\t\tstruct softnic_cryptodev *cryptodev;\n-\n-\t\tcryptodev = softnic_cryptodev_find(softnic, params->dev_name);\n-\t\tif (cryptodev == NULL)\n-\t\t\treturn -1;\n-\n-\t\tif (params->cryptodev.queue_id >= cryptodev->n_queues)\n-\t\t\treturn -1;\n-\n-\t\tpp.cryptodev.cryptodev_id = cryptodev->dev_id;\n-\t\tpp.cryptodev.queue_id = params->cryptodev.queue_id;\n-\t\tpp.cryptodev.tx_burst_sz = params->burst_size;\n-\t\tpp.cryptodev.crypto_op_offset = params->cryptodev.op_offset;\n-\n-\t\tpp_nodrop.cryptodev.cryptodev_id = cryptodev->dev_id;\n-\t\tpp_nodrop.cryptodev.queue_id = params->cryptodev.queue_id;\n-\t\tpp_nodrop.cryptodev.tx_burst_sz = params->burst_size;\n-\t\tpp_nodrop.cryptodev.n_retries = params->retry;\n-\t\tpp_nodrop.cryptodev.crypto_op_offset =\n-\t\t\t\tparams->cryptodev.op_offset;\n-\n-\t\tif (params->retry == 0) {\n-\t\t\tp.ops = &rte_port_sym_crypto_writer_ops;\n-\t\t\tp.arg_create = &pp.cryptodev;\n-\t\t} else {\n-\t\t\tp.ops = &rte_port_sym_crypto_writer_nodrop_ops;\n-\t\t\tp.arg_create = &pp_nodrop.cryptodev;\n-\t\t}\n-\n-\t\tbreak;\n-\t}\n-\n \tdefault:\n \t\treturn -1;\n \t}\n", "prefixes": [ "04/21" ] }