Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55381/?format=api
{ "id": 55381, "url": "http://patches.dpdk.org/api/patches/55381/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190625231649.22560-2-konstantin.ananyev@intel.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": "<20190625231649.22560-2-konstantin.ananyev@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190625231649.22560-2-konstantin.ananyev@intel.com", "date": "2019-06-25T23:16:46", "name": "[v3,1/4] examples/ipsec-secgw: fix invalid packet length", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "eb7d4b64639dfa1b842ae0ef2a3ee5929bd28f65", "submitter": { "id": 33, "url": "http://patches.dpdk.org/api/people/33/?format=api", "name": "Ananyev, Konstantin", "email": "konstantin.ananyev@intel.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/20190625231649.22560-2-konstantin.ananyev@intel.com/mbox/", "series": [ { "id": 5168, "url": "http://patches.dpdk.org/api/series/5168/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5168", "date": "2019-06-25T23:16:45", "name": "examples/ipsec-secgw: support packet", "version": 3, "mbox": "http://patches.dpdk.org/series/5168/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/55381/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/55381/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 37D5F1B970;\n\tWed, 26 Jun 2019 01:17:16 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 96DFD1B970;\n\tWed, 26 Jun 2019 01:17:14 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Jun 2019 16:17:12 -0700", "from sivswdev08.ir.intel.com ([10.237.217.47])\n\tby orsmga001.jf.intel.com with ESMTP; 25 Jun 2019 16:17:11 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.63,417,1557212400\"; d=\"scan'208\";a=\"245236009\"", "From": "Konstantin Ananyev <konstantin.ananyev@intel.com>", "To": "dev@dpdk.org", "Cc": "akhil.goyal@nxp.com, Konstantin Ananyev <konstantin.ananyev@intel.com>, \n\tstable@dpdk.org", "Date": "Wed, 26 Jun 2019 00:16:46 +0100", "Message-Id": "<20190625231649.22560-2-konstantin.ananyev@intel.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<20190625231649.22560-1-konstantin.ananyev@intel.com>", "References": "<20190606115151.27805-1-konstantin.ananyev@intel.com>\n\t<20190625231649.22560-1-konstantin.ananyev@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 1/4] examples/ipsec-secgw: fix invalid packet\n\tlength", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "for packets smaller then 64B some NICs reports pkt_len=64B.\nAs ipsec-secgw (and librte_ipsec) relies on pkt_len value to determine\npayload length, that causes problems for small packets.\nTo fix the issue, check that pkt_len matches values in IPv4/IPv6 header\nand re-adjust pkt_len if necessary.\n\nFixes: 906257e965b7 (\"examples/ipsec-secgw: support IPv6\")\nFixes: d299106e8e31 (\"examples/ipsec-secgw: add IPsec sample application\")\nCc: stable@dpdk.org\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n examples/ipsec-secgw/ipsec-secgw.c | 57 ++++++++++++++++++++++--------\n 1 file changed, 43 insertions(+), 14 deletions(-)", "diff": "diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c\nindex 3911e6a60..33c438964 100644\n--- a/examples/ipsec-secgw/ipsec-secgw.c\n+++ b/examples/ipsec-secgw/ipsec-secgw.c\n@@ -230,34 +230,65 @@ static struct rte_eth_conf port_conf = {\n \n static struct socket_ctx socket_ctx[NB_SOCKETS];\n \n+static inline void\n+adjust_ipv4_pktlen(struct rte_mbuf *m, const struct rte_ipv4_hdr *iph,\n+\tuint32_t l2_len)\n+{\n+\tuint32_t plen, trim;\n+\n+\tplen = rte_be_to_cpu_16(iph->total_length) + l2_len;\n+\tif (plen < m->pkt_len) {\n+\t\ttrim = m->pkt_len - plen;\n+\t\trte_pktmbuf_trim(m, trim);\n+\t}\n+}\n+\n+static inline void\n+adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph,\n+\tuint32_t l2_len)\n+{\n+\tuint32_t plen, trim;\n+\n+\tplen = rte_be_to_cpu_16(iph->payload_len) + sizeof(*iph) + l2_len;\n+\tif (plen < m->pkt_len) {\n+\t\ttrim = m->pkt_len - plen;\n+\t\trte_pktmbuf_trim(m, trim);\n+\t}\n+}\n+\n static inline void\n prepare_one_packet(struct rte_mbuf *pkt, struct ipsec_traffic *t)\n {\n-\tuint8_t *nlp;\n-\tstruct rte_ether_hdr *eth;\n+\tconst struct rte_ether_hdr *eth;\n+\tconst struct rte_ipv4_hdr *iph4;\n+\tconst struct rte_ipv6_hdr *iph6;\n \n-\teth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);\n+\teth = rte_pktmbuf_mtod(pkt, const struct rte_ether_hdr *);\n \tif (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) {\n-\t\tnlp = (uint8_t *)rte_pktmbuf_adj(pkt, RTE_ETHER_HDR_LEN);\n-\t\tnlp = RTE_PTR_ADD(nlp, offsetof(struct ip, ip_p));\n-\t\tif (*nlp == IPPROTO_ESP)\n+\n+\t\tiph4 = (const struct rte_ipv4_hdr *)rte_pktmbuf_adj(pkt,\n+\t\t\tRTE_ETHER_HDR_LEN);\n+\t\tadjust_ipv4_pktlen(pkt, iph4, 0);\n+\n+\t\tif (iph4->next_proto_id == IPPROTO_ESP)\n \t\t\tt->ipsec.pkts[(t->ipsec.num)++] = pkt;\n \t\telse {\n-\t\t\tt->ip4.data[t->ip4.num] = nlp;\n+\t\t\tt->ip4.data[t->ip4.num] = &iph4->next_proto_id;\n \t\t\tt->ip4.pkts[(t->ip4.num)++] = pkt;\n \t\t}\n \t\tpkt->l2_len = 0;\n-\t\tpkt->l3_len = sizeof(struct ip);\n+\t\tpkt->l3_len = sizeof(*iph4);\n \t} else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) {\n \t\tint next_proto;\n \t\tsize_t l3len, ext_len;\n-\t\tstruct rte_ipv6_hdr *v6h;\n \t\tuint8_t *p;\n \n \t\t/* get protocol type */\n-\t\tv6h = (struct rte_ipv6_hdr *)rte_pktmbuf_adj(pkt,\n+\t\tiph6 = (const struct rte_ipv6_hdr *)rte_pktmbuf_adj(pkt,\n \t\t\tRTE_ETHER_HDR_LEN);\n-\t\tnext_proto = v6h->proto;\n+\t\tadjust_ipv6_pktlen(pkt, iph6, 0);\n+\n+\t\tnext_proto = iph6->proto;\n \n \t\t/* determine l3 header size up to ESP extension */\n \t\tl3len = sizeof(struct ip6_hdr);\n@@ -276,9 +307,7 @@ prepare_one_packet(struct rte_mbuf *pkt, struct ipsec_traffic *t)\n \t\tif (next_proto == IPPROTO_ESP)\n \t\t\tt->ipsec.pkts[(t->ipsec.num)++] = pkt;\n \t\telse {\n-\t\t\tt->ip6.data[t->ip6.num] = rte_pktmbuf_mtod_offset(pkt,\n-\t\t\t\tuint8_t *,\n-\t\t\t\toffsetof(struct rte_ipv6_hdr, proto));\n+\t\t\tt->ip6.data[t->ip6.num] = &iph6->proto;\n \t\t\tt->ip6.pkts[(t->ip6.num)++] = pkt;\n \t\t}\n \t\tpkt->l2_len = 0;\n", "prefixes": [ "v3", "1/4" ] }