Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131789/?format=api
{ "id": 131789, "url": "https://patches.dpdk.org/api/patches/131789/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230921114820.2526810-11-ktejasree@marvell.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": "<20230921114820.2526810-11-ktejasree@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230921114820.2526810-11-ktejasree@marvell.com", "date": "2023-09-21T11:48:15", "name": "[10/15] crypto/cnxk: set PDCP chain IV offset based on FVC", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2c6f9a29d2d82b0d259d9f0d3889b3d25f9820fe", "submitter": { "id": 1789, "url": "https://patches.dpdk.org/api/people/1789/?format=api", "name": "Tejasree Kondoj", "email": "ktejasree@marvell.com" }, "delegate": { "id": 6690, "url": "https://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230921114820.2526810-11-ktejasree@marvell.com/mbox/", "series": [ { "id": 29589, "url": "https://patches.dpdk.org/api/series/29589/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29589", "date": "2023-09-21T11:48:05", "name": "fixes and improvements to cnxk crypto PMD", "version": 1, "mbox": "https://patches.dpdk.org/series/29589/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131789/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/131789/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 26AD5425FF;\n\tThu, 21 Sep 2023 13:49:33 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EE56541109;\n\tThu, 21 Sep 2023 13:48:54 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id C4A2041109\n for <dev@dpdk.org>; Thu, 21 Sep 2023 13:48:52 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 38LBSFfB018686 for <dev@dpdk.org>; Thu, 21 Sep 2023 04:48:52 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3t85ptu0ec-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Thu, 21 Sep 2023 04:48:52 -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.48;\n Thu, 21 Sep 2023 04:48:49 -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.48 via Frontend\n Transport; Thu, 21 Sep 2023 04:48:49 -0700", "from hyd1554.marvell.com (unknown [10.29.57.11])\n by maili.marvell.com (Postfix) with ESMTP id 92C6F5B693B;\n Thu, 21 Sep 2023 04:48:47 -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=/QjRF3U9k/oj8di0Az6/Ts5cFm5P1zN1604+OFiM/FI=;\n b=OYzunFxJFhAvIM8TI66gJFFgNdpr8RFDanV/g3gOzjYXXXL/jisjop5rZd6X+rD33TFJ\n Hbu9KWlAeKiuiucKn0QCslE71cbGIyHVD+oV68kHUXtslSYpFd/DvS4+fqppnyMieiUf\n KpmuOk05jMPwzpZQwE20CUT6avkdzCWfoF8itsm5kfICFnkwTq+QcxAdhEfbwqQN95ev\n 5uZy1h3yg1ORbsvdlcF9ZMCpa0kgOksifXzqgH4mwo0ORcDtezfzKMnI8O7x4+QPZXBQ\n cAYjDu7UqwVOqkEzo2GcTBy/jRjQBfprqFogyi13Rk75cpRp0R40Zryale2Cd6uDoWMG Ag==", "From": "Tejasree Kondoj <ktejasree@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>", "CC": "Anoob Joseph <anoobj@marvell.com>, Aakash Sasidharan\n <asasidharan@marvell.com>, Gowrishankar Muthukrishnan\n <gmuthukrishn@marvell.com>,\n Vidya Sagar Velumuri <vvelumuri@marvell.com>, <dev@dpdk.org>", "Subject": "[PATCH 10/15] crypto/cnxk: set PDCP chain IV offset based on FVC", "Date": "Thu, 21 Sep 2023 17:18:15 +0530", "Message-ID": "<20230921114820.2526810-11-ktejasree@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230921114820.2526810-1-ktejasree@marvell.com>", "References": "<20230921114820.2526810-1-ktejasree@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "i9DxKOwZdcyAU6nunAff2ME6-dac6jGj", "X-Proofpoint-ORIG-GUID": "i9DxKOwZdcyAU6nunAff2ME6-dac6jGj", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-09-21_09,2023-09-21_01,2023-05-22_02", "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": "Set PDCP chain IV offset based on zuc 256 firmware\n\nSigned-off-by: Tejasree Kondoj <ktejasree@marvell.com>\n---\n drivers/common/cnxk/hw/cpt.h | 4 +++-\n drivers/common/cnxk/roc_se.h | 3 +++\n drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 10 ++++++++--\n drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 5 +++--\n drivers/crypto/cnxk/cnxk_se.h | 16 ++++++++++------\n 5 files changed, 27 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/common/cnxk/hw/cpt.h b/drivers/common/cnxk/hw/cpt.h\nindex 96a863322a..cad4ed7e79 100644\n--- a/drivers/common/cnxk/hw/cpt.h\n+++ b/drivers/common/cnxk/hw/cpt.h\n@@ -78,7 +78,9 @@ union cpt_eng_caps {\n \t\tuint64_t __io sm4 : 1;\n \t\tuint64_t __io reserved_23_34 : 12;\n \t\tuint64_t __io sg_ver2 : 1;\n-\t\tuint64_t __io reserved_36_63 : 28;\n+\t\tuint64_t __io reserved36 : 1;\n+\t\tuint64_t __io pdcp_chain_zuc256 : 1;\n+\t\tuint64_t __io reserved_38_63 : 26;\n \t};\n };\n \ndiff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h\nindex 2a5abd71cf..d8cbd58c9a 100644\n--- a/drivers/common/cnxk/roc_se.h\n+++ b/drivers/common/cnxk/roc_se.h\n@@ -323,6 +323,8 @@ struct roc_se_ctx {\n \tuint64_t ciph_then_auth : 1;\n \tuint64_t auth_then_ciph : 1;\n \tuint64_t eia2 : 1;\n+\t/* auth_iv_offset passed to PDCP_CHAIN opcode based on FVC bit */\n+\tuint8_t pdcp_iv_offset;\n \tunion cpt_inst_w4 template_w4;\n \t/* Below fields are accessed by hardware */\n \tstruct se_ctx_s {\n@@ -366,6 +368,7 @@ struct roc_se_fc_params {\n \tstruct roc_se_buf_ptr meta_buf;\n \tuint8_t cipher_iv_len;\n \tuint8_t auth_iv_len;\n+\tuint8_t pdcp_iv_offset;\n \n \tstruct roc_se_buf_ptr aad_buf;\n \tstruct roc_se_buf_ptr mac_buf;\ndiff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\nindex 99bf853234..82938c77c8 100644\n--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\n+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c\n@@ -484,13 +484,19 @@ is_valid_pdcp_cipher_alg(struct rte_crypto_sym_xform *c_xfrm,\n }\n \n static int\n-cnxk_sess_fill(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)\n+cnxk_sess_fill(struct roc_cpt *roc_cpt, struct rte_crypto_sym_xform *xform,\n+\t struct cnxk_se_sess *sess)\n {\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 = false;\n \n+\tif (roc_cpt->hw_caps[CPT_ENG_TYPE_SE].pdcp_chain_zuc256)\n+\t\tsess->roc_se_ctx.pdcp_iv_offset = 24;\n+\telse\n+\t\tsess->roc_se_ctx.pdcp_iv_offset = 16;\n+\n \tif (xform == NULL)\n \t\treturn -EINVAL;\n \n@@ -672,7 +678,7 @@ sym_session_configure(struct roc_cpt *roc_cpt, struct rte_crypto_sym_xform *xfor\n \tif (is_session_less)\n \t\tmemset(sess_priv, 0, sizeof(struct cnxk_se_sess));\n \n-\tret = cnxk_sess_fill(xform, sess_priv);\n+\tret = cnxk_sess_fill(roc_cpt, xform, sess_priv);\n \tif (ret)\n \t\tgoto priv_put;\n \ndiff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\nindex 6ee4cbda70..3d1f9b8a48 100644\n--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\n+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h\n@@ -16,8 +16,9 @@\n #include \"roc_errata.h\"\n #include \"roc_se.h\"\n \n-#define CNXK_CPT_MIN_HEADROOM_REQ\t 32\n-#define CNXK_CPT_MIN_TAILROOM_REQ\t 102\n+/* Space for ctrl_word(8B), IV(48B), passthrough alignment(8B) */\n+#define CNXK_CPT_MIN_HEADROOM_REQ 64\n+#define CNXK_CPT_MIN_TAILROOM_REQ 102\n \n /* Default command timeout in seconds */\n #define DEFAULT_COMMAND_TIMEOUT 4\ndiff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h\nindex b8998d401b..fdc1f3651c 100644\n--- a/drivers/crypto/cnxk/cnxk_se.h\n+++ b/drivers/crypto/cnxk/cnxk_se.h\n@@ -892,7 +892,7 @@ pdcp_chain_sg1_prep(struct roc_se_fc_params *params, struct roc_se_ctx *cpt_ctx,\n \tpdcp_iv_copy(iv_d, cipher_iv, pdcp_ci_alg, pack_iv);\n \n \t/* Auth IV */\n-\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + 16);\n+\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + params->pdcp_iv_offset);\n \tpdcp_iv_copy(iv_d, auth_iv, pdcp_auth_alg, pack_iv);\n \n \t/* input data */\n@@ -998,7 +998,7 @@ pdcp_chain_sg2_prep(struct roc_se_fc_params *params, struct roc_se_ctx *cpt_ctx,\n \tpdcp_iv_copy(iv_d, cipher_iv, pdcp_ci_alg, pack_iv);\n \n \t/* Auth IV */\n-\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + 16);\n+\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + params->pdcp_iv_offset);\n \tpdcp_iv_copy(iv_d, auth_iv, pdcp_auth_alg, pack_iv);\n \n \t/* input data */\n@@ -1490,11 +1490,12 @@ cpt_pdcp_chain_alg_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,\n \tuint32_t encr_data_len, auth_data_len, aad_len, passthr_len, pad_len, hdr_len;\n \tuint32_t encr_offset, auth_offset, iv_offset = 0;\n \tconst uint8_t *auth_iv = NULL, *cipher_iv = NULL;\n+\tuint8_t pdcp_iv_off = params->pdcp_iv_offset;\n+\tconst int iv_len = pdcp_iv_off * 2;\n \tuint8_t pdcp_ci_alg, pdcp_auth_alg;\n \tunion cpt_inst_w4 cpt_inst_w4;\n \tstruct roc_se_ctx *se_ctx;\n \tuint64_t *offset_vaddr;\n-\tconst int iv_len = 32;\n \tuint64_t offset_ctrl;\n \tuint8_t pack_iv = 0;\n \tint32_t inputlen;\n@@ -1576,7 +1577,7 @@ cpt_pdcp_chain_alg_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,\n \t\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN);\n \t\tpdcp_iv_copy(iv_d, cipher_iv, pdcp_ci_alg, pack_iv);\n \n-\t\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + 16);\n+\t\tiv_d = ((uint8_t *)offset_vaddr + ROC_SE_OFF_CTRL_LEN + pdcp_iv_off);\n \t\tpdcp_iv_copy(iv_d, auth_iv, pdcp_auth_alg, pack_iv);\n \n \t\tinst->w4.u64 = cpt_inst_w4.u64;\n@@ -2909,6 +2910,7 @@ fill_pdcp_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \tfc_params.auth_iv_len = 0;\n \tfc_params.iv_buf = NULL;\n \tfc_params.auth_iv_buf = NULL;\n+\tfc_params.pdcp_iv_offset = sess->roc_se_ctx.pdcp_iv_offset;\n \n \tif (likely(sess->iv_length))\n \t\tfc_params.iv_buf = rte_crypto_op_ctod_offset(cop, uint8_t *, sess->iv_offset);\n@@ -2995,6 +2997,7 @@ fill_pdcp_chain_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \tfc_params.auth_iv_len = sess->auth_iv_length;\n \tfc_params.iv_buf = NULL;\n \tfc_params.auth_iv_buf = NULL;\n+\tfc_params.pdcp_iv_offset = sess->roc_se_ctx.pdcp_iv_offset;\n \n \tm_src = sym_op->m_src;\n \tm_dst = sym_op->m_dst;\n@@ -3197,8 +3200,9 @@ fill_digest_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess,\n \t\td_offs = auth_range_off;\n \t\tauth_range_off = 0;\n \t\tparams.auth_iv_len = sess->auth_iv_length;\n-\t\tparams.auth_iv_buf = rte_crypto_op_ctod_offset(\n-\t\t\tcop, uint8_t *, sess->auth_iv_offset);\n+\t\tparams.auth_iv_buf =\n+\t\t\trte_crypto_op_ctod_offset(cop, uint8_t *, sess->auth_iv_offset);\n+\t\tparams.pdcp_iv_offset = sess->roc_se_ctx.pdcp_iv_offset;\n \t\tif (sess->zsk_flag == ROC_SE_K_F9) {\n \t\t\tuint32_t length_in_bits, num_bytes;\n \t\t\tuint8_t *src, direction = 0;\n", "prefixes": [ "10/15" ] }