Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91540/?format=api
{ "id": 91540, "url": "https://patches.dpdk.org/api/patches/91540/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210415072205.1439-2-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": "<20210415072205.1439-2-ktejasree@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210415072205.1439-2-ktejasree@marvell.com", "date": "2021-04-15T07:22:03", "name": "[v4,1/3] crypto/octeontx2: add UDP encapsulation support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dbc0f56f889131e06eb7e59ef5bd4ff9f9045cad", "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/20210415072205.1439-2-ktejasree@marvell.com/mbox/", "series": [ { "id": 16394, "url": "https://patches.dpdk.org/api/series/16394/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16394", "date": "2021-04-15T07:22:02", "name": "add lookaside IPsec UDP encapsulation and transport mode", "version": 4, "mbox": "https://patches.dpdk.org/series/16394/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/91540/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/91540/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 662D3A0A0C;\n\tThu, 15 Apr 2021 08:26:22 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 49A6916202E;\n\tThu, 15 Apr 2021 08:26:22 +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 7E0F5162023\n for <dev@dpdk.org>; Thu, 15 Apr 2021 08:26:20 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id\n 13F6PpZO011274; Wed, 14 Apr 2021 23:26:19 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com with ESMTP id 37xcn4rj17-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 14 Apr 2021 23:26:19 -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.2;\n Wed, 14 Apr 2021 23:26:18 -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.2 via Frontend\n Transport; Wed, 14 Apr 2021 23:26:18 -0700", "from hyd1554T5810.caveonetworks.com.com (unknown [10.29.57.11])\n by maili.marvell.com (Postfix) with ESMTP id 028373F7050;\n Wed, 14 Apr 2021 23:26:15 -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=jYDwDUhTAAv+88kwpMF8W+FYEPFLPOqCrsoz+bq5KZk=;\n b=OYEqa91klKOveqFM0Yh3+hZ6RKaeEKF/m19sizQasI0D/L3witEBLNzx+Ng6nSGYL1xb\n JBAour4IHmdV25meuNxo45UV9LUMG7ZVJI4Pwnz23M0qVqUPjJKHRKdpSgC5vevWVN7g\n enoiQG+M/95JqCXiIcvYvCgvuQ2tq1aBsG6rFDwqL7SqgxG0XiDaM6sjyUdfK2ihgfhE\n mHUpsaVnFZwLCBbZq5/nhbw1ghgEmfxg5dTB1Q95sB2IicYn/0JxW8dZkBkCCbmXEY0j\n XMdgATkuJbbj2YKEsS+nvEscDoh5thrv3qLhmEzmWk85Nm0fHarKmKvchlG7QQLlApgo ng==", "From": "Tejasree Kondoj <ktejasree@marvell.com>", "To": "Akhil Goyal <gakhil@marvell.com>, Radu Nicolau <radu.nicolau@intel.com>", "CC": "Tejasree Kondoj <ktejasree@marvell.com>,\n Anoob Joseph <anoobj@marvell.com>,\n Ankur Dwivedi <adwivedi@marvell.com>, Jerin Jacob\n <jerinj@marvell.com>, <dev@dpdk.org>", "Date": "Thu, 15 Apr 2021 12:52:03 +0530", "Message-ID": "<20210415072205.1439-2-ktejasree@marvell.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210415072205.1439-1-ktejasree@marvell.com>", "References": "<20210415072205.1439-1-ktejasree@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "hUnANMGX_qtQnA3rNjcWqeeEu3bT_yY1", "X-Proofpoint-GUID": "hUnANMGX_qtQnA3rNjcWqeeEu3bT_yY1", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761\n definitions=2021-04-15_02:2021-04-15,\n 2021-04-15 signatures=0", "Subject": "[dpdk-dev] [PATCH v4 1/3] crypto/octeontx2: add UDP encapsulation\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": "Adding UDP encapsulation support for IPsec in\nlookaside protocol mode.\n\nSigned-off-by: Tejasree Kondoj <ktejasree@marvell.com>\nAcked-by: Akhil Goyal <gakhil@marvell.com>\n---\n doc/guides/cryptodevs/octeontx2.rst | 1 +\n doc/guides/rel_notes/release_21_05.rst | 2 +\n drivers/crypto/octeontx2/otx2_cryptodev_sec.c | 59 ++++++++-----------\n 3 files changed, 28 insertions(+), 34 deletions(-)", "diff": "diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst\nindex 8c7df065b3..00226a8c77 100644\n--- a/doc/guides/cryptodevs/octeontx2.rst\n+++ b/doc/guides/cryptodevs/octeontx2.rst\n@@ -181,6 +181,7 @@ Features supported\n * Tunnel mode\n * ESN\n * Anti-replay\n+* UDP Encapsulation\n * AES-128/192/256-GCM\n * AES-128/192/256-CBC-SHA1-HMAC\n * AES-128/192/256-CBC-SHA256-128-HMAC\ndiff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst\nindex b21906ccf6..f637591e91 100644\n--- a/doc/guides/rel_notes/release_21_05.rst\n+++ b/doc/guides/rel_notes/release_21_05.rst\n@@ -157,6 +157,8 @@ New Features\n * **Updated the OCTEON TX2 crypto PMD.**\n \n * Added support for DIGEST_ENCRYPTED mode in OCTEON TX2 crypto PMD.\n+ * Updated the OCTEON TX2 crypto PMD lookaside protocol offload for IPsec with\n+ UDP encapsulation support for NAT Traversal.\n \n * **Updated Mellanox RegEx PMD.**\n \ndiff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\nindex 342f089df8..210c53aa0a 100644\n--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\n+++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c\n@@ -203,6 +203,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\t struct rte_security_session *sec_sess)\n {\n \tstruct rte_crypto_sym_xform *auth_xform, *cipher_xform;\n+\tstruct otx2_ipsec_po_ip_template *template;\n \tconst uint8_t *cipher_key, *auth_key;\n \tstruct otx2_sec_session_ipsec_lp *lp;\n \tstruct otx2_ipsec_po_sa_ctl *ctl;\n@@ -248,11 +249,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\tif (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) {\n \n \t\t\tif (ctl->enc_type == OTX2_IPSEC_PO_SA_ENC_AES_GCM) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->aes_gcm.template.ip4.udp_src = 4500;\n-\t\t\t\t\tsa->aes_gcm.template.ip4.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip = &sa->aes_gcm.template.ip4.ipv4_hdr;\n+\t\t\t\ttemplate = &sa->aes_gcm.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\taes_gcm.template) + sizeof(\n \t\t\t\t\t\tsa->aes_gcm.template.ip4);\n@@ -260,11 +257,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\tlp->ctx_len = ctx_len >> 3;\n \t\t\t} else if (ctl->auth_type ==\n \t\t\t\t\tOTX2_IPSEC_PO_SA_AUTH_SHA1) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->sha1.template.ip4.udp_src = 4500;\n-\t\t\t\t\tsa->sha1.template.ip4.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip = &sa->sha1.template.ip4.ipv4_hdr;\n+\t\t\t\ttemplate = &sa->sha1.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\tsha1.template) + sizeof(\n \t\t\t\t\t\tsa->sha1.template.ip4);\n@@ -272,11 +265,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\tlp->ctx_len = ctx_len >> 3;\n \t\t\t} else if (ctl->auth_type ==\n \t\t\t\t\tOTX2_IPSEC_PO_SA_AUTH_SHA2_256) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->sha2.template.ip4.udp_src = 4500;\n-\t\t\t\t\tsa->sha2.template.ip4.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip = &sa->sha2.template.ip4.ipv4_hdr;\n+\t\t\t\ttemplate = &sa->sha2.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\tsha2.template) + sizeof(\n \t\t\t\t\t\tsa->sha2.template.ip4);\n@@ -285,8 +274,15 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t} else {\n \t\t\t\treturn -EINVAL;\n \t\t\t}\n+\t\t\tip = &template->ip4.ipv4_hdr;\n+\t\t\tif (ipsec->options.udp_encap) {\n+\t\t\t\tip->next_proto_id = IPPROTO_UDP;\n+\t\t\t\ttemplate->ip4.udp_src = rte_be_to_cpu_16(4500);\n+\t\t\t\ttemplate->ip4.udp_dst = rte_be_to_cpu_16(4500);\n+\t\t\t} else {\n+\t\t\t\tip->next_proto_id = IPPROTO_ESP;\n+\t\t\t}\n \t\t\tip->version_ihl = RTE_IPV4_VHL_DEF;\n-\t\t\tip->next_proto_id = IPPROTO_ESP;\n \t\t\tip->time_to_live = ipsec->tunnel.ipv4.ttl;\n \t\t\tip->type_of_service |= (ipsec->tunnel.ipv4.dscp << 2);\n \t\t\tif (ipsec->tunnel.ipv4.df)\n@@ -299,11 +295,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\tRTE_SECURITY_IPSEC_TUNNEL_IPV6) {\n \n \t\t\tif (ctl->enc_type == OTX2_IPSEC_PO_SA_ENC_AES_GCM) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->aes_gcm.template.ip6.udp_src = 4500;\n-\t\t\t\t\tsa->aes_gcm.template.ip6.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip6 = &sa->aes_gcm.template.ip6.ipv6_hdr;\n+\t\t\t\ttemplate = &sa->aes_gcm.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\taes_gcm.template) + sizeof(\n \t\t\t\t\t\tsa->aes_gcm.template.ip6);\n@@ -311,11 +303,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\tlp->ctx_len = ctx_len >> 3;\n \t\t\t} else if (ctl->auth_type ==\n \t\t\t\t\tOTX2_IPSEC_PO_SA_AUTH_SHA1) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->sha1.template.ip6.udp_src = 4500;\n-\t\t\t\t\tsa->sha1.template.ip6.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip6 = &sa->sha1.template.ip6.ipv6_hdr;\n+\t\t\t\ttemplate = &sa->sha1.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\tsha1.template) + sizeof(\n \t\t\t\t\t\tsa->sha1.template.ip6);\n@@ -323,11 +311,7 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\tlp->ctx_len = ctx_len >> 3;\n \t\t\t} else if (ctl->auth_type ==\n \t\t\t\t\tOTX2_IPSEC_PO_SA_AUTH_SHA2_256) {\n-\t\t\t\tif (ipsec->options.udp_encap) {\n-\t\t\t\t\tsa->sha2.template.ip6.udp_src = 4500;\n-\t\t\t\t\tsa->sha2.template.ip6.udp_dst = 4500;\n-\t\t\t\t}\n-\t\t\t\tip6 = &sa->sha2.template.ip6.ipv6_hdr;\n+\t\t\t\ttemplate = &sa->sha2.template;\n \t\t\t\tctx_len = offsetof(struct otx2_ipsec_po_out_sa,\n \t\t\t\t\t\tsha2.template) + sizeof(\n \t\t\t\t\t\tsa->sha2.template.ip6);\n@@ -337,6 +321,16 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\treturn -EINVAL;\n \t\t\t}\n \n+\t\t\tip6 = &template->ip6.ipv6_hdr;\n+\t\t\tif (ipsec->options.udp_encap) {\n+\t\t\t\tip6->proto = IPPROTO_UDP;\n+\t\t\t\ttemplate->ip6.udp_src = rte_be_to_cpu_16(4500);\n+\t\t\t\ttemplate->ip6.udp_dst = rte_be_to_cpu_16(4500);\n+\t\t\t} else {\n+\t\t\t\tip6->proto = (ipsec->proto ==\n+\t\t\t\t\tRTE_SECURITY_IPSEC_SA_PROTO_ESP) ?\n+\t\t\t\t\tIPPROTO_ESP : IPPROTO_AH;\n+\t\t\t}\n \t\t\tip6->vtc_flow = rte_cpu_to_be_32(0x60000000 |\n \t\t\t\t((ipsec->tunnel.ipv6.dscp <<\n \t\t\t\t\tRTE_IPV6_HDR_TC_SHIFT) &\n@@ -345,9 +339,6 @@ crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,\n \t\t\t\t\tRTE_IPV6_HDR_FL_SHIFT) &\n \t\t\t\t\tRTE_IPV6_HDR_FL_MASK));\n \t\t\tip6->hop_limits = ipsec->tunnel.ipv6.hlimit;\n-\t\t\tip6->proto = (ipsec->proto ==\n-\t\t\t\t\tRTE_SECURITY_IPSEC_SA_PROTO_ESP) ?\n-\t\t\t\t\tIPPROTO_ESP : IPPROTO_AH;\n \t\t\tmemcpy(&ip6->src_addr, &ipsec->tunnel.ipv6.src_addr,\n \t\t\t\tsizeof(struct in6_addr));\n \t\t\tmemcpy(&ip6->dst_addr, &ipsec->tunnel.ipv6.dst_addr,\n", "prefixes": [ "v4", "1/3" ] }