Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111066/?format=api
{ "id": 111066, "url": "http://patches.dpdk.org/api/patches/111066/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220512124527.2031321-8-gakhil@marvell.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": "<20220512124527.2031321-8-gakhil@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220512124527.2031321-8-gakhil@marvell.com", "date": "2022-05-12T12:45:27", "name": "[v5,7/7] test-eventdev: support asym ops for crypto adapter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dc94554e8ad1edbe3215dd68e1b5267f4136c076", "submitter": { "id": 2094, "url": "http://patches.dpdk.org/api/people/2094/?format=api", "name": "Akhil Goyal", "email": "gakhil@marvell.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220512124527.2031321-8-gakhil@marvell.com/mbox/", "series": [ { "id": 22913, "url": "http://patches.dpdk.org/api/series/22913/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=22913", "date": "2022-05-12T12:45:20", "name": "Add new cryptodev op for event metadata", "version": 5, "mbox": "http://patches.dpdk.org/series/22913/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/111066/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/111066/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 77DC6A00BE;\n\tThu, 12 May 2022 14:46:28 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0A4624284B;\n\tThu, 12 May 2022 14:46:00 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id C65A042849\n for <dev@dpdk.org>; Thu, 12 May 2022 14:45:58 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id\n 24C9a8DV007758;\n Thu, 12 May 2022 05:45:58 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3g0yqwgq4q-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Thu, 12 May 2022 05:45:57 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Thu, 12 May 2022 05:45:56 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Thu, 12 May 2022 05:45:56 -0700", "from localhost.localdomain (unknown [10.28.48.55])\n by maili.marvell.com (Postfix) with ESMTP id 71E373F708F;\n Thu, 12 May 2022 05:45:53 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=Zo0XFzbZo0XhPnJlYPS6/x0V6zHttGrF8oDA51gvZKQ=;\n b=ABXWJz1ULaJHrBBKXnF7PAJY9QgbLz63T0qKH0mxC+JlZWaW8uMLf8/9uLfKNv5RX6Yg\n qnyDXVKcWVGmDa3yyB8JVrPZbVUS+cmeHPOF/3myiR9CcscpYh9X4V5KEVZwD0G82ytk\n Xnbmpn6A6gxGtnTNN/HtE1zrrZarzIINi0n6kf4AsiXoAtz0ggpnEjqU5i5AADrSFOaN\n zmvyfID8UnjUtC+uLcPiQbgQNaStHrXqR3XloL85/jHsKqvP70zFxr8U1URK39FksV9o\n LkGyh9ge6tQ+fEZNThjheDx17T+syta0rj2Fy7p6K+j712mWdFCrjdguFIrHNISUN5CJ lA==", "From": "Akhil Goyal <gakhil@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<anoobj@marvell.com>, <jerinj@marvell.com>, <abhinandan.gujjar@intel.com>,\n <jay.jayatheerthan@intel.com>, <narender.vangati@intel.com>,\n <vfialko@marvell.com>, Akhil Goyal <gakhil@marvell.com>, Fan Zhang\n <roy.fan.zhang@intel.com>, Abhinandan Gujjar <Abhinandan.gujjar@intel.com>", "Subject": "[PATCH v5 7/7] test-eventdev: support asym ops for crypto adapter", "Date": "Thu, 12 May 2022 18:15:27 +0530", "Message-ID": "<20220512124527.2031321-8-gakhil@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220512124527.2031321-1-gakhil@marvell.com>", "References": "<20220501192457.3670278-1-gakhil@marvell.com>\n <20220512124527.2031321-1-gakhil@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "W5RPwC6agy6m-ziVRvathGgd5LZ0Kgjb", "X-Proofpoint-GUID": "W5RPwC6agy6m-ziVRvathGgd5LZ0Kgjb", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514\n definitions=2022-05-12_10,2022-05-12_01,2022-02-23_01", "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": "Test eventdev app is updated to add new option for asymmetric\ncrypto ops for event crypto adapter.\n\nSigned-off-by: Akhil Goyal <gakhil@marvell.com>\nAcked-by: Fan Zhang <roy.fan.zhang@intel.com>\nAcked-by: Abhinandan Gujjar <Abhinandan.gujjar@intel.com>\nAcked-by: Anoob Joseph <anoobj@marvell.com>\n---\n app/test-eventdev/evt_common.h | 2 +\n app/test-eventdev/evt_options.c | 17 ++\n app/test-eventdev/evt_options.h | 4 +\n app/test-eventdev/test_perf_atq.c | 12 +-\n app/test-eventdev/test_perf_common.c | 250 +++++++++++++++++++++++----\n app/test-eventdev/test_perf_common.h | 45 +++--\n app/test-eventdev/test_perf_queue.c | 12 +-\n doc/guides/tools/testeventdev.rst | 5 +\n 8 files changed, 284 insertions(+), 63 deletions(-)", "diff": "diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h\nindex 2f301a7e79..196eca8bd0 100644\n--- a/app/test-eventdev/evt_common.h\n+++ b/app/test-eventdev/evt_common.h\n@@ -6,6 +6,7 @@\n #define _EVT_COMMON_\n \n #include <rte_common.h>\n+#include <rte_crypto.h>\n #include <rte_debug.h>\n #include <rte_event_crypto_adapter.h>\n #include <rte_eventdev.h>\n@@ -80,6 +81,7 @@ struct evt_options {\n \tuint64_t optm_timer_tick_nsec;\n \tenum evt_prod_type prod_type;\n \tenum rte_event_crypto_adapter_mode crypto_adptr_mode;\n+\tenum rte_crypto_op_type crypto_op_type;\n };\n \n static inline bool\ndiff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c\nindex d3c704d2b3..8326734b64 100644\n--- a/app/test-eventdev/evt_options.c\n+++ b/app/test-eventdev/evt_options.c\n@@ -38,6 +38,7 @@ evt_options_default(struct evt_options *opt)\n \topt->eth_queues = 1;\n \topt->vector_size = 64;\n \topt->vector_tmo_nsec = 100E3;\n+\topt->crypto_op_type = RTE_CRYPTO_OP_TYPE_SYMMETRIC;\n }\n \n typedef int (*option_parser_t)(struct evt_options *opt,\n@@ -142,6 +143,18 @@ evt_parse_crypto_adptr_mode(struct evt_options *opt, const char *arg)\n \treturn ret;\n }\n \n+static int\n+evt_parse_crypto_op_type(struct evt_options *opt, const char *arg)\n+{\n+\tuint8_t op_type;\n+\tint ret;\n+\n+\tret = parser_read_uint8(&op_type, arg);\n+\topt->crypto_op_type = op_type ? RTE_CRYPTO_OP_TYPE_ASYMMETRIC :\n+\t\t\t\t\tRTE_CRYPTO_OP_TYPE_SYMMETRIC;\n+\treturn ret;\n+}\n+\n static int\n evt_parse_test_name(struct evt_options *opt, const char *arg)\n {\n@@ -368,6 +381,8 @@ usage(char *program)\n \t\t\"\\t--expiry_nsec : event timer expiry ns.\\n\"\n \t\t\"\\t--crypto_adptr_mode : 0 for OP_NEW mode (default) and\\n\"\n \t\t\"\\t 1 for OP_FORWARD mode.\\n\"\n+\t\t\"\\t--crypto_op_type : 0 for SYM ops (default) and\\n\"\n+\t\t\"\\t 1 for ASYM ops.\\n\"\n \t\t\"\\t--mbuf_sz : packet mbuf size.\\n\"\n \t\t\"\\t--max_pkt_sz : max packet size.\\n\"\n \t\t\"\\t--prod_enq_burst_sz : producer enqueue burst size.\\n\"\n@@ -442,6 +457,7 @@ static struct option lgopts[] = {\n \t{ EVT_PROD_TIMERDEV, 0, 0, 0 },\n \t{ EVT_PROD_TIMERDEV_BURST, 0, 0, 0 },\n \t{ EVT_CRYPTO_ADPTR_MODE, 1, 0, 0 },\n+\t{ EVT_CRYPTO_OP_TYPE,\t 1, 0, 0 },\n \t{ EVT_NB_TIMERS, 1, 0, 0 },\n \t{ EVT_NB_TIMER_ADPTRS, 1, 0, 0 },\n \t{ EVT_TIMER_TICK_NSEC, 1, 0, 0 },\n@@ -484,6 +500,7 @@ evt_opts_parse_long(int opt_idx, struct evt_options *opt)\n \t\t{ EVT_PROD_TIMERDEV, evt_parse_timer_prod_type},\n \t\t{ EVT_PROD_TIMERDEV_BURST, evt_parse_timer_prod_type_burst},\n \t\t{ EVT_CRYPTO_ADPTR_MODE, evt_parse_crypto_adptr_mode},\n+\t\t{ EVT_CRYPTO_OP_TYPE, evt_parse_crypto_op_type},\n \t\t{ EVT_NB_TIMERS, evt_parse_nb_timers},\n \t\t{ EVT_NB_TIMER_ADPTRS, evt_parse_nb_timer_adptrs},\n \t\t{ EVT_TIMER_TICK_NSEC, evt_parse_timer_tick_nsec},\ndiff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_options.h\nindex 2231c58801..f23fb8a511 100644\n--- a/app/test-eventdev/evt_options.h\n+++ b/app/test-eventdev/evt_options.h\n@@ -38,6 +38,7 @@\n #define EVT_PROD_TIMERDEV (\"prod_type_timerdev\")\n #define EVT_PROD_TIMERDEV_BURST (\"prod_type_timerdev_burst\")\n #define EVT_CRYPTO_ADPTR_MODE\t (\"crypto_adptr_mode\")\n+#define EVT_CRYPTO_OP_TYPE\t (\"crypto_op_type\")\n #define EVT_NB_TIMERS (\"nb_timers\")\n #define EVT_NB_TIMER_ADPTRS (\"nb_timer_adptrs\")\n #define EVT_TIMER_TICK_NSEC (\"timer_tick_nsec\")\n@@ -298,6 +299,9 @@ evt_dump_producer_type(struct evt_options *opt)\n \t\t\t \"Event crypto adapter producers\");\n \t\tevt_dump(\"crypto adapter mode\", \"%s\",\n \t\t\t opt->crypto_adptr_mode ? \"OP_FORWARD\" : \"OP_NEW\");\n+\t\tevt_dump(\"crypto op type\", \"%s\",\n+\t\t\t (opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) ?\n+\t\t\t \"SYMMETRIC\" : \"ASYMMETRIC\");\n \t\tevt_dump(\"nb_cryptodev\", \"%u\", rte_cryptodev_count());\n \t\tbreak;\n \t}\ndiff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c\nindex 67ff681666..6a2aa86fd2 100644\n--- a/app/test-eventdev/test_perf_atq.c\n+++ b/app/test-eventdev/test_perf_atq.c\n@@ -53,11 +53,13 @@ perf_atq_worker(void *arg, const int enable_fwd_latency)\n \t\t\tstruct rte_crypto_op *op = ev.event_ptr;\n \n \t\t\tif (op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) {\n-\t\t\t\tif (op->sym->m_dst == NULL)\n-\t\t\t\t\tev.event_ptr = op->sym->m_src;\n-\t\t\t\telse\n-\t\t\t\t\tev.event_ptr = op->sym->m_dst;\n-\t\t\t\trte_crypto_op_free(op);\n+\t\t\t\tif (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {\n+\t\t\t\t\tif (op->sym->m_dst == NULL)\n+\t\t\t\t\t\tev.event_ptr = op->sym->m_src;\n+\t\t\t\t\telse\n+\t\t\t\t\t\tev.event_ptr = op->sym->m_dst;\n+\t\t\t\t\trte_crypto_op_free(op);\n+\t\t\t\t}\n \t\t\t} else {\n \t\t\t\trte_crypto_op_free(op);\n \t\t\t\tcontinue;\ndiff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c\nindex 0378607cda..f2da6fd74c 100644\n--- a/app/test-eventdev/test_perf_common.c\n+++ b/app/test-eventdev/test_perf_common.c\n@@ -7,6 +7,89 @@\n #include \"test_perf_common.h\"\n \n #define NB_CRYPTODEV_DESCRIPTORS 128\n+#define DATA_SIZE\t\t512\n+struct modex_test_data {\n+\tenum rte_crypto_asym_xform_type xform_type;\n+\tstruct {\n+\t\tuint8_t data[DATA_SIZE];\n+\t\tuint16_t len;\n+\t} base;\n+\tstruct {\n+\t\tuint8_t data[DATA_SIZE];\n+\t\tuint16_t len;\n+\t} exponent;\n+\tstruct {\n+\t\tuint8_t data[DATA_SIZE];\n+\t\tuint16_t len;\n+\t} modulus;\n+\tstruct {\n+\t\tuint8_t data[DATA_SIZE];\n+\t\tuint16_t len;\n+\t} reminder;\n+\tuint16_t result_len;\n+};\n+\n+static struct\n+modex_test_data modex_test_case = {\n+\t.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,\n+\t.base = {\n+\t\t.data = {\n+\t\t\t0xF8, 0xBA, 0x1A, 0x55, 0xD0, 0x2F, 0x85,\n+\t\t\t0xAE, 0x96, 0x7B, 0xB6, 0x2F, 0xB6, 0xCD,\n+\t\t\t0xA8, 0xEB, 0x7E, 0x78, 0xA0, 0x50\n+\t\t},\n+\t\t.len = 20,\n+\t},\n+\t.exponent = {\n+\t\t.data = {\n+\t\t\t0x01, 0x00, 0x01\n+\t\t},\n+\t\t.len = 3,\n+\t},\n+\t.reminder = {\n+\t\t.data = {\n+\t\t\t0x2C, 0x60, 0x75, 0x45, 0x98, 0x9D, 0xE0, 0x72,\n+\t\t\t0xA0, 0x9D, 0x3A, 0x9E, 0x03, 0x38, 0x73, 0x3C,\n+\t\t\t0x31, 0x83, 0x04, 0xFE, 0x75, 0x43, 0xE6, 0x17,\n+\t\t\t0x5C, 0x01, 0x29, 0x51, 0x69, 0x33, 0x62, 0x2D,\n+\t\t\t0x78, 0xBE, 0xAE, 0xC4, 0xBC, 0xDE, 0x7E, 0x2C,\n+\t\t\t0x77, 0x84, 0xF2, 0xC5, 0x14, 0xB5, 0x2F, 0xF7,\n+\t\t\t0xC5, 0x94, 0xEF, 0x86, 0x75, 0x75, 0xB5, 0x11,\n+\t\t\t0xE5, 0x0E, 0x0A, 0x29, 0x76, 0xE2, 0xEA, 0x32,\n+\t\t\t0x0E, 0x43, 0x77, 0x7E, 0x2C, 0x27, 0xAC, 0x3B,\n+\t\t\t0x86, 0xA5, 0xDB, 0xC9, 0x48, 0x40, 0xE8, 0x99,\n+\t\t\t0x9A, 0x0A, 0x3D, 0xD6, 0x74, 0xFA, 0x2E, 0x2E,\n+\t\t\t0x5B, 0xAF, 0x8C, 0x99, 0x44, 0x2A, 0x67, 0x38,\n+\t\t\t0x27, 0x41, 0x59, 0x9D, 0xB8, 0x51, 0xC9, 0xF7,\n+\t\t\t0x43, 0x61, 0x31, 0x6E, 0xF1, 0x25, 0x38, 0x7F,\n+\t\t\t0xAE, 0xC6, 0xD0, 0xBB, 0x29, 0x76, 0x3F, 0x46,\n+\t\t\t0x2E, 0x1B, 0xE4, 0x67, 0x71, 0xE3, 0x87, 0x5A\n+\t\t},\n+\t\t.len = 128,\n+\t},\n+\t.modulus = {\n+\t\t.data = {\n+\t\t\t0xb3, 0xa1, 0xaf, 0xb7, 0x13, 0x08, 0x00, 0x0a,\n+\t\t\t0x35, 0xdc, 0x2b, 0x20, 0x8d, 0xa1, 0xb5, 0xce,\n+\t\t\t0x47, 0x8a, 0xc3, 0x80, 0xf4, 0x7d, 0x4a, 0xa2,\n+\t\t\t0x62, 0xfd, 0x61, 0x7f, 0xb5, 0xa8, 0xde, 0x0a,\n+\t\t\t0x17, 0x97, 0xa0, 0xbf, 0xdf, 0x56, 0x5a, 0x3d,\n+\t\t\t0x51, 0x56, 0x4f, 0x70, 0x70, 0x3f, 0x63, 0x6a,\n+\t\t\t0x44, 0x5b, 0xad, 0x84, 0x0d, 0x3f, 0x27, 0x6e,\n+\t\t\t0x3b, 0x34, 0x91, 0x60, 0x14, 0xb9, 0xaa, 0x72,\n+\t\t\t0xfd, 0xa3, 0x64, 0xd2, 0x03, 0xa7, 0x53, 0x87,\n+\t\t\t0x9e, 0x88, 0x0b, 0xc1, 0x14, 0x93, 0x1a, 0x62,\n+\t\t\t0xff, 0xb1, 0x5d, 0x74, 0xcd, 0x59, 0x63, 0x18,\n+\t\t\t0x11, 0x3d, 0x4f, 0xba, 0x75, 0xd4, 0x33, 0x4e,\n+\t\t\t0x23, 0x6b, 0x7b, 0x57, 0x44, 0xe1, 0xd3, 0x03,\n+\t\t\t0x13, 0xa6, 0xf0, 0x8b, 0x60, 0xb0, 0x9e, 0xee,\n+\t\t\t0x75, 0x08, 0x9d, 0x71, 0x63, 0x13, 0xcb, 0xa6,\n+\t\t\t0x81, 0x92, 0x14, 0x03, 0x22, 0x2d, 0xde, 0x55\n+\t\t},\n+\t\t.len = 128,\n+\t},\n+\t.result_len = 128,\n+};\n \n int\n perf_test_result(struct evt_test *test, struct evt_options *opt)\n@@ -277,12 +360,10 @@ perf_event_timer_producer_burst(void *arg)\n static inline void\n crypto_adapter_enq_op_new(struct prod_data *p)\n {\n-\tstruct rte_cryptodev_sym_session **crypto_sess = p->ca.crypto_sess;\n \tstruct test_perf *t = p->t;\n \tconst uint32_t nb_flows = t->nb_flows;\n \tconst uint64_t nb_pkts = t->nb_pkts;\n \tstruct rte_mempool *pool = t->pool;\n-\tstruct rte_crypto_sym_op *sym_op;\n \tstruct evt_options *opt = t->opt;\n \tuint16_t qp_id = p->ca.cdev_qp_id;\n \tuint8_t cdev_id = p->ca.cdev_id;\n@@ -300,22 +381,39 @@ crypto_adapter_enq_op_new(struct prod_data *p)\n \tlen = opt->mbuf_sz ? opt->mbuf_sz : RTE_ETHER_MIN_LEN;\n \n \twhile (count < nb_pkts && t->done == false) {\n-\t\tm = rte_pktmbuf_alloc(pool);\n-\t\tif (m == NULL)\n-\t\t\tcontinue;\n+\t\tif (opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {\n+\t\t\tstruct rte_crypto_sym_op *sym_op;\n \n-\t\trte_pktmbuf_append(m, len);\n-\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n+\t\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n \t\t\t\t\t RTE_CRYPTO_OP_TYPE_SYMMETRIC);\n-\t\tsym_op = op->sym;\n-\t\tsym_op->m_src = m;\n-\t\tsym_op->cipher.data.offset = 0;\n-\t\tsym_op->cipher.data.length = len;\n-\t\trte_crypto_op_attach_sym_session(\n-\t\t\top, crypto_sess[flow_counter++ % nb_flows]);\n+\t\t\tm = rte_pktmbuf_alloc(pool);\n+\t\t\tif (m == NULL)\n+\t\t\t\tcontinue;\n \n+\t\t\trte_pktmbuf_append(m, len);\n+\t\t\tsym_op = op->sym;\n+\t\t\tsym_op->m_src = m;\n+\t\t\tsym_op->cipher.data.offset = 0;\n+\t\t\tsym_op->cipher.data.length = len;\n+\t\t\trte_crypto_op_attach_sym_session(\n+\t\t\t\top, p->ca.crypto_sess[flow_counter++ % nb_flows]);\n+\t\t} else {\n+\t\t\tstruct rte_crypto_asym_op *asym_op;\n+\t\t\tuint8_t *result = rte_zmalloc(NULL,\n+\t\t\t\t\tmodex_test_case.result_len, 0);\n+\n+\t\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n+\t\t\t\t\t RTE_CRYPTO_OP_TYPE_ASYMMETRIC);\n+\t\t\tasym_op = op->asym;\n+\t\t\tasym_op->modex.base.data = modex_test_case.base.data;\n+\t\t\tasym_op->modex.base.length = modex_test_case.base.len;\n+\t\t\tasym_op->modex.result.data = result;\n+\t\t\tasym_op->modex.result.length = modex_test_case.result_len;\n+\t\t\trte_crypto_op_attach_asym_session(\n+\t\t\t\top, p->ca.crypto_sess[flow_counter++ % nb_flows]);\n+\t\t}\n \t\twhile (rte_cryptodev_enqueue_burst(cdev_id, qp_id, &op, 1) != 1 &&\n-\t\t t->done == false)\n+\t\t\t\tt->done == false)\n \t\t\trte_pause();\n \n \t\tcount++;\n@@ -325,7 +423,6 @@ crypto_adapter_enq_op_new(struct prod_data *p)\n static inline void\n crypto_adapter_enq_op_fwd(struct prod_data *p)\n {\n-\tstruct rte_cryptodev_sym_session **crypto_sess = p->ca.crypto_sess;\n \tconst uint8_t dev_id = p->dev_id;\n \tconst uint8_t port = p->port_id;\n \tstruct test_perf *t = p->t;\n@@ -333,7 +430,6 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)\n \tconst uint64_t nb_pkts = t->nb_pkts;\n \tstruct rte_mempool *pool = t->pool;\n \tstruct evt_options *opt = t->opt;\n-\tstruct rte_crypto_sym_op *sym_op;\n \tuint32_t flow_counter = 0;\n \tstruct rte_crypto_op *op;\n \tstruct rte_event ev;\n@@ -354,19 +450,37 @@ crypto_adapter_enq_op_fwd(struct prod_data *p)\n \tlen = opt->mbuf_sz ? opt->mbuf_sz : RTE_ETHER_MIN_LEN;\n \n \twhile (count < nb_pkts && t->done == false) {\n-\t\tm = rte_pktmbuf_alloc(pool);\n-\t\tif (m == NULL)\n-\t\t\tcontinue;\n+\t\tif (opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {\n+\t\t\tstruct rte_crypto_sym_op *sym_op;\n \n-\t\trte_pktmbuf_append(m, len);\n-\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n+\t\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n \t\t\t\t\t RTE_CRYPTO_OP_TYPE_SYMMETRIC);\n-\t\tsym_op = op->sym;\n-\t\tsym_op->m_src = m;\n-\t\tsym_op->cipher.data.offset = 0;\n-\t\tsym_op->cipher.data.length = len;\n-\t\trte_crypto_op_attach_sym_session(\n-\t\t\top, crypto_sess[flow_counter++ % nb_flows]);\n+\t\t\tm = rte_pktmbuf_alloc(pool);\n+\t\t\tif (m == NULL)\n+\t\t\t\tcontinue;\n+\n+\t\t\trte_pktmbuf_append(m, len);\n+\t\t\tsym_op = op->sym;\n+\t\t\tsym_op->m_src = m;\n+\t\t\tsym_op->cipher.data.offset = 0;\n+\t\t\tsym_op->cipher.data.length = len;\n+\t\t\trte_crypto_op_attach_sym_session(\n+\t\t\t\top, p->ca.crypto_sess[flow_counter++ % nb_flows]);\n+\t\t} else {\n+\t\t\tstruct rte_crypto_asym_op *asym_op;\n+\t\t\tuint8_t *result = rte_zmalloc(NULL,\n+\t\t\t\t\tmodex_test_case.result_len, 0);\n+\n+\t\t\top = rte_crypto_op_alloc(t->ca_op_pool,\n+\t\t\t\t\t RTE_CRYPTO_OP_TYPE_ASYMMETRIC);\n+\t\t\tasym_op = op->asym;\n+\t\t\tasym_op->modex.base.data = modex_test_case.base.data;\n+\t\t\tasym_op->modex.base.length = modex_test_case.base.len;\n+\t\t\tasym_op->modex.result.data = result;\n+\t\t\tasym_op->modex.result.length = modex_test_case.result_len;\n+\t\t\trte_crypto_op_attach_asym_session(\n+\t\t\t\top, p->ca.crypto_sess[flow_counter++ % nb_flows]);\n+\t\t}\n \t\tev.event_ptr = op;\n \n \t\twhile (rte_event_crypto_adapter_enqueue(dev_id, port, &ev, 1) != 1 &&\n@@ -729,6 +843,37 @@ cryptodev_sym_sess_create(struct prod_data *p, struct test_perf *t)\n \treturn sess;\n }\n \n+static void *\n+cryptodev_asym_sess_create(struct prod_data *p, struct test_perf *t)\n+{\n+\tconst struct rte_cryptodev_asymmetric_xform_capability *capability;\n+\tstruct rte_cryptodev_asym_capability_idx cap_idx;\n+\tstruct rte_crypto_asym_xform xform;\n+\tvoid *sess;\n+\n+\txform.next = NULL;\n+\txform.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX;\n+\tcap_idx.type = xform.xform_type;\n+\tcapability = rte_cryptodev_asym_capability_get(p->ca.cdev_id, &cap_idx);\n+\tif (capability == NULL) {\n+\t\tevt_err(\"Device doesn't support MODEX. Test Skipped\\n\");\n+\t\treturn NULL;\n+\t}\n+\n+\txform.modex.modulus.data = modex_test_case.modulus.data;\n+\txform.modex.modulus.length = modex_test_case.modulus.len;\n+\txform.modex.exponent.data = modex_test_case.exponent.data;\n+\txform.modex.exponent.length = modex_test_case.exponent.len;\n+\n+\tif (rte_cryptodev_asym_session_create(p->ca.cdev_id, &xform,\n+\t\t\tt->ca_asym_sess_pool, &sess)) {\n+\t\tevt_err(\"Failed to create asym session\");\n+\t\treturn NULL;\n+\t}\n+\n+\treturn sess;\n+}\n+\n int\n perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,\n \t\t\t\tuint8_t stride, uint8_t nb_queues,\n@@ -804,7 +949,6 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,\n \n \t\tprod = 0;\n \t\tfor (; port < perf_nb_event_ports(opt); port++) {\n-\t\t\tstruct rte_cryptodev_sym_session *crypto_sess;\n \t\t\tunion rte_event_crypto_metadata m_data;\n \t\t\tstruct prod_data *p = &t->prod[port];\n \t\t\tuint32_t flow_id;\n@@ -820,7 +964,7 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,\n \t\t\tp->ca.cdev_id = cdev_id;\n \t\t\tp->ca.cdev_qp_id = qp_id;\n \t\t\tp->ca.crypto_sess = rte_zmalloc_socket(\n-\t\t\t\tNULL, sizeof(crypto_sess) * t->nb_flows,\n+\t\t\t\tNULL, sizeof(void *) * t->nb_flows,\n \t\t\t\tRTE_CACHE_LINE_SIZE, opt->socket_id);\n \t\t\tp->t = t;\n \n@@ -830,18 +974,36 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,\n \t\t\tm_data.response_info.queue_id = p->queue_id;\n \n \t\t\tfor (flow_id = 0; flow_id < t->nb_flows; flow_id++) {\n-\t\t\t\tcrypto_sess = cryptodev_sym_sess_create(p, t);\n-\t\t\t\tif (crypto_sess == NULL)\n-\t\t\t\t\treturn -ENOMEM;\n-\n \t\t\t\tm_data.response_info.flow_id = flow_id;\n-\t\t\t\trte_cryptodev_session_event_mdata_set(cdev_id,\n-\t\t\t\t\t\tcrypto_sess,\n+\t\t\t\tif (opt->crypto_op_type ==\n+\t\t\t\t\t\tRTE_CRYPTO_OP_TYPE_SYMMETRIC) {\n+\t\t\t\t\tstruct rte_cryptodev_sym_session *sess;\n+\n+\t\t\t\t\tsess = cryptodev_sym_sess_create(p, t);\n+\t\t\t\t\tif (sess == NULL)\n+\t\t\t\t\t\treturn -ENOMEM;\n+\n+\t\t\t\t\trte_cryptodev_session_event_mdata_set(\n+\t\t\t\t\t\tcdev_id,\n+\t\t\t\t\t\tsess,\n \t\t\t\t\t\tRTE_CRYPTO_OP_TYPE_SYMMETRIC,\n \t\t\t\t\t\tRTE_CRYPTO_OP_WITH_SESSION,\n \t\t\t\t\t\t&m_data, sizeof(m_data));\n+\t\t\t\t\tp->ca.crypto_sess[flow_id] = sess;\n+\t\t\t\t} else {\n+\t\t\t\t\tvoid *sess;\n \n-\t\t\t\tp->ca.crypto_sess[flow_id] = crypto_sess;\n+\t\t\t\t\tsess = cryptodev_asym_sess_create(p, t);\n+\t\t\t\t\tif (sess == NULL)\n+\t\t\t\t\t\treturn -ENOMEM;\n+\t\t\t\t\trte_cryptodev_session_event_mdata_set(\n+\t\t\t\t\t\tcdev_id,\n+\t\t\t\t\t\tsess,\n+\t\t\t\t\t\tRTE_CRYPTO_OP_TYPE_ASYMMETRIC,\n+\t\t\t\t\t\tRTE_CRYPTO_OP_WITH_SESSION,\n+\t\t\t\t\t\t&m_data, sizeof(m_data));\n+\t\t\t\t\tp->ca.crypto_sess[flow_id] = sess;\n+\t\t\t\t}\n \t\t\t}\n \n \t\t\tconf.event_port_cfg |=\n@@ -1123,14 +1285,24 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)\n \t}\n \n \tt->ca_op_pool = rte_crypto_op_pool_create(\n-\t\t\"crypto_op_pool\", RTE_CRYPTO_OP_TYPE_SYMMETRIC, opt->pool_sz,\n-\t\t128, 0, rte_socket_id());\n+\t\t\"crypto_op_pool\", opt->crypto_op_type, opt->pool_sz,\n+\t\t128, sizeof(union rte_event_crypto_metadata),\n+\t\trte_socket_id());\n \tif (t->ca_op_pool == NULL) {\n \t\tevt_err(\"Failed to create crypto op pool\");\n \t\treturn -ENOMEM;\n \t}\n \n \tnb_sessions = evt_nr_active_lcores(opt->plcores) * t->nb_flows;\n+\tt->ca_asym_sess_pool = rte_cryptodev_asym_session_pool_create(\n+\t\t\"ca_asym_sess_pool\", nb_sessions, 0,\n+\t\tsizeof(union rte_event_crypto_metadata), SOCKET_ID_ANY);\n+\tif (t->ca_asym_sess_pool == NULL) {\n+\t\tevt_err(\"Failed to create sym session pool\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err;\n+\t}\n+\n \tt->ca_sess_pool = rte_cryptodev_sym_session_pool_create(\n \t\t\"ca_sess_pool\", nb_sessions, 0, 0,\n \t\tsizeof(union rte_event_crypto_metadata), SOCKET_ID_ANY);\n@@ -1217,6 +1389,7 @@ perf_cryptodev_setup(struct evt_test *test, struct evt_options *opt)\n \trte_mempool_free(t->ca_op_pool);\n \trte_mempool_free(t->ca_sess_pool);\n \trte_mempool_free(t->ca_sess_priv_pool);\n+\trte_mempool_free(t->ca_asym_sess_pool);\n \n \treturn ret;\n }\n@@ -1258,6 +1431,7 @@ perf_cryptodev_destroy(struct evt_test *test, struct evt_options *opt)\n \trte_mempool_free(t->ca_op_pool);\n \trte_mempool_free(t->ca_sess_pool);\n \trte_mempool_free(t->ca_sess_priv_pool);\n+\trte_mempool_free(t->ca_asym_sess_pool);\n }\n \n int\ndiff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h\nindex ea0907d61a..5651832cc9 100644\n--- a/app/test-eventdev/test_perf_common.h\n+++ b/app/test-eventdev/test_perf_common.h\n@@ -40,7 +40,7 @@ struct worker_data {\n struct crypto_adptr_data {\n \tuint8_t cdev_id;\n \tuint16_t cdev_qp_id;\n-\tstruct rte_cryptodev_sym_session **crypto_sess;\n+\tvoid **crypto_sess;\n };\n struct prod_data {\n \tuint8_t dev_id;\n@@ -70,6 +70,7 @@ struct test_perf {\n \tstruct rte_mempool *ca_op_pool;\n \tstruct rte_mempool *ca_sess_pool;\n \tstruct rte_mempool *ca_sess_priv_pool;\n+\tstruct rte_mempool *ca_asym_sess_pool;\n } __rte_cache_aligned;\n \n struct perf_elt {\n@@ -111,8 +112,6 @@ perf_process_last_stage(struct rte_mempool *const pool,\n \t\tstruct rte_event *const ev, struct worker_data *const w,\n \t\tvoid *bufs[], int const buf_sz, uint8_t count)\n {\n-\tbufs[count++] = ev->event_ptr;\n-\n \t/* release fence here ensures event_prt is\n \t * stored before updating the number of\n \t * processed packets for worker lcores\n@@ -120,9 +119,19 @@ perf_process_last_stage(struct rte_mempool *const pool,\n \trte_atomic_thread_fence(__ATOMIC_RELEASE);\n \tw->processed_pkts++;\n \n-\tif (unlikely(count == buf_sz)) {\n-\t\tcount = 0;\n-\t\trte_mempool_put_bulk(pool, bufs, buf_sz);\n+\tif (ev->event_type == RTE_EVENT_TYPE_CRYPTODEV &&\n+\t\t\t((struct rte_crypto_op *)ev->event_ptr)->type ==\n+\t\t\t\tRTE_CRYPTO_OP_TYPE_ASYMMETRIC) {\n+\t\tstruct rte_crypto_op *op = ev->event_ptr;\n+\n+\t\trte_free(op->asym->modex.result.data);\n+\t\trte_crypto_op_free(op);\n+\t} else {\n+\t\tbufs[count++] = ev->event_ptr;\n+\t\tif (unlikely(count == buf_sz)) {\n+\t\t\tcount = 0;\n+\t\t\trte_mempool_put_bulk(pool, bufs, buf_sz);\n+\t\t}\n \t}\n \treturn count;\n }\n@@ -135,8 +144,6 @@ perf_process_last_stage_latency(struct rte_mempool *const pool,\n \tuint64_t latency;\n \tstruct perf_elt *const m = ev->event_ptr;\n \n-\tbufs[count++] = ev->event_ptr;\n-\n \t/* release fence here ensures event_prt is\n \t * stored before updating the number of\n \t * processed packets for worker lcores\n@@ -144,15 +151,23 @@ perf_process_last_stage_latency(struct rte_mempool *const pool,\n \trte_atomic_thread_fence(__ATOMIC_RELEASE);\n \tw->processed_pkts++;\n \n-\tif (unlikely(count == buf_sz)) {\n-\t\tcount = 0;\n-\t\tlatency = rte_get_timer_cycles() - m->timestamp;\n-\t\trte_mempool_put_bulk(pool, bufs, buf_sz);\n+\tif (ev->event_type == RTE_EVENT_TYPE_CRYPTODEV &&\n+\t\t\t((struct rte_crypto_op *)m)->type ==\n+\t\t\t\tRTE_CRYPTO_OP_TYPE_ASYMMETRIC) {\n+\t\trte_free(((struct rte_crypto_op *)m)->asym->modex.result.data);\n+\t\trte_crypto_op_free((struct rte_crypto_op *)m);\n \t} else {\n-\t\tlatency = rte_get_timer_cycles() - m->timestamp;\n+\t\tbufs[count++] = ev->event_ptr;\n+\t\tif (unlikely(count == buf_sz)) {\n+\t\t\tcount = 0;\n+\t\t\tlatency = rte_get_timer_cycles() - m->timestamp;\n+\t\t\trte_mempool_put_bulk(pool, bufs, buf_sz);\n+\t\t} else {\n+\t\t\tlatency = rte_get_timer_cycles() - m->timestamp;\n+\t\t}\n+\n+\t\tw->latency += latency;\n \t}\n-\n-\tw->latency += latency;\n \treturn count;\n }\n \ndiff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c\nindex dcf6d82947..631a39f727 100644\n--- a/app/test-eventdev/test_perf_queue.c\n+++ b/app/test-eventdev/test_perf_queue.c\n@@ -55,11 +55,13 @@ perf_queue_worker(void *arg, const int enable_fwd_latency)\n \t\t\tstruct rte_crypto_op *op = ev.event_ptr;\n \n \t\t\tif (op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) {\n-\t\t\t\tif (op->sym->m_dst == NULL)\n-\t\t\t\t\tev.event_ptr = op->sym->m_src;\n-\t\t\t\telse\n-\t\t\t\t\tev.event_ptr = op->sym->m_dst;\n-\t\t\t\trte_crypto_op_free(op);\n+\t\t\t\tif (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {\n+\t\t\t\t\tif (op->sym->m_dst == NULL)\n+\t\t\t\t\t\tev.event_ptr = op->sym->m_src;\n+\t\t\t\t\telse\n+\t\t\t\t\t\tev.event_ptr = op->sym->m_dst;\n+\t\t\t\t\trte_crypto_op_free(op);\n+\t\t\t\t}\n \t\t\t} else {\n \t\t\t\trte_crypto_op_free(op);\n \t\t\t\tcontinue;\ndiff --git a/doc/guides/tools/testeventdev.rst b/doc/guides/tools/testeventdev.rst\nindex f7d813226d..a8e02d57a4 100644\n--- a/doc/guides/tools/testeventdev.rst\n+++ b/doc/guides/tools/testeventdev.rst\n@@ -157,6 +157,11 @@ The following are the application command-line options:\n Set crypto adapter mode. Use 0 for OP_NEW (default) and 1 for\n OP_FORWARD mode.\n \n+* ``--crypto_op_type``\n+\n+ Set crypto operation type. Use 0 for symmetric crypto ops (default)\n+ and 1 for asymmetric crypto ops.\n+\n * ``--mbuf_sz``\n \n Set packet mbuf size. Can be used to configure Jumbo Frames. Only\n", "prefixes": [ "v5", "7/7" ] }