Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2520/?format=api
{ "id": 2520, "url": "https://patches.dpdk.org/api/patches/2520/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1422243805-10906-7-git-send-email-jijiang.liu@intel.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": "<1422243805-10906-7-git-send-email-jijiang.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1422243805-10906-7-git-send-email-jijiang.liu@intel.com", "date": "2015-01-26T03:43:25", "name": "[dpdk-dev,6/6] app/testpmd:test NVGRE Tx checksum offload", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bf13d6a5b1a0c6a04fe351219fbb485de23852e3", "submitter": { "id": 52, "url": "https://patches.dpdk.org/api/people/52/?format=api", "name": "Jijiang Liu", "email": "jijiang.liu@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1422243805-10906-7-git-send-email-jijiang.liu@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2520/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2520/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 25A1C5ABF;\n\tMon, 26 Jan 2015 04:43:56 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 670EE5A9E\n\tfor <dev@dpdk.org>; Mon, 26 Jan 2015 04:43:46 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga103.fm.intel.com with ESMTP; 25 Jan 2015 19:37:45 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 25 Jan 2015 19:43:45 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t0Q3hgRM026654;\n\tMon, 26 Jan 2015 11:43:42 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t0Q3hedn011063; Mon, 26 Jan 2015 11:43:42 +0800", "(from jijiangl@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0Q3hebX011059; \n\tMon, 26 Jan 2015 11:43:40 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.09,466,1418112000\"; d=\"scan'208\";a=\"675811322\"", "From": "Jijiang Liu <jijiang.liu@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 26 Jan 2015 11:43:25 +0800", "Message-Id": "<1422243805-10906-7-git-send-email-jijiang.liu@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1422243805-10906-1-git-send-email-jijiang.liu@intel.com>", "References": "<1422243805-10906-1-git-send-email-jijiang.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH 6/6] app/testpmd:test NVGRE Tx checksum offload", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Enhance csum fwd engine and command lines based on current TX checksum framework in order to test TX Checksum offload for NVGRE packet.\n\nIt includes:\n - IPv4 and IPv6 packet\n - outer L3, inner L3 and L4 checksum offload for Tx side.\n\nNote: The patch will need to be reworked after Olivier's patch set for enhancing checksum offload API is applied.\n\nSigned-off-by: Jijiang Liu <jijiang.liu@intel.com>\n---\n app/test-pmd/cmdline.c | 19 +++++--\n app/test-pmd/csumonly.c | 105 ++++++++++++++++++++++++++++----------\n app/test-pmd/testpmd.h | 4 +-\n lib/librte_pmd_i40e/i40e_rxtx.c | 2 +\n 4 files changed, 94 insertions(+), 36 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex ab25e24..54e0774 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -316,7 +316,7 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\" Disable hardware insertion of a VLAN header in\"\n \t\t\t\" packets sent on a port.\\n\\n\"\n \n-\t\t\t\"tx_cksum set (ip|udp|tcp|sctp|vxlan) (hw|sw) (port_id)\\n\"\n+\t\t\t\"tx_cksum set (ip|udp|tcp|sctp|vxlan|nvgre) (hw|sw) (port_id)\\n\"\n \t\t\t\" Select hardware or software calculation of the\"\n \t\t\t\" checksum with when transmitting a packet using the\"\n \t\t\t\" csum forward engine.\\n\"\n@@ -2899,8 +2899,9 @@ cmd_tx_cksum_parsed(void *parsed_result,\n \t\t\tmask = TESTPMD_TX_OFFLOAD_TCP_CKSUM;\n \t\t} else if (!strcmp(res->proto, \"sctp\")) {\n \t\t\tmask = TESTPMD_TX_OFFLOAD_SCTP_CKSUM;\n-\t\t} else if (!strcmp(res->proto, \"vxlan\")) {\n-\t\t\tmask = TESTPMD_TX_OFFLOAD_VXLAN_CKSUM;\n+\t\t} else if (!strcmp(res->proto, \"vxlan\") ||\n+\t\t\t\t!strcmp(res->proto, \"nvgre\")) {\n+\t\t\tmask = TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM;\n \t\t}\n \n \t\tif (hw)\n@@ -2918,8 +2919,14 @@ cmd_tx_cksum_parsed(void *parsed_result,\n \t\t(ol_flags & TESTPMD_TX_OFFLOAD_TCP_CKSUM) ? \"hw\" : \"sw\");\n \tprintf(\"SCTP checksum offload is %s\\n\",\n \t\t(ol_flags & TESTPMD_TX_OFFLOAD_SCTP_CKSUM) ? \"hw\" : \"sw\");\n-\tprintf(\"VxLAN checksum offload is %s\\n\",\n-\t\t(ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) ? \"hw\" : \"sw\");\n+\n+\tif (!strcmp(res->proto, \"vxlan\")) {\n+\t\tprintf(\"VxLAN checksum offload is %s\\n\",\n+\t\t(ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM) ? \"hw\" : \"sw\");\n+\t} else if (!strcmp(res->proto, \"nvgre\")) {\n+\t\tprintf(\"NVGRE checksum offload is %s\\n\",\n+\t\t(ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM) ? \"hw\" : \"sw\");\n+\t}\n \n \t/* display warnings if configuration is not supported by the NIC */\n \trte_eth_dev_info_get(res->port_id, &dev_info);\n@@ -2953,7 +2960,7 @@ cmdline_parse_token_string_t cmd_tx_cksum_mode =\n \t\t\t\tmode, \"set\");\n cmdline_parse_token_string_t cmd_tx_cksum_proto =\n \tTOKEN_STRING_INITIALIZER(struct cmd_tx_cksum_result,\n-\t\t\t\tproto, \"ip#tcp#udp#sctp#vxlan\");\n+\t\t\t\tproto, \"ip#tcp#udp#sctp#vxlan#nvgre\");\n cmdline_parse_token_string_t cmd_tx_cksum_hwsw =\n \tTOKEN_STRING_INITIALIZER(struct cmd_tx_cksum_result,\n \t\t\t\thwsw, \"hw#sw\");\ndiff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c\nindex 41711fd..8a87fbb 100644\n--- a/app/test-pmd/csumonly.c\n+++ b/app/test-pmd/csumonly.c\n@@ -86,6 +86,12 @@\n #define _htons(x) (x)\n #endif\n \n+/* simplified GRE header */\n+struct simple_gre_hdr {\n+\tuint16_t flags;\n+\tuint16_t proto;\n+};\n+\n static uint16_t\n get_psd_sum(void *l3_hdr, uint16_t ethertype, uint64_t ol_flags)\n {\n@@ -244,42 +250,42 @@ process_inner_cksums(void *l3_hdr, uint16_t ethertype, uint16_t l3_len,\n \treturn ol_flags;\n }\n \n-/* Calculate the checksum of outer header (only vxlan is supported,\n- * meaning IP + UDP). The caller already checked that it's a vxlan\n+/* Calculate the checksum of outer header (only vxlan/nvgre is supported,\n+ * meaning IP + UDP/GRE). The caller already checked that it's a vxlan/NVGRE\n * packet */\n static uint64_t\n process_outer_cksums(void *outer_l3_hdr, uint16_t outer_ethertype,\n-\tuint16_t outer_l3_len, uint16_t testpmd_ol_flags)\n+\tuint16_t outer_l3_len, uint16_t testpmd_ol_flags, uint16_t l4_prot)\n {\n \tstruct ipv4_hdr *ipv4_hdr = outer_l3_hdr;\n \tstruct ipv6_hdr *ipv6_hdr = outer_l3_hdr;\n \tstruct udp_hdr *udp_hdr;\n \tuint64_t ol_flags = 0;\n \n-\tif (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM)\n-\t\tol_flags |= PKT_TX_UDP_TUNNEL_PKT;\n-\n \tif (outer_ethertype == _htons(ETHER_TYPE_IPv4)) {\n \t\tipv4_hdr->hdr_checksum = 0;\n \n-\t\tif (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM)\n+\t\tif (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM)\n \t\t\tol_flags |= PKT_TX_OUTER_IP_CKSUM;\n \t\telse\n \t\t\tipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr);\n-\t} else if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM)\n+\t} else if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM)\n \t\tol_flags |= PKT_TX_OUTER_IPV6;\n \n-\tudp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + outer_l3_len);\n-\t/* do not recalculate udp cksum if it was 0 */\n-\tif (udp_hdr->dgram_cksum != 0) {\n-\t\tudp_hdr->dgram_cksum = 0;\n-\t\tif (outer_ethertype == _htons(ETHER_TYPE_IPv4))\n-\t\t\tudp_hdr->dgram_cksum =\n-\t\t\t\trte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr);\n-\t\telse\n-\t\t\tudp_hdr->dgram_cksum =\n-\t\t\t\trte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr);\n-\t}\n+\tif (l4_prot == IPPROTO_UDP) {\n+\t\tudp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr\n+\t\t\t\t+ outer_l3_len);\n+\t\t/* do not recalculate udp cksum if it was 0 */\n+\t\tif (udp_hdr->dgram_cksum != 0) {\n+\t\t\tudp_hdr->dgram_cksum = 0;\n+\t\t\tif (outer_ethertype == _htons(ETHER_TYPE_IPv4))\n+\t\t\t\tudp_hdr->dgram_cksum =\n+\t\t\t\t\trte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr);\n+\t\t\telse\n+\t\t\t\tudp_hdr->dgram_cksum =\n+\t\t\t\t\trte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr);\n+\t\t}\n+\t} /* else if (l4_proto == IPPROTO_GRE), nothing to do here*/\n \n \treturn ol_flags;\n }\n@@ -299,12 +305,15 @@ process_outer_cksums(void *outer_l3_hdr, uint16_t outer_ethertype,\n * Ether / (vlan) / IP|IP6 / UDP|TCP|SCTP .\n * Ether / (vlan) / outer IP|IP6 / outer UDP / VxLAN / Ether / IP|IP6 /\n * UDP|TCP|SCTP\n+ * Ether / (vlan) / outer IP|IP6 / GRE / Ether / IP|IP6 /\n+ *\t UDP|TCP|SCTP\n *\n * The testpmd command line for this forward engine sets the flags\n * TESTPMD_TX_OFFLOAD_* in ports[tx_port].tx_ol_flags. They control\n * wether a checksum must be calculated in software or in hardware. The\n * IP, UDP, TCP and SCTP flags always concern the inner layer. The\n- * VxLAN flag concerns the outer IP (if packet is recognized as a vxlan packet).\n+ * TUNNEL flag concerns the outer IP (if packet is recognized as a vxlan/nvgre\n+ * packet).\n */\n static void\n pkt_burst_checksum_forward(struct fwd_stream *fs)\n@@ -315,6 +324,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \tstruct ether_hdr *eth_hdr;\n \tvoid *l3_hdr = NULL, *outer_l3_hdr = NULL; /* can be IPv4 or IPv6 */\n \tstruct udp_hdr *udp_hdr;\n+\tstruct simple_gre_hdr *gre_hdr;\n \tuint16_t nb_rx;\n \tuint16_t nb_tx;\n \tuint16_t i;\n@@ -386,17 +396,20 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \t\t\t\ttunnel = 1;\n \n \t\t\t/* currently, this flag is set by i40e only if the\n-\t\t\t * packet is vxlan */\n+\t\t\t * packet is tunneled packet */\n \t\t\t} else if (m->ol_flags & (PKT_RX_TUNNEL_IPV4_HDR |\n \t\t\t\t\tPKT_RX_TUNNEL_IPV6_HDR))\n \t\t\t\ttunnel = 1;\n \n \t\t\tif (tunnel == 1) {\n+\t\t\t\tif (testpmd_ol_flags &\n+\t\t\t\t\tTESTPMD_TX_OFFLOAD_TUNNEL_CKSUM)\n+\t\t\t\t\tol_flags |= PKT_TX_UDP_TUNNEL_PKT;\n+\n \t\t\t\touter_ethertype = ethertype;\n \t\t\t\touter_l2_len = l2_len;\n \t\t\t\touter_l3_len = l3_len;\n \t\t\t\touter_l3_hdr = l3_hdr;\n-\n \t\t\t\teth_hdr = (struct ether_hdr *)((char *)udp_hdr +\n \t\t\t\t\tsizeof(struct udp_hdr) +\n \t\t\t\t\tsizeof(struct vxlan_hdr));\n@@ -407,6 +420,35 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \t\t\t}\n \t\t}\n \n+\t\tif ((l4_proto == IPPROTO_GRE)\n+\t\t\t&& ((m->ol_flags & (PKT_RX_TUNNEL_IPV4_HDR |\n+\t\t\t\tPKT_RX_TUNNEL_IPV6_HDR)))) {\n+\t\t\tgre_hdr = (struct simple_gre_hdr *)((char *)l3_hdr + l3_len);\n+\t\t\tif (gre_hdr->proto == _htons(ETHER_TYPE_TEB)) {\n+\t\t\t\tl4_tun_len = sizeof(struct nvgre_hdr);\n+\t\t\t\ttunnel = 1;\n+\t\t\t}\n+\n+\t\t\tif (tunnel == 1) {\n+\t\t\t\tif (testpmd_ol_flags &\n+\t\t\t\t\tTESTPMD_TX_OFFLOAD_TUNNEL_CKSUM)\n+\t\t\t\t\tol_flags |= PKT_TX_GRE_TUNNEL_PKT;\n+\n+\t\t\t\touter_ethertype = ethertype;\n+\t\t\t\touter_l2_len = l2_len;\n+\t\t\t\touter_l3_len = l3_len;\n+\t\t\t\touter_l3_hdr = l3_hdr;\n+\n+\t\t\t\t/* currently, only NVGRE packet is supported */\n+\t\t\t\teth_hdr = (struct ether_hdr *)((char *)gre_hdr +\n+\t\t\t\t\tsizeof(struct nvgre_hdr));\n+\t\t\t\tparse_ethernet(eth_hdr, ðertype, &l2_len,\n+\t\t\t\t\t\t&l3_len, &l4_proto, &l4_len);\n+\t\t\t\tl3_hdr = (char *)eth_hdr + l2_len;\n+\t\t\t}\n+\n+\t\t}\n+\n \t\t/* step 2: change all source IPs (v4 or v6) so we need\n \t\t * to recompute the chksums even if they were correct */\n \n@@ -428,13 +470,14 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \t\t * processed in hardware. */\n \t\tif (tunnel == 1) {\n \t\t\tol_flags |= process_outer_cksums(outer_l3_hdr,\n-\t\t\t\touter_ethertype, outer_l3_len, testpmd_ol_flags);\n+\t\t\t\touter_ethertype, outer_l3_len, testpmd_ol_flags,\n+\t\t\t\tl4_proto);\n \t\t}\n \n \t\t/* step 4: fill the mbuf meta data (flags and header lengths) */\n \n \t\tif (tunnel == 1) {\n-\t\t\tif (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) {\n+\t\t\tif (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM) {\n \t\t\t\tm->outer_l2_len = outer_l2_len;\n \t\t\t\tm->outer_l3_len = outer_l3_len;\n \t\t\t\tm->l2_len = l4_tun_len + l2_len;\n@@ -446,9 +489,15 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \t\t\t\t we changed the ip, but it shows that\n \t\t\t\t we can process the inner header cksum\n \t\t\t\t in the nic */\n-\t\t\t\tm->l2_len = outer_l2_len + outer_l3_len +\n-\t\t\t\t\tsizeof(struct udp_hdr) +\n-\t\t\t\t\tsizeof(struct vxlan_hdr) + l2_len;\n+\t\t\t\tif (l4_proto == IPPROTO_UDP)\n+\t\t\t\t\tm->l2_len = outer_l2_len + outer_l3_len +\n+\t\t\t\t\t\tsizeof(struct udp_hdr) +\n+\t\t\t\t\t\tsizeof(struct vxlan_hdr) + l2_len;\n+\n+\t\t\t\t/* currently, only NVGRE is supported */\n+\t\t\t\telse if (l4_proto == IPPROTO_GRE)\n+\t\t\t\t\tm->l2_len = outer_l2_len + outer_l3_len +\n+\t\t\t\t\t\tsizeof(struct nvgre_hdr) + l2_len;\n \t\t\t\tm->l3_len = l3_len;\n \t\t\t\tm->l4_len = l4_len;\n \t\t\t}\n@@ -505,7 +554,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)\n \t\t\t\t\t\"m->l4_len=%d\\n\",\n \t\t\t\t\tm->l2_len, m->l3_len, m->l4_len);\n \t\t\tif ((tunnel == 1) &&\n-\t\t\t\t(testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM))\n+\t\t\t\t(testpmd_ol_flags & TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM))\n \t\t\t\tprintf(\"tx: m->outer_l2_len=%d m->outer_l3_len=%d\\n\",\n \t\t\t\t\tm->outer_l2_len, m->outer_l3_len);\n \t\t\tif (tso_segsz != 0)\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex f8b0740..528457b 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -125,8 +125,8 @@ struct fwd_stream {\n #define TESTPMD_TX_OFFLOAD_TCP_CKSUM 0x0004\n /** Offload SCTP checksum in csum forward engine */\n #define TESTPMD_TX_OFFLOAD_SCTP_CKSUM 0x0008\n-/** Offload VxLAN checksum in csum forward engine */\n-#define TESTPMD_TX_OFFLOAD_VXLAN_CKSUM 0x0010\n+/** Offload tunneled packet checksum in csum forward engine */\n+#define TESTPMD_TX_OFFLOAD_TUNNEL_CKSUM 0x0010\n /** Insert VLAN header in forward engine */\n #define TESTPMD_TX_OFFLOAD_INSERT_VLAN 0x0020\n \ndiff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c\nindex 6c1e324..bf6c17c 100644\n--- a/lib/librte_pmd_i40e/i40e_rxtx.c\n+++ b/lib/librte_pmd_i40e/i40e_rxtx.c\n@@ -1169,6 +1169,8 @@ i40e_calc_context_desc(uint64_t flags)\n \n \tif (flags | PKT_TX_UDP_TUNNEL_PKT)\n \t\tmask |= PKT_TX_UDP_TUNNEL_PKT;\n+\tif (flags | PKT_TX_GRE_TUNNEL_PKT)\n+\t\tmask |= PKT_TX_GRE_TUNNEL_PKT;\n \n #ifdef RTE_LIBRTE_IEEE1588\n \tmask |= PKT_TX_IEEE1588_TMST;\n", "prefixes": [ "dpdk-dev", "6/6" ] }