Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133927/?format=api
{ "id": 133927, "url": "http://patches.dpdk.org/api/patches/133927/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231107041117.23285-3-lihuisong@huawei.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": "<20231107041117.23285-3-lihuisong@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231107041117.23285-3-lihuisong@huawei.com", "date": "2023-11-07T04:11:17", "name": "[v3,2/2] app/testpmd: fix UDP cksum error for UFO enable", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b08174efaed51e3b5d960ec0e140f566232fb60f", "submitter": { "id": 2085, "url": "http://patches.dpdk.org/api/people/2085/?format=api", "name": "lihuisong (C)", "email": "lihuisong@huawei.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231107041117.23285-3-lihuisong@huawei.com/mbox/", "series": [ { "id": 30176, "url": "http://patches.dpdk.org/api/series/30176/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30176", "date": "2023-11-07T04:11:15", "name": "app/testpmd: fix UDP cksum error for UFO enable", "version": 3, "mbox": "http://patches.dpdk.org/series/30176/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133927/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133927/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 9F09C432C0;\n\tTue, 7 Nov 2023 05:11:11 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 267BD40698;\n\tTue, 7 Nov 2023 05:11:07 +0100 (CET)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id F2176402A1\n for <dev@dpdk.org>; Tue, 7 Nov 2023 05:11:03 +0100 (CET)", "from kwepemm000004.china.huawei.com (unknown [172.30.72.53])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SPZWz1VL4zvQBm;\n Tue, 7 Nov 2023 12:10:55 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n kwepemm000004.china.huawei.com (7.193.23.18) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.31; Tue, 7 Nov 2023 12:11:02 +0800" ], "From": "Huisong Li <lihuisong@huawei.com>", "To": "<dev@dpdk.org>, Aman Singh <aman.deep.singh@intel.com>, Yuying Zhang\n <yuying.zhang@intel.com>, Zhichao Zeng <zhichaox.zeng@intel.com>", "CC": "<thomas@monjalon.net>, <ferruh.yigit@amd.com>, <lihuisong@huawei.com>", "Subject": "[PATCH v3 2/2] app/testpmd: fix UDP cksum error for UFO enable", "Date": "Tue, 7 Nov 2023 12:11:17 +0800", "Message-ID": "<20231107041117.23285-3-lihuisong@huawei.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20231107041117.23285-1-lihuisong@huawei.com>", "References": "<20230728021310.15970-1-lihuisong@huawei.com>\n <20231107041117.23285-1-lihuisong@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-ClientProxiedBy": "dggems705-chm.china.huawei.com (10.3.19.182) To\n kwepemm000004.china.huawei.com (7.193.23.18)", "X-CFilter-Loop": "Reflected", "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": "The command \"tso set <tso_segsz> <port_id>\" is used to enable UFO, please\nsee commit ce8e6e742807 (\"app/testpmd: support UFO in checksum engine\")\n\nThe above patch sets the RTE_MBUF_F_TX_UDP_SEG in mbuf ol_flags, only\nby checking if 'tso_segsz' is set, but missing check if UFO offload\n(RTE_ETH_TX_OFFLOAD_UDP_TSO) supported by device. The RTE_MBUF_F_TX_UDP_SEG\nflag causes driver that supports TSO to compute pseudo header checksum.\nAs a result, if device only supports TSO, but not UFO, UDP packet checksum\nwill be wrong.\n\nSo enabling UFO also depends on if driver has RTE_ETH_TX_OFFLOAD_UDP_TSO\ncapability. Similarly, TSO also need to do like this.\nNote: all offloads about tunnel TSO are added in process_inner_cksums() in\ncase of the impact on tunnel TSO.\n\nIn addition, this patch also fixes cmd_tso_set_parsed() for UFO to make\nit better to support TSO and UFO.\n\nFixes: ce8e6e742807 (\"app/testpmd: support UFO in checksum engine\")\nCc: stable@dpdk.org\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\nAcked-by: Chengwen Feng <fengchengwen@huawei.com>\n---\n app/test-pmd/cmdline.c | 31 +++++++++++++++++++++----------\n app/test-pmd/csumonly.c | 11 +++++++++--\n 2 files changed, 30 insertions(+), 12 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 1c57e07d41..05078f8377 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -4933,6 +4933,7 @@ cmd_tso_set_parsed(void *parsed_result,\n {\n \tstruct cmd_tso_set_result *res = parsed_result;\n \tstruct rte_eth_dev_info dev_info;\n+\tuint64_t offloads;\n \tint ret;\n \n \tif (port_id_is_invalid(res->port_id, ENABLED_WARN))\n@@ -4949,21 +4950,31 @@ cmd_tso_set_parsed(void *parsed_result,\n \tif (ret != 0)\n \t\treturn;\n \n-\tif ((ports[res->port_id].tso_segsz != 0) &&\n-\t\t(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {\n-\t\tfprintf(stderr, \"Error: TSO is not supported by port %d\\n\",\n-\t\t\tres->port_id);\n-\t\treturn;\n+\tif (ports[res->port_id].tso_segsz != 0) {\n+\t\tif ((dev_info.tx_offload_capa & (RTE_ETH_TX_OFFLOAD_TCP_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_UDP_TSO)) == 0) {\n+\t\t\tfprintf(stderr, \"Error: both TSO and UFO are not supported by port %d\\n\",\n+\t\t\t\tres->port_id);\n+\t\t\treturn;\n+\t\t}\n+\t\t/* display warnings if configuration is not supported by the NIC */\n+\t\tif ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0)\n+\t\t\tprintf(\"Warning: port %d doesn't support TSO\\n\", res->port_id);\n+\t\tif ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TSO) == 0)\n+\t\t\tprintf(\"Warning: port %d doesn't support UFO\\n\", res->port_id);\n \t}\n \n \tif (ports[res->port_id].tso_segsz == 0) {\n \t\tports[res->port_id].dev_conf.txmode.offloads &=\n-\t\t\t\t\t\t~RTE_ETH_TX_OFFLOAD_TCP_TSO;\n-\t\tprintf(\"TSO for non-tunneled packets is disabled\\n\");\n+\t\t\t~(RTE_ETH_TX_OFFLOAD_TCP_TSO | RTE_ETH_TX_OFFLOAD_UDP_TSO);\n+\t\tprintf(\"TSO and UFO for non-tunneled packets is disabled\\n\");\n \t} else {\n-\t\tports[res->port_id].dev_conf.txmode.offloads |=\n-\t\t\t\t\t\tRTE_ETH_TX_OFFLOAD_TCP_TSO;\n-\t\tprintf(\"TSO segment size for non-tunneled packets is %d\\n\",\n+\t\toffloads = (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) ?\n+\t\t\t\t\tRTE_ETH_TX_OFFLOAD_TCP_TSO : 0;\n+\t\toffloads |= (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TSO) ?\n+\t\t\t\t\tRTE_ETH_TX_OFFLOAD_UDP_TSO : 0;\n+\t\tports[res->port_id].dev_conf.txmode.offloads |= offloads;\n+\t\tprintf(\"segment size for non-tunneled packets is %d\\n\",\n \t\t\tports[res->port_id].tso_segsz);\n \t}\n \tcmd_config_queue_tx_offloads(&ports[res->port_id]);\ndiff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c\nindex c103e54111..21210aff43 100644\n--- a/app/test-pmd/csumonly.c\n+++ b/app/test-pmd/csumonly.c\n@@ -466,6 +466,12 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,\n \tuint64_t ol_flags = 0;\n \tuint32_t max_pkt_len, tso_segsz = 0;\n \tuint16_t l4_off;\n+\tuint64_t all_tunnel_tso = RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_IP_TNL_TSO |\n+\t\t\t\tRTE_ETH_TX_OFFLOAD_UDP_TNL_TSO;\n \n \t/* ensure packet is large enough to require tso */\n \tif (!info->is_tunnel) {\n@@ -505,7 +511,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,\n \t\tudp_hdr = (struct rte_udp_hdr *)((char *)l3_hdr + info->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\tif (tso_segsz)\n+\t\t\tif (tso_segsz && (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_TSO))\n \t\t\t\tol_flags |= RTE_MBUF_F_TX_UDP_SEG;\n \t\t\telse if (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) {\n \t\t\t\tol_flags |= RTE_MBUF_F_TX_UDP_CKSUM;\n@@ -528,7 +534,8 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,\n #endif\n \t} else if (info->l4_proto == IPPROTO_TCP) {\n \t\ttcp_hdr = (struct rte_tcp_hdr *)((char *)l3_hdr + info->l3_len);\n-\t\tif (tso_segsz)\n+\t\tif (tso_segsz &&\n+\t\t (tx_offloads & (RTE_ETH_TX_OFFLOAD_TCP_TSO | all_tunnel_tso)))\n \t\t\tol_flags |= RTE_MBUF_F_TX_TCP_SEG;\n \t\telse if (tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) {\n \t\t\tol_flags |= RTE_MBUF_F_TX_TCP_CKSUM;\n", "prefixes": [ "v3", "2/2" ] }