Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/103141/?format=api
{ "id": 103141, "url": "http://patches.dpdk.org/api/patches/103141/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211028111111.6501-1-ktejasree@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": "<20211028111111.6501-1-ktejasree@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211028111111.6501-1-ktejasree@marvell.com", "date": "2021-10-28T11:11:11", "name": "crypto/octeontx2: fix lookaside IPsec IPv6 support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "831ee4fb078af6f02481290053e3381129901198", "submitter": { "id": 1789, "url": "http://patches.dpdk.org/api/people/1789/?format=api", "name": "Tejasree Kondoj", "email": "ktejasree@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/20211028111111.6501-1-ktejasree@marvell.com/mbox/", "series": [ { "id": 20090, "url": "http://patches.dpdk.org/api/series/20090/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20090", "date": "2021-10-28T11:11:11", "name": "crypto/octeontx2: fix lookaside IPsec IPv6 support", "version": 1, "mbox": "http://patches.dpdk.org/series/20090/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/103141/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/103141/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 190F8A0547;\n\tThu, 28 Oct 2021 12:18:03 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E209D40DDB;\n\tThu, 28 Oct 2021 12:18:02 +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 2B1034067B;\n Thu, 28 Oct 2021 12:18:02 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id\n 19SA5VuE021918;\n Thu, 28 Oct 2021 03:18:01 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com with ESMTP id 3byd2fathn-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Thu, 28 Oct 2021 03:18:01 -0700", "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, 28 Oct 2021 03:17:59 -0700", "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, 28 Oct 2021 03:17:59 -0700", "from hyd1554T5810.caveonetworks.com.com (unknown [10.29.57.11])\n by maili.marvell.com (Postfix) with ESMTP id 6A40E3F705F;\n Thu, 28 Oct 2021 03:17:56 -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 : mime-version : content-transfer-encoding :\n content-type; s=pfpt0220; bh=Utoe2z2kmU1PCsh1ru8nrHXmQ9BGnghdj9t5bNT6TaE=;\n b=EofVQf0N6BjPCT8qlzoTqnDMQqqtvtPRBvrs4mZs5mTKumdsHun62Dh/9a4s0+Nmh6Gn\n 0BPoYSpX1Ma+rJ/23fJBgJ5kIRRd/nin3drtnwEBwyD7xQvc/Im9a0GJdKr8L7GHGEEe\n 965HzrCTdpJDM1/QV80f6xIaJs0gkd7zESbxNwXoqZYXkcswt+pgge0mF4zVyP/Z8ml8\n vJthsorqObtKDdeSmq+WqPtJLsJ2DiWSFhCGgZDld6Efw2l1xNOUP3Ok4jflRdbky51N\n KJBgagXXf1XRPQi5THxyT4iGoKskaAH4wvimBNxlkAEkCSKmzQbtI5K3AniyV0PnWqAo oQ==", "From": "Tejasree Kondoj <ktejasree@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>", "CC": "Tejasree Kondoj <ktejasree@marvell.com>, Anoob Joseph\n <anoobj@marvell.com>, <dev@dpdk.org>, <stable@dpdk.org>", "Date": "Thu, 28 Oct 2021 16:41:11 +0530", "Message-ID": "<20211028111111.6501-1-ktejasree@marvell.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "mk5Da5ehKcdPgCTYUotemxHC32Yxzsq-", "X-Proofpoint-GUID": "mk5Da5ehKcdPgCTYUotemxHC32Yxzsq-", "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-28_01,2021-10-26_01,2020-04-07_01", "Subject": "[dpdk-dev] [PATCH] crypto/octeontx2: fix lookaside IPsec IPv6\n support", "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": "Fixing IPv6 mixed tunnel mode support by updating\ninputs to firmware.\n\nFixes: 4edede7bc6ee (\"crypto/octeontx2: support lookaside IPsec IPv6\")\nCc: stable@dpdk.org\n\nSigned-off-by: Tejasree Kondoj <ktejasree@marvell.com>\n---\n drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 9 ++++----\n drivers/crypto/octeontx2/otx2_cryptodev_sec.c | 22 +++++++------------\n drivers/crypto/octeontx2/otx2_cryptodev_sec.h | 2 --\n drivers/crypto/octeontx2/otx2_ipsec_po.h | 8 -------\n drivers/crypto/octeontx2/otx2_ipsec_po_ops.h | 10 +++------\n 5 files changed, 15 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c\nindex e6274bea42..e0ae3e161e 100644\n--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c\n+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c\n@@ -993,13 +993,12 @@ otx2_cpt_sec_post_process(struct rte_crypto_op *cop, uintptr_t *rsp)\n \n \tif (word0->s.opcode.major == OTX2_IPSEC_PO_PROCESS_IPSEC_INB) {\n \t\tdata = rte_pktmbuf_mtod(m, char *);\n+\t\tip = (struct rte_ipv4_hdr *)(data +\n+\t\t\tOTX2_IPSEC_PO_INB_RPTR_HDR);\n \n-\t\tif (rsp[4] == OTX2_IPSEC_PO_TRANSPORT ||\n-\t\t rsp[4] == OTX2_IPSEC_PO_TUNNEL_IPV4) {\n-\t\t\tip = (struct rte_ipv4_hdr *)(data +\n-\t\t\t\tOTX2_IPSEC_PO_INB_RPTR_HDR);\n+\t\tif ((ip->version_ihl >> 4) == 4) {\n \t\t\tm_len = rte_be_to_cpu_16(ip->total_length);\n-\t\t} else if (rsp[4] == OTX2_IPSEC_PO_TUNNEL_IPV6) {\n+\t\t} else {\n \t\t\tip6 = (struct rte_ipv6_hdr *)(data +\n \t\t\t\tOTX2_IPSEC_PO_INB_RPTR_HDR);\n \t\t\tm_len = rte_be_to_cpu_16(ip6->payload_len) +\ndiff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\nindex a5db40047d..9a4f84f8d8 100644\n--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\n+++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\n@@ -194,9 +194,6 @@ set_session_misc_attributes(struct otx2_sec_session_ipsec_lp *sess,\n \t\tsess->auth_iv_length = auth_xform->auth.iv.length;\n \t\tsess->mac_len = auth_xform->auth.digest_length;\n \t}\n-\n-\tsess->ucmd_param1 = OTX2_IPSEC_PO_PER_PKT_IV;\n-\tsess->ucmd_param2 = 0;\n }\n \n static int\n@@ -232,7 +229,6 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \tmemset(sa, 0, sizeof(struct otx2_ipsec_po_out_sa));\n \n \t/* Initialize lookaside ipsec private data */\n-\tlp->mode_type = OTX2_IPSEC_PO_TRANSPORT;\n \tlp->ip_id = 0;\n \tlp->seq_lo = 1;\n \tlp->seq_hi = 0;\n@@ -285,7 +281,6 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \n \tif (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {\n \t\tif (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) {\n-\t\t\tlp->mode_type = OTX2_IPSEC_PO_TUNNEL_IPV4;\n \t\t\tip->version_ihl = RTE_IPV4_VHL_DEF;\n \t\t\tip->time_to_live = ipsec->tunnel.ipv4.ttl;\n \t\t\tip->type_of_service |= (ipsec->tunnel.ipv4.dscp << 2);\n@@ -298,7 +293,6 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t} else if (ipsec->tunnel.type ==\n \t\t\t\tRTE_SECURITY_IPSEC_TUNNEL_IPV6) {\n \n-\t\t\tlp->mode_type = OTX2_IPSEC_PO_TUNNEL_IPV6;\n \t\t\tif (ctl->enc_type == OTX2_IPSEC_PO_SA_ENC_AES_GCM) {\n \t\t\t\ttemplate = &sa->aes_gcm.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n@@ -387,6 +381,10 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \tlp->ucmd_opcode = (lp->ctx_len << 8) |\n \t\t\t\t(OTX2_IPSEC_PO_PROCESS_IPSEC_OUTB);\n \n+\t/* Set per packet IV and IKEv2 bits */\n+\tlp->ucmd_param1 = BIT(11) | BIT(9);\n+\tlp->ucmd_param2 = 0;\n+\n \tset_session_misc_attributes(lp, crypto_xform,\n \t\t\t\t auth_xform, cipher_xform);\n \n@@ -429,20 +427,12 @@ crypto_sec_ipsec_inb_session_create(struct rte_cryptodev *crypto_dev,\n \tif (ret)\n \t\treturn ret;\n \n-\tlp->mode_type = OTX2_IPSEC_PO_TRANSPORT;\n-\n \tauth_xform = crypto_xform;\n \tcipher_xform = crypto_xform->next;\n \n \tcipher_key_len = 0;\n \tauth_key_len = 0;\n \n-\tif (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)\n-\t\tlp->mode_type = (ipsec->tunnel.type ==\n-\t\t\t\tRTE_SECURITY_IPSEC_TUNNEL_IPV4) ?\n-\t\t\t\tOTX2_IPSEC_PO_TUNNEL_IPV4 :\n-\t\t\t\tOTX2_IPSEC_PO_TUNNEL_IPV6;\n-\n \tif (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n \t\tif (crypto_xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM)\n \t\t\tmemcpy(sa->iv.gcm.nonce, &ipsec->salt, 4);\n@@ -482,6 +472,10 @@ crypto_sec_ipsec_inb_session_create(struct rte_cryptodev *crypto_dev,\n \tlp->cpt_inst_w7 = inst.u64[7];\n \tlp->ucmd_opcode = (lp->ctx_len << 8) |\n \t\t\t\t(OTX2_IPSEC_PO_PROCESS_IPSEC_INB);\n+\tlp->ucmd_param1 = 0;\n+\n+\t/* Set IKEv2 bit */\n+\tlp->ucmd_param2 = BIT(12);\n \n \tset_session_misc_attributes(lp, crypto_xform,\n \t\t\t\t auth_xform, cipher_xform);\ndiff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.h b/drivers/crypto/octeontx2/otx2_cryptodev_sec.h\nindex 87f55c97fe..ff3329c9c1 100644\n--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.h\n+++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.h\n@@ -55,8 +55,6 @@ struct otx2_sec_session_ipsec_lp {\n \tuint8_t iv_length;\n \t/** Auth IV length in bytes */\n \tuint8_t auth_iv_length;\n-\t/** IPsec mode and tunnel type */\n-\tenum otx2_ipsec_po_mode_type mode_type;\n };\n \n int otx2_crypto_sec_ctx_create(struct rte_cryptodev *crypto_dev);\ndiff --git a/drivers/crypto/octeontx2/otx2_ipsec_po.h b/drivers/crypto/octeontx2/otx2_ipsec_po.h\nindex b61c5e0c04..695f552644 100644\n--- a/drivers/crypto/octeontx2/otx2_ipsec_po.h\n+++ b/drivers/crypto/octeontx2/otx2_ipsec_po.h\n@@ -11,8 +11,6 @@\n \n #define OTX2_IPSEC_PO_AES_GCM_INB_CTX_LEN 0x09\n \n-#define OTX2_IPSEC_PO_PER_PKT_IV BIT(11)\n-\n #define OTX2_IPSEC_PO_WRITE_IPSEC_OUTB 0x20\n #define OTX2_IPSEC_PO_WRITE_IPSEC_INB 0x21\n #define OTX2_IPSEC_PO_PROCESS_IPSEC_OUTB 0x23\n@@ -20,12 +18,6 @@\n \n #define OTX2_IPSEC_PO_INB_RPTR_HDR 0x8\n \n-enum otx2_ipsec_po_mode_type {\n-\tOTX2_IPSEC_PO_TRANSPORT = 1,\n-\tOTX2_IPSEC_PO_TUNNEL_IPV4,\n-\tOTX2_IPSEC_PO_TUNNEL_IPV6,\n-};\n-\n enum otx2_ipsec_po_comp_e {\n \tOTX2_IPSEC_PO_CC_SUCCESS = 0x00,\n \tOTX2_IPSEC_PO_CC_AUTH_UNSUPPORTED = 0xB0,\ndiff --git a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h\nindex 25ee10f342..c3abf02187 100644\n--- a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h\n+++ b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h\n@@ -25,8 +25,7 @@ otx2_ipsec_po_out_rlen_get(struct otx2_sec_session_ipsec_lp *sess,\n }\n \n static __rte_always_inline struct cpt_request_info *\n-alloc_request_struct(char *maddr, void *cop, int mdata_len,\n-\t\t enum otx2_ipsec_po_mode_type mode_type)\n+alloc_request_struct(char *maddr, void *cop, int mdata_len)\n {\n \tstruct cpt_request_info *req;\n \tstruct cpt_meta_info *meta;\n@@ -48,7 +47,6 @@ alloc_request_struct(char *maddr, void *cop, int mdata_len,\n \top[1] = (uintptr_t)cop;\n \top[2] = (uintptr_t)req;\n \top[3] = mdata_len;\n-\top[4] = mode_type;\n \n \treturn req;\n }\n@@ -86,8 +84,7 @@ process_outb_sa(struct rte_crypto_op *cop,\n \t}\n \n \tmdata += extend_tail; /* mdata follows encrypted data */\n-\treq = alloc_request_struct(mdata, (void *)cop, mdata_len,\n-\t\tsess->mode_type);\n+\treq = alloc_request_struct(mdata, (void *)cop, mdata_len);\n \n \tdata = rte_pktmbuf_prepend(m_src, extend_head);\n \tif (unlikely(data == NULL)) {\n@@ -153,8 +150,7 @@ process_inb_sa(struct rte_crypto_op *cop,\n \t\tgoto exit;\n \t}\n \n-\treq = alloc_request_struct(mdata, (void *)cop, mdata_len,\n-\t\tsess->mode_type);\n+\treq = alloc_request_struct(mdata, (void *)cop, mdata_len);\n \n \t/* Prepare CPT instruction */\n \tword0.u64 = sess->ucmd_w0;\n", "prefixes": [] }