Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101507/?format=api
{ "id": 101507, "url": "http://patches.dpdk.org/api/patches/101507/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211013192222.1582631-7-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": "<20211013192222.1582631-7-gakhil@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211013192222.1582631-7-gakhil@marvell.com", "date": "2021-10-13T19:22:21", "name": "[v2,6/7] cryptodev: hide sym session structure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f5edbb80057c96a97cc30ca498384c85a8a90225", "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/20211013192222.1582631-7-gakhil@marvell.com/mbox/", "series": [ { "id": 19616, "url": "http://patches.dpdk.org/api/series/19616/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19616", "date": "2021-10-13T19:22:15", "name": "crypto/security session framework rework", "version": 2, "mbox": "http://patches.dpdk.org/series/19616/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/101507/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/101507/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 91535A0C55;\n\tWed, 13 Oct 2021 21:23:31 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B541341289;\n\tWed, 13 Oct 2021 21:23:25 +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 C9B164111B\n for <dev@dpdk.org>; Wed, 13 Oct 2021 21:23:24 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id\n 19DIqQjb000951;\n Wed, 13 Oct 2021 12:23:14 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com with ESMTP id 3bnwrxjgfm-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 13 Oct 2021 12:23:14 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Wed, 13 Oct 2021 12:23:12 -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.18 via Frontend\n Transport; Wed, 13 Oct 2021 12:23:12 -0700", "from localhost.localdomain (unknown [10.28.36.185])\n by maili.marvell.com (Postfix) with ESMTP id 88A583F7082;\n Wed, 13 Oct 2021 12:23:06 -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=Zo20bGgglPlk37w8IhQonvWQmXL1DMHwizF6NJWdJEU=;\n b=glu7DKeLZmlzrZ6iHO7Y9sqXHu1E77gUaAHvSGA8qrgyX14jVDsQQ54A2d8XLQvGolr/\n 3fqdYDicCZMGAhQKGn7T7MAJMHUHYWK8txWRnmgm3FkySUCBzzuZkX+4UUawiVC3nLI3\n MnzwFq49lr+1ztmiDzP8GedILWNhoSL8TwCDcJvb8OtWKyjzax7rwFoipAKSxws6Lc1N\n /co5hErr9RtM5o+z7PibNaSHWTThV5LcrAAKlcJLzOIlDpQaIFIJoK5aIS8LG7m/462x\n CTH6AiqyIQFNnvx/ADptBWFZAZyVgovxPyYa/YU9z3XCoM+PavxSlIG0HWMtyXqm3nhv YA==", "From": "Akhil Goyal <gakhil@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<thomas@monjalon.net>, <david.marchand@redhat.com>,\n <hemant.agrawal@nxp.com>, <anoobj@marvell.com>,\n <pablo.de.lara.guarch@intel.com>, <fiona.trahe@intel.com>,\n <declan.doherty@intel.com>, <matan@nvidia.com>, <g.singh@nxp.com>,\n <roy.fan.zhang@intel.com>, <jianjay.zhou@huawei.com>,\n <asomalap@amd.com>, <ruifeng.wang@arm.com>,\n <konstantin.ananyev@intel.com>, <radu.nicolau@intel.com>,\n <ajit.khaparde@broadcom.com>, <rnagadheeraj@marvell.com>,\n <adwivedi@marvell.com>, <ciara.power@intel.com>,\n <haiyue.wang@intel.com>, <jiawenwu@trustnetic.com>,\n <jianwang@trustnetic.com>, Akhil Goyal <gakhil@marvell.com>", "Date": "Thu, 14 Oct 2021 00:52:21 +0530", "Message-ID": "<20211013192222.1582631-7-gakhil@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211013192222.1582631-1-gakhil@marvell.com>", "References": "<20210930145014.2476799-1-gakhil@marvell.com>\n <20211013192222.1582631-1-gakhil@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "4ji-l7YUWjoZoOtGvvF02E6qXiyB5YJ8", "X-Proofpoint-GUID": "4ji-l7YUWjoZoOtGvvF02E6qXiyB5YJ8", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475\n definitions=2021-10-13_07,2021-10-13_02,2020-04-07_01", "Subject": "[dpdk-dev] [PATCH v2 6/7] cryptodev: hide sym session structure", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Structure rte_cryptodev_sym_session is moved to internal\nheaders which are not visible to applications.\nThe only field which should be used by app is opaque_data.\nThis field can now be accessed via set/get APIs added in this\npatch.\nSubsequent changes in app and lib are made to compile the code.\n\nSigned-off-by: Akhil Goyal <gakhil@marvell.com>\n---\n app/test/test_ipsec_perf.c | 4 +--\n lib/cryptodev/cryptodev_pmd.h | 22 +++++++++++++\n lib/cryptodev/rte_cryptodev.c | 11 ++++---\n lib/cryptodev/rte_cryptodev.h | 51 ++++++++++++++---------------\n lib/cryptodev/rte_cryptodev_trace.h | 13 ++------\n lib/ipsec/rte_ipsec.h | 2 +-\n lib/ipsec/rte_ipsec_group.h | 12 +++----\n lib/ipsec/ses.c | 3 +-\n 8 files changed, 67 insertions(+), 51 deletions(-)", "diff": "diff --git a/app/test/test_ipsec_perf.c b/app/test/test_ipsec_perf.c\nindex 92106bf374..7e1cc7b920 100644\n--- a/app/test/test_ipsec_perf.c\n+++ b/app/test/test_ipsec_perf.c\n@@ -215,7 +215,7 @@ static int\n create_sa(enum rte_security_session_action_type action_type,\n \t struct ipsec_sa *sa)\n {\n-\tstatic struct rte_cryptodev_sym_session dummy_ses;\n+\tstatic uint64_t dummy_ses[10];\n \tsize_t sz;\n \tint rc;\n \n@@ -235,7 +235,7 @@ create_sa(enum rte_security_session_action_type action_type,\n \t\t\"failed to allocate memory for rte_ipsec_sa\\n\");\n \n \tsa->ss[0].type = action_type;\n-\tsa->ss[0].crypto.ses = &dummy_ses;\n+\tsa->ss[0].crypto.ses = dummy_ses;\n \n \trc = rte_ipsec_sa_init(sa->ss[0].sa, &sa->sa_prm, sz);\n \trc = (rc > 0 && (uint32_t)rc <= sz) ? 0 : -EINVAL;\ndiff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h\nindex 94f427a912..8d2a15d495 100644\n--- a/lib/cryptodev/cryptodev_pmd.h\n+++ b/lib/cryptodev/cryptodev_pmd.h\n@@ -589,6 +589,28 @@ void\n cryptodev_fp_ops_set(struct rte_crypto_fp_ops *fp_ops,\n \t\t const struct rte_cryptodev *dev);\n \n+/**\n+ * @internal\n+ * Cryptodev symmetric crypto session\n+ * Each session is derived from a fixed xform chain. Therefore each session\n+ * has a fixed algo, key, op-type, digest_len etc.\n+ */\n+struct rte_cryptodev_sym_session {\n+\tuint64_t opaque_data;\n+\t/**< Can be used for external metadata */\n+\tuint16_t nb_drivers;\n+\t/**< number of elements in sess_data array */\n+\tuint16_t user_data_sz;\n+\t/**< session user data will be placed after sess_data */\n+\tuint16_t priv_sz;\n+\t/**< Maximum private session data size which each driver can use */\n+\t__extension__ struct {\n+\t\tvoid *data;\n+\t\tuint16_t refcnt;\n+\t} sess_data[0];\n+\t/**< Driver specific session material, variable size */\n+};\n+\n static inline void *\n get_sym_session_private_data(const struct rte_cryptodev_sym_session *sess,\n \t\tuint8_t driver_id) {\ndiff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c\nindex 6d3390ad03..d516a444c6 100644\n--- a/lib/cryptodev/rte_cryptodev.c\n+++ b/lib/cryptodev/rte_cryptodev.c\n@@ -2142,11 +2142,11 @@ rte_cryptodev_asym_get_private_session_size(uint8_t dev_id)\n }\n \n int\n-rte_cryptodev_sym_session_set_user_data(\n-\t\t\t\t\tstruct rte_cryptodev_sym_session *sess,\n+rte_cryptodev_sym_session_set_user_data(void *session,\n \t\t\t\t\tvoid *data,\n \t\t\t\t\tuint16_t size)\n {\n+\tstruct rte_cryptodev_sym_session *sess = session;\n \tif (sess == NULL)\n \t\treturn -EINVAL;\n \n@@ -2158,9 +2158,9 @@ rte_cryptodev_sym_session_set_user_data(\n }\n \n void *\n-rte_cryptodev_sym_session_get_user_data(\n-\t\t\t\t\tstruct rte_cryptodev_sym_session *sess)\n+rte_cryptodev_sym_session_get_user_data(void *session)\n {\n+\tstruct rte_cryptodev_sym_session *sess = session;\n \tif (sess == NULL || sess->user_data_sz == 0)\n \t\treturn NULL;\n \n@@ -2177,9 +2177,10 @@ sym_crypto_fill_status(struct rte_crypto_sym_vec *vec, int32_t errnum)\n \n uint32_t\n rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id,\n-\tstruct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs ofs,\n+\tvoid *session, union rte_crypto_sym_ofs ofs,\n \tstruct rte_crypto_sym_vec *vec)\n {\n+\tstruct rte_cryptodev_sym_session *sess = session;\n \tstruct rte_cryptodev *dev;\n \n \tif (!rte_cryptodev_is_valid_dev(dev_id)) {\ndiff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h\nindex 78c7ca3e20..17e105105b 100644\n--- a/lib/cryptodev/rte_cryptodev.h\n+++ b/lib/cryptodev/rte_cryptodev.h\n@@ -897,26 +897,6 @@ struct rte_cryptodev_cb_rcu {\n void *\n rte_cryptodev_get_sec_ctx(uint8_t dev_id);\n \n-/** Cryptodev symmetric crypto session\n- * Each session is derived from a fixed xform chain. Therefore each session\n- * has a fixed algo, key, op-type, digest_len etc.\n- */\n-struct rte_cryptodev_sym_session {\n-\tuint64_t opaque_data;\n-\t/**< Can be used for external metadata */\n-\tuint16_t nb_drivers;\n-\t/**< number of elements in sess_data array */\n-\tuint16_t user_data_sz;\n-\t/**< session user data will be placed after sess_data */\n-\tuint16_t priv_sz;\n-\t/**< Maximum private session data size which each driver can use */\n-\t__extension__ struct {\n-\t\tvoid *data;\n-\t\tuint16_t refcnt;\n-\t} sess_data[0];\n-\t/**< Driver specific session material, variable size */\n-};\n-\n /** Cryptodev asymmetric crypto session */\n struct rte_cryptodev_asym_session {\n \t__extension__ void *sess_private_data[0];\n@@ -1194,8 +1174,7 @@ const char *rte_cryptodev_driver_name_get(uint8_t driver_id);\n */\n __rte_experimental\n int\n-rte_cryptodev_sym_session_set_user_data(\n-\t\t\t\t\tstruct rte_cryptodev_sym_session *sess,\n+rte_cryptodev_sym_session_set_user_data(void *sess,\n \t\t\t\t\tvoid *data,\n \t\t\t\t\tuint16_t size);\n \n@@ -1211,8 +1190,7 @@ rte_cryptodev_sym_session_set_user_data(\n */\n __rte_experimental\n void *\n-rte_cryptodev_sym_session_get_user_data(\n-\t\t\t\t\tstruct rte_cryptodev_sym_session *sess);\n+rte_cryptodev_sym_session_get_user_data(void *sess);\n \n /**\n * Perform actual crypto processing (encrypt/digest or auth/decrypt)\n@@ -1229,7 +1207,7 @@ rte_cryptodev_sym_session_get_user_data(\n __rte_experimental\n uint32_t\n rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id,\n-\tstruct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs ofs,\n+\tvoid *sess, union rte_crypto_sym_ofs ofs,\n \tstruct rte_crypto_sym_vec *vec);\n \n /**\n@@ -1250,11 +1228,32 @@ rte_cryptodev_get_raw_dp_ctx_size(uint8_t dev_id);\n * pointer.\n */\n union rte_cryptodev_session_ctx {\n-\tstruct rte_cryptodev_sym_session *crypto_sess;\n+\tvoid *crypto_sess;\n \tstruct rte_crypto_sym_xform *xform;\n \tstruct rte_security_session *sec_sess;\n };\n \n+#define CRYPTO_SESS_OPAQUE_DATA_OFF 0\n+/**\n+ * Get opaque data from session handle\n+ */\n+static inline uint64_t\n+rte_cryptodev_sym_session_opaque_data_get(void *sess)\n+{\n+\treturn *((uint64_t *)sess - CRYPTO_SESS_OPAQUE_DATA_OFF);\n+}\n+\n+/**\n+ * Set opaque data in session handle\n+ */\n+static inline void\n+rte_cryptodev_sym_session_opaque_data_set(void *sess, uint64_t opaque)\n+{\n+\tuint64_t *data;\n+\tdata = (((uint64_t *)sess) - CRYPTO_SESS_OPAQUE_DATA_OFF);\n+\t*data = opaque;\n+}\n+\n /**\n * Enqueue a vectorized operation descriptor into the device queue but the\n * driver may or may not start processing until rte_cryptodev_raw_enqueue_done()\ndiff --git a/lib/cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/rte_cryptodev_trace.h\nindex 44da04c425..7d0e3773e6 100644\n--- a/lib/cryptodev/rte_cryptodev_trace.h\n+++ b/lib/cryptodev/rte_cryptodev_trace.h\n@@ -73,13 +73,9 @@ RTE_TRACE_POINT(\n \n RTE_TRACE_POINT(\n \trte_cryptodev_trace_sym_session_create,\n-\tRTE_TRACE_POINT_ARGS(void *mempool,\n-\t\tstruct rte_cryptodev_sym_session *sess),\n+\tRTE_TRACE_POINT_ARGS(void *mempool, void *sess),\n \trte_trace_point_emit_ptr(mempool);\n \trte_trace_point_emit_ptr(sess);\n-\trte_trace_point_emit_u64(sess->opaque_data);\n-\trte_trace_point_emit_u16(sess->nb_drivers);\n-\trte_trace_point_emit_u16(sess->user_data_sz);\n )\n \n RTE_TRACE_POINT(\n@@ -92,7 +88,7 @@ RTE_TRACE_POINT(\n \n RTE_TRACE_POINT(\n \trte_cryptodev_trace_sym_session_free,\n-\tRTE_TRACE_POINT_ARGS(struct rte_cryptodev_sym_session *sess),\n+\tRTE_TRACE_POINT_ARGS(void *sess),\n \trte_trace_point_emit_ptr(sess);\n )\n \n@@ -105,12 +101,9 @@ RTE_TRACE_POINT(\n RTE_TRACE_POINT(\n \trte_cryptodev_trace_sym_session_init,\n \tRTE_TRACE_POINT_ARGS(uint8_t dev_id,\n-\t\tstruct rte_cryptodev_sym_session *sess, void *xforms),\n+\t\tvoid *sess, void *xforms),\n \trte_trace_point_emit_u8(dev_id);\n \trte_trace_point_emit_ptr(sess);\n-\trte_trace_point_emit_u64(sess->opaque_data);\n-\trte_trace_point_emit_u16(sess->nb_drivers);\n-\trte_trace_point_emit_u16(sess->user_data_sz);\n \trte_trace_point_emit_ptr(xforms);\n )\n \ndiff --git a/lib/ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h\nindex 50d8e5098d..d54a64c4aa 100644\n--- a/lib/ipsec/rte_ipsec.h\n+++ b/lib/ipsec/rte_ipsec.h\n@@ -66,7 +66,7 @@ struct rte_ipsec_session {\n \t/** session and related data */\n \tunion {\n \t\tstruct {\n-\t\t\tstruct rte_cryptodev_sym_session *ses;\n+\t\t\tvoid *ses;\n \t\t\tuint8_t dev_id;\n \t\t} crypto;\n \t\tstruct {\ndiff --git a/lib/ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h\nindex 0cc5fedbf1..e27d4e6f4c 100644\n--- a/lib/ipsec/rte_ipsec_group.h\n+++ b/lib/ipsec/rte_ipsec_group.h\n@@ -44,16 +44,16 @@ struct rte_ipsec_group {\n static inline struct rte_ipsec_session *\n rte_ipsec_ses_from_crypto(const struct rte_crypto_op *cop)\n {\n-\tvoid *ss;\n-\tconst struct rte_cryptodev_sym_session *cs;\n+\tvoid *ses;\n \n \tif (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {\n-\t\tss = cop->sym[0].sec_session;\n+\t\tses = cop->sym[0].sec_session;\n \t\treturn (void *)(uintptr_t)\n-\t\t\trte_security_session_opaque_data_get(ss);\n+\t\t\trte_security_session_opaque_data_get(ses);\n \t} else if (cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {\n-\t\tcs = cop->sym[0].session;\n-\t\treturn (void *)(uintptr_t)cs->opaque_data;\n+\t\tses = cop->sym[0].session;\n+\t\treturn (void *)(uintptr_t)\n+\t\t\trte_cryptodev_sym_session_opaque_data_get(ses);\n \t}\n \treturn NULL;\n }\ndiff --git a/lib/ipsec/ses.c b/lib/ipsec/ses.c\nindex b12114269f..bfd3cbf1d3 100644\n--- a/lib/ipsec/ses.c\n+++ b/lib/ipsec/ses.c\n@@ -45,7 +45,8 @@ rte_ipsec_session_prepare(struct rte_ipsec_session *ss)\n \tss->pkt_func = fp;\n \n \tif (ss->type == RTE_SECURITY_ACTION_TYPE_NONE)\n-\t\tss->crypto.ses->opaque_data = (uintptr_t)ss;\n+\t\trte_cryptodev_sym_session_opaque_data_set(\n+\t\t\t\tss->crypto.ses, (uintptr_t)ss);\n \telse\n \t\trte_security_session_opaque_data_set(ss->security.ses,\n \t\t\t\t(uintptr_t)ss);\n", "prefixes": [ "v2", "6/7" ] }