Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105183/?format=api
{ "id": 105183, "url": "http://patches.dpdk.org/api/patches/105183/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1639676975-1316-19-git-send-email-anoobj@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": "<1639676975-1316-19-git-send-email-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1639676975-1316-19-git-send-email-anoobj@marvell.com", "date": "2021-12-16T17:49:24", "name": "[v2,18/29] crypto/cnxk: handle null chained ops", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1129b6c8334bfdcc14b299016ff5390bccb8ac61", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1639676975-1316-19-git-send-email-anoobj@marvell.com/mbox/", "series": [ { "id": 20957, "url": "http://patches.dpdk.org/api/series/20957/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20957", "date": "2021-12-16T17:49:06", "name": "New features and improvements in cnxk crypto PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/20957/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/105183/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/105183/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 5FD14A0032;\n\tThu, 16 Dec 2021 18:54:27 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D6CC241142;\n\tThu, 16 Dec 2021 18:54:11 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id C061440143\n for <dev@dpdk.org>; Thu, 16 Dec 2021 18:54:10 +0100 (CET)", "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 ESMTP id\n 1BGBdZ7P030133\n for <dev@dpdk.org>; Thu, 16 Dec 2021 09:54:10 -0800", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3d04s71p6j-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Thu, 16 Dec 2021 09:54:09 -0800", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Thu, 16 Dec 2021 09:54:08 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Thu, 16 Dec 2021 09:54:08 -0800", "from HY-LT1002.marvell.com (HY-LT1002.marvell.com [10.28.176.218])\n by maili.marvell.com (Postfix) with ESMTP id 2D0C13F7048;\n Thu, 16 Dec 2021 09:54:05 -0800 (PST)" ], "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=wvdVVHsr62Wa5gyqgACrgIkCdHROpLTKwN7GZXuD860=;\n b=hJOJ6ckqLKStFRf+Hp2Bl6Bci0ZvkzQbrowlqgzaZvlrZaPibjjijnQDoIY6qAEDmfRI\n 0ED91Knoi8RyNBcq43PdGujRwv7urqUU+GirX+Jf1TvJwzQLT3I7eAUY9K3ni/u7L8XF\n 0OjHzBviZZg5xmaCjU0AvGtE9smTnekQ7fJajumtJjmuPt6Giaqc/rF3BQbp/Jp7GZ9+\n 0rEwCP5F8Xal4xy8bmwyOBTsJFy7YuBiOsTlrB4m94Ext6F+FvpdTtoh50HD0An4E+ec\n k+cANtgRlOjJPWnEeIQsV8JPHjP+IemH6jY/AxoV1/Eh5wK4umH5C+qAMYp4FeDAu4ud Qg==", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>, Jerin Jacob <jerinj@marvell.com>", "CC": "Anoob Joseph <anoobj@marvell.com>, Archana Muniganti\n <marchana@marvell.com>,\n Tejasree Kondoj <ktejasree@marvell.com>, <dev@dpdk.org>", "Subject": "[PATCH v2 18/29] crypto/cnxk: handle null chained ops", "Date": "Thu, 16 Dec 2021 23:19:24 +0530", "Message-ID": "<1639676975-1316-19-git-send-email-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1639676975-1316-1-git-send-email-anoobj@marvell.com>", "References": "<1638859858-734-1-git-send-email-anoobj@marvell.com>\n <1639676975-1316-1-git-send-email-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "9ZE15Nw5kwIZ_XRMnMppNbZEnEfB9qeH", "X-Proofpoint-ORIG-GUID": "9ZE15Nw5kwIZ_XRMnMppNbZEnEfB9qeH", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513\n definitions=2021-12-16_06,2021-12-16_01,2021-12-02_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": "Verification doesn't cover cases when NULL auth/cipher is provided as a\nchain. Removed the separate function for verification and added a\nreplacement function which calls the appropriate downstream functions.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\n---\n drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 189 ++++++++++++++++---------------\n drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 10 --\n drivers/crypto/cnxk/cnxk_se.h | 6 +\n 3 files changed, 102 insertions(+), 103 deletions(-)", "diff": "diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\nindex 21ee09f..b02f070 100644\n--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\n+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\n@@ -418,84 +418,121 @@ cnxk_cpt_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)\n }\n \n static int\n-sym_xform_verify(struct rte_crypto_sym_xform *xform)\n+cnxk_sess_fill(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)\n {\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->auth.algo == RTE_CRYPTO_AUTH_NULL &&\n-\t xform->auth.op == RTE_CRYPTO_AUTH_OP_VERIFY)\n-\t\treturn -ENOTSUP;\n+\tstruct rte_crypto_sym_xform *aead_xfrm = NULL;\n+\tstruct rte_crypto_sym_xform *c_xfrm = NULL;\n+\tstruct rte_crypto_sym_xform *a_xfrm = NULL;\n+\tbool ciph_then_auth;\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && xform->next == NULL)\n-\t\treturn CNXK_CPT_CIPHER;\n+\tif (xform == NULL)\n+\t\treturn -EINVAL;\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH && xform->next == NULL)\n-\t\treturn CNXK_CPT_AUTH;\n+\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {\n+\t\tc_xfrm = xform;\n+\t\ta_xfrm = xform->next;\n+\t\tciph_then_auth = true;\n+\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n+\t\tc_xfrm = xform->next;\n+\t\ta_xfrm = xform;\n+\t\tciph_then_auth = false;\n+\t} else {\n+\t\taead_xfrm = xform;\n+\t}\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD && xform->next == NULL)\n-\t\treturn CNXK_CPT_AEAD;\n+\tif (c_xfrm != NULL && c_xfrm->type != RTE_CRYPTO_SYM_XFORM_CIPHER) {\n+\t\tplt_dp_err(\"Invalid type in cipher xform\");\n+\t\treturn -EINVAL;\n+\t}\n \n-\tif (xform->next == NULL)\n-\t\treturn -EIO;\n+\tif (a_xfrm != NULL && a_xfrm->type != RTE_CRYPTO_SYM_XFORM_AUTH) {\n+\t\tplt_dp_err(\"Invalid type in auth xform\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (aead_xfrm != NULL && aead_xfrm->type != RTE_CRYPTO_SYM_XFORM_AEAD) {\n+\t\tplt_dp_err(\"Invalid type in AEAD xform\");\n+\t\treturn -EINVAL;\n+\t}\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->cipher.algo == RTE_CRYPTO_CIPHER_3DES_CBC &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->next->auth.algo == RTE_CRYPTO_AUTH_SHA1)\n+\tif ((c_xfrm == NULL || c_xfrm->cipher.algo == RTE_CRYPTO_CIPHER_NULL) &&\n+\t a_xfrm != NULL && a_xfrm->auth.algo == RTE_CRYPTO_AUTH_NULL &&\n+\t a_xfrm->auth.op == RTE_CRYPTO_AUTH_OP_VERIFY) {\n+\t\tplt_dp_err(\"Null cipher + null auth verify is not supported\");\n \t\treturn -ENOTSUP;\n+\t}\n+\n+\t/* Cipher only */\n+\tif (c_xfrm != NULL &&\n+\t (a_xfrm == NULL || a_xfrm->auth.algo == RTE_CRYPTO_AUTH_NULL)) {\n+\t\tif (fill_sess_cipher(c_xfrm, sess))\n+\t\t\treturn -ENOTSUP;\n+\t\telse\n+\t\t\treturn 0;\n+\t}\n+\n+\t/* Auth only */\n+\tif (a_xfrm != NULL &&\n+\t (c_xfrm == NULL || c_xfrm->cipher.algo == RTE_CRYPTO_CIPHER_NULL)) {\n+\t\tif (fill_sess_auth(a_xfrm, sess))\n+\t\t\treturn -ENOTSUP;\n+\t\telse\n+\t\t\treturn 0;\n+\t}\n+\n+\t/* AEAD */\n+\tif (aead_xfrm != NULL) {\n+\t\tif (fill_sess_aead(aead_xfrm, sess))\n+\t\t\treturn -ENOTSUP;\n+\t\telse\n+\t\t\treturn 0;\n+\t}\n+\n+\t/* Chained ops */\n+\tif (c_xfrm == NULL || a_xfrm == NULL) {\n+\t\tplt_dp_err(\"Invalid xforms\");\n+\t\treturn -EINVAL;\n+\t}\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->auth.algo == RTE_CRYPTO_AUTH_SHA1 &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->next->cipher.algo == RTE_CRYPTO_CIPHER_3DES_CBC)\n+\tif (c_xfrm->cipher.algo == RTE_CRYPTO_CIPHER_3DES_CBC &&\n+\t a_xfrm->auth.algo == RTE_CRYPTO_AUTH_SHA1) {\n+\t\tplt_dp_err(\"3DES-CBC + SHA1 is not supported\");\n \t\treturn -ENOTSUP;\n+\t}\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->next->auth.op == RTE_CRYPTO_AUTH_OP_GENERATE)\n-\t\treturn CNXK_CPT_CIPHER_ENC_AUTH_GEN;\n-\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->auth.op == RTE_CRYPTO_AUTH_OP_VERIFY &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT)\n-\t\treturn CNXK_CPT_AUTH_VRFY_CIPHER_DEC;\n-\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->auth.op == RTE_CRYPTO_AUTH_OP_GENERATE &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {\n-\t\tswitch (xform->auth.algo) {\n-\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\t\tswitch (xform->next->cipher.algo) {\n-\t\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\t\t\treturn CNXK_CPT_AUTH_GEN_CIPHER_ENC;\n-\t\t\tdefault:\n-\t\t\t\treturn -ENOTSUP;\n-\t\t\t}\n-\t\tdefault:\n+\t/* Cipher then auth */\n+\tif (ciph_then_auth) {\n+\t\tif (fill_sess_cipher(c_xfrm, sess))\n \t\t\treturn -ENOTSUP;\n-\t\t}\n+\t\tif (fill_sess_auth(a_xfrm, sess))\n+\t\t\treturn -ENOTSUP;\n+\t\telse\n+\t\t\treturn 0;\n \t}\n \n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n-\t xform->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT &&\n-\t xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n-\t xform->next->auth.op == RTE_CRYPTO_AUTH_OP_VERIFY) {\n-\t\tswitch (xform->cipher.algo) {\n-\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\t\tswitch (xform->next->auth.algo) {\n-\t\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\t\t\treturn CNXK_CPT_CIPHER_DEC_AUTH_VRFY;\n+\t/* else */\n+\n+\tif (c_xfrm->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {\n+\t\tswitch (a_xfrm->auth.algo) {\n+\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\t\tswitch (c_xfrm->cipher.algo) {\n+\t\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\treturn -ENOTSUP;\n \t\t\t}\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\treturn -ENOTSUP;\n \t\t}\n \t}\n \n-\treturn -ENOTSUP;\n+\tif (fill_sess_auth(a_xfrm, sess))\n+\t\treturn -ENOTSUP;\n+\tif (fill_sess_cipher(c_xfrm, sess))\n+\t\treturn -ENOTSUP;\n+\telse\n+\t\treturn 0;\n }\n \n static uint64_t\n@@ -524,10 +561,6 @@ sym_session_configure(struct roc_cpt *roc_cpt, int driver_id,\n \tvoid *priv;\n \tint ret;\n \n-\tret = sym_xform_verify(xform);\n-\tif (unlikely(ret < 0))\n-\t\treturn ret;\n-\n \tif (unlikely(rte_mempool_get(pool, &priv))) {\n \t\tplt_dp_err(\"Could not allocate session private data\");\n \t\treturn -ENOMEM;\n@@ -537,37 +570,7 @@ sym_session_configure(struct roc_cpt *roc_cpt, int driver_id,\n \n \tsess_priv = priv;\n \n-\tswitch (ret) {\n-\tcase CNXK_CPT_CIPHER:\n-\t\tret = fill_sess_cipher(xform, sess_priv);\n-\t\tbreak;\n-\tcase CNXK_CPT_AUTH:\n-\t\tif (xform->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC)\n-\t\t\tret = fill_sess_gmac(xform, sess_priv);\n-\t\telse\n-\t\t\tret = fill_sess_auth(xform, sess_priv);\n-\t\tbreak;\n-\tcase CNXK_CPT_AEAD:\n-\t\tret = fill_sess_aead(xform, sess_priv);\n-\t\tbreak;\n-\tcase CNXK_CPT_CIPHER_ENC_AUTH_GEN:\n-\tcase CNXK_CPT_CIPHER_DEC_AUTH_VRFY:\n-\t\tret = fill_sess_cipher(xform, sess_priv);\n-\t\tif (ret < 0)\n-\t\t\tbreak;\n-\t\tret = fill_sess_auth(xform->next, sess_priv);\n-\t\tbreak;\n-\tcase CNXK_CPT_AUTH_VRFY_CIPHER_DEC:\n-\tcase CNXK_CPT_AUTH_GEN_CIPHER_ENC:\n-\t\tret = fill_sess_auth(xform, sess_priv);\n-\t\tif (ret < 0)\n-\t\t\tbreak;\n-\t\tret = fill_sess_cipher(xform->next, sess_priv);\n-\t\tbreak;\n-\tdefault:\n-\t\tret = -1;\n-\t}\n-\n+\tret = cnxk_sess_fill(xform, sess_priv);\n \tif (ret)\n \t\tgoto priv_put;\n \n@@ -592,7 +595,7 @@ sym_session_configure(struct roc_cpt *roc_cpt, int driver_id,\n priv_put:\n \trte_mempool_put(pool, priv);\n \n-\treturn -ENOTSUP;\n+\treturn ret;\n }\n \n int\ndiff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\nindex 0d36365..ca363bb 100644\n--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\n+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\n@@ -30,16 +30,6 @@ struct cpt_qp_meta_info {\n \tint mlen;\n };\n \n-enum sym_xform_type {\n-\tCNXK_CPT_CIPHER = 1,\n-\tCNXK_CPT_AUTH,\n-\tCNXK_CPT_AEAD,\n-\tCNXK_CPT_CIPHER_ENC_AUTH_GEN,\n-\tCNXK_CPT_AUTH_VRFY_CIPHER_DEC,\n-\tCNXK_CPT_AUTH_GEN_CIPHER_ENC,\n-\tCNXK_CPT_CIPHER_DEC_AUTH_VRFY\n-};\n-\n #define CPT_OP_FLAGS_METABUF\t (1 << 1)\n #define CPT_OP_FLAGS_AUTH_VERIFY (1 << 0)\n #define CPT_OP_FLAGS_IPSEC_DIR_INBOUND (1 << 2)\ndiff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h\nindex 37237de..a8cd2c5 100644\n--- a/drivers/crypto/cnxk/cnxk_se.h\n+++ b/drivers/crypto/cnxk/cnxk_se.h\n@@ -36,6 +36,9 @@ struct cnxk_se_sess {\n \tstruct roc_se_ctx roc_se_ctx;\n } __rte_cache_aligned;\n \n+static __rte_always_inline int\n+fill_sess_gmac(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess);\n+\n static inline void\n cpt_pack_iv(uint8_t *iv_src, uint8_t *iv_dst)\n {\n@@ -1808,6 +1811,9 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)\n \troc_se_auth_type auth_type = 0; /* NULL Auth type */\n \tuint8_t zsk_flag = 0, aes_gcm = 0, is_null = 0;\n \n+\tif (xform->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC)\n+\t\treturn fill_sess_gmac(xform, sess);\n+\n \tif (xform->next != NULL &&\n \t xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n \t xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {\n", "prefixes": [ "v2", "18/29" ] }