Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139131/?format=api
{ "id": 139131, "url": "http://patches.dpdk.org/api/patches/139131/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240405144604.906695-6-david.marchand@redhat.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": "<20240405144604.906695-6-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240405144604.906695-6-david.marchand@redhat.com", "date": "2024-04-05T14:45:59", "name": "[v2,5/8] net: fix outer UDP checksum in Intel prepare helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "cc6d2f357c46ca67a01db024f31fab6cb78ad12e", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240405144604.906695-6-david.marchand@redhat.com/mbox/", "series": [ { "id": 31689, "url": "http://patches.dpdk.org/api/series/31689/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31689", "date": "2024-04-05T14:45:54", "name": "Fix outer UDP checksum for Intel nics", "version": 2, "mbox": "http://patches.dpdk.org/series/31689/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/139131/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/139131/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 A0F2843E06;\n\tFri, 5 Apr 2024 16:47:07 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8D0254029C;\n\tFri, 5 Apr 2024 16:47:07 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 3CC064029C\n for <dev@dpdk.org>; Fri, 5 Apr 2024 16:47:05 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-694-imPPjYmYPly_FiAi5zKQfg-1; Fri, 05 Apr 2024 10:47:03 -0400", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79DE5848A64;\n Fri, 5 Apr 2024 14:47:02 +0000 (UTC)", "from dmarchan.redhat.com (unknown [10.45.225.49])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 675D53C21;\n Fri, 5 Apr 2024 14:47:00 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1712328424;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=S4fn+TJKt47mpCqj01ODr31WxeLfKeRTOq4xZRua4Eo=;\n b=AGE5CWwawI56gJHV5iiCVFqnY/4kXauwrzbao5BYMNdQwPO+KBqQqA9ZbmhRlQnC6onSLf\n wwa/aIiEocFASrbWKDPipLvwrlh/VBndLMFYJXTCqIgXKolWsqyHt7qw8l1d25IqD8rllL\n m6wbua0vwa6BT4a5qYM15kAFIalWx1A=", "X-MC-Unique": "imPPjYmYPly_FiAi5zKQfg-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, ferruh.yigit@amd.com, stable@dpdk.org,\n Aman Singh <aman.deep.singh@intel.com>,\n Yuying Zhang <yuying.zhang@intel.com>, Jie Hai <haijie1@huawei.com>,\n Yisen Zhuang <yisen.zhuang@huawei.com>, Ting Xu <ting.xu@intel.com>", "Subject": "[PATCH v2 5/8] net: fix outer UDP checksum in Intel prepare helper", "Date": "Fri, 5 Apr 2024 16:45:59 +0200", "Message-ID": "<20240405144604.906695-6-david.marchand@redhat.com>", "In-Reply-To": "<20240405144604.906695-1-david.marchand@redhat.com>", "References": "<20240405125039.897933-1-david.marchand@redhat.com>\n <20240405144604.906695-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.1", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Setting a pseudo header checksum in the outer UDP checksum is a Intel\n(and some other vendors) requirement.\nApplications (like OVS) requesting outer UDP checksum without doing this\nextra setup have broken outer UDP checksums.\n\nMove this specific setup from testpmd to the \"common\" helper\nrte_net_intel_cksum_flags_prepare().\n\nnet/hns3 can then be adjusted.\n\nBugzilla ID: 1406\nFixes: d8e5e69f3a9b (\"app/testpmd: add GTP parsing and Tx checksum offload\")\nCc: stable@dpdk.org\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n app/test-pmd/csumonly.c | 11 +----\n drivers/net/hns3/hns3_rxtx.c | 93 ++++++++++--------------------------\n lib/net/rte_net.h | 18 ++++++-\n 3 files changed, 44 insertions(+), 78 deletions(-)", "diff": "diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c\nindex f5125c2788..71add6ca47 100644\n--- a/app/test-pmd/csumonly.c\n+++ b/app/test-pmd/csumonly.c\n@@ -577,8 +577,6 @@ static uint64_t\n process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,\n \tuint64_t tx_offloads, int tso_enabled, struct rte_mbuf *m)\n {\n-\tstruct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;\n-\tstruct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr;\n \tstruct rte_udp_hdr *udp_hdr;\n \tuint64_t ol_flags = 0;\n \n@@ -588,6 +586,8 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,\n \t\tif (tx_offloads\t& RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM) {\n \t\t\tol_flags |= RTE_MBUF_F_TX_OUTER_IP_CKSUM;\n \t\t} else {\n+\t\t\tstruct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;\n+\n \t\t\tipv4_hdr->hdr_checksum = 0;\n \t\t\tipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr);\n \t\t}\n@@ -608,13 +608,6 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,\n \n \t/* Skip SW outer UDP checksum generation if HW supports it */\n \tif (tx_offloads & RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM) {\n-\t\tif (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4))\n-\t\t\tudp_hdr->dgram_cksum\n-\t\t\t\t= rte_ipv4_phdr_cksum(ipv4_hdr, ol_flags);\n-\t\telse\n-\t\t\tudp_hdr->dgram_cksum\n-\t\t\t\t= rte_ipv6_phdr_cksum(ipv6_hdr, ol_flags);\n-\n \t\tol_flags |= RTE_MBUF_F_TX_OUTER_UDP_CKSUM;\n \t\treturn ol_flags;\n \t}\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 7e636a0a2e..03fc919fd7 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -3616,58 +3616,6 @@ hns3_pkt_need_linearized(struct rte_mbuf *tx_pkts, uint32_t bd_num,\n \treturn false;\n }\n \n-static bool\n-hns3_outer_ipv4_cksum_prepared(struct rte_mbuf *m, uint64_t ol_flags,\n-\t\t\t\tuint32_t *l4_proto)\n-{\n-\tstruct rte_ipv4_hdr *ipv4_hdr;\n-\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n-\t\t\t\t\t m->outer_l2_len);\n-\tif (ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM)\n-\t\tipv4_hdr->hdr_checksum = 0;\n-\tif (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM) {\n-\t\tstruct rte_udp_hdr *udp_hdr;\n-\t\t/*\n-\t\t * If OUTER_UDP_CKSUM is support, HW can calculate the pseudo\n-\t\t * header for TSO packets\n-\t\t */\n-\t\tif (ol_flags & RTE_MBUF_F_TX_TCP_SEG)\n-\t\t\treturn true;\n-\t\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct rte_udp_hdr *,\n-\t\t\t\tm->outer_l2_len + m->outer_l3_len);\n-\t\tudp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr, ol_flags);\n-\n-\t\treturn true;\n-\t}\n-\t*l4_proto = ipv4_hdr->next_proto_id;\n-\treturn false;\n-}\n-\n-static bool\n-hns3_outer_ipv6_cksum_prepared(struct rte_mbuf *m, uint64_t ol_flags,\n-\t\t\t\tuint32_t *l4_proto)\n-{\n-\tstruct rte_ipv6_hdr *ipv6_hdr;\n-\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n-\t\t\t\t\t m->outer_l2_len);\n-\tif (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM) {\n-\t\tstruct rte_udp_hdr *udp_hdr;\n-\t\t/*\n-\t\t * If OUTER_UDP_CKSUM is support, HW can calculate the pseudo\n-\t\t * header for TSO packets\n-\t\t */\n-\t\tif (ol_flags & RTE_MBUF_F_TX_TCP_SEG)\n-\t\t\treturn true;\n-\t\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct rte_udp_hdr *,\n-\t\t\t\tm->outer_l2_len + m->outer_l3_len);\n-\t\tudp_hdr->dgram_cksum = rte_ipv6_phdr_cksum(ipv6_hdr, ol_flags);\n-\n-\t\treturn true;\n-\t}\n-\t*l4_proto = ipv6_hdr->proto;\n-\treturn false;\n-}\n-\n static void\n hns3_outer_header_cksum_prepare(struct rte_mbuf *m)\n {\n@@ -3675,29 +3623,38 @@ hns3_outer_header_cksum_prepare(struct rte_mbuf *m)\n \tuint32_t paylen, hdr_len, l4_proto;\n \tstruct rte_udp_hdr *udp_hdr;\n \n-\tif (!(ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6)))\n+\tif (!(ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6)) &&\n+\t\t\t((ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM) ||\n+\t\t\t!(ol_flags & RTE_MBUF_F_TX_TCP_SEG)))\n \t\treturn;\n \n \tif (ol_flags & RTE_MBUF_F_TX_OUTER_IPV4) {\n-\t\tif (hns3_outer_ipv4_cksum_prepared(m, ol_flags, &l4_proto))\n-\t\t\treturn;\n+\t\tstruct rte_ipv4_hdr *ipv4_hdr;\n+\n+\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n+\t\t\tm->outer_l2_len);\n+\t\tl4_proto = ipv4_hdr->next_proto_id;\n \t} else {\n-\t\tif (hns3_outer_ipv6_cksum_prepared(m, ol_flags, &l4_proto))\n-\t\t\treturn;\n+\t\tstruct rte_ipv6_hdr *ipv6_hdr;\n+\n+\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n+\t\t\t\t\t m->outer_l2_len);\n+\t\tl4_proto = ipv6_hdr->proto;\n \t}\n \n+\tif (l4_proto != IPPROTO_UDP)\n+\t\treturn;\n+\n \t/* driver should ensure the outer udp cksum is 0 for TUNNEL TSO */\n-\tif (l4_proto == IPPROTO_UDP && (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {\n-\t\thdr_len = m->l2_len + m->l3_len + m->l4_len;\n-\t\thdr_len += m->outer_l2_len + m->outer_l3_len;\n-\t\tpaylen = m->pkt_len - hdr_len;\n-\t\tif (paylen <= m->tso_segsz)\n-\t\t\treturn;\n-\t\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct rte_udp_hdr *,\n-\t\t\t\t\t\t m->outer_l2_len +\n-\t\t\t\t\t\t m->outer_l3_len);\n-\t\tudp_hdr->dgram_cksum = 0;\n-\t}\n+\thdr_len = m->l2_len + m->l3_len + m->l4_len;\n+\thdr_len += m->outer_l2_len + m->outer_l3_len;\n+\tpaylen = m->pkt_len - hdr_len;\n+\tif (paylen <= m->tso_segsz)\n+\t\treturn;\n+\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct rte_udp_hdr *,\n+\t\t\t\t\t m->outer_l2_len +\n+\t\t\t\t\t m->outer_l3_len);\n+\tudp_hdr->dgram_cksum = 0;\n }\n \n static int\ndiff --git a/lib/net/rte_net.h b/lib/net/rte_net.h\nindex ef3ff4c6fd..efd9d5f5ee 100644\n--- a/lib/net/rte_net.h\n+++ b/lib/net/rte_net.h\n@@ -121,7 +121,8 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n \t * no offloads are requested.\n \t */\n \tif (!(ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_L4_MASK | RTE_MBUF_F_TX_TCP_SEG |\n-\t\t\t\t\tRTE_MBUF_F_TX_UDP_SEG | RTE_MBUF_F_TX_OUTER_IP_CKSUM)))\n+\t\t\t\t\tRTE_MBUF_F_TX_UDP_SEG | RTE_MBUF_F_TX_OUTER_IP_CKSUM |\n+\t\t\t\t\tRTE_MBUF_F_TX_OUTER_UDP_CKSUM)))\n \t\treturn 0;\n \n \tif (ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6)) {\n@@ -135,6 +136,21 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)\n \t\t\t\t\tstruct rte_ipv4_hdr *, m->outer_l2_len);\n \t\t\tipv4_hdr->hdr_checksum = 0;\n \t\t}\n+\t\tif (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM) {\n+\t\t\tif (ol_flags & RTE_MBUF_F_TX_OUTER_IPV4) {\n+\t\t\t\tipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *,\n+\t\t\t\t\tm->outer_l2_len);\n+\t\t\t\tudp_hdr = (struct rte_udp_hdr *)((char *)ipv4_hdr +\n+\t\t\t\t\tm->outer_l3_len);\n+\t\t\t\tudp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr, m->ol_flags);\n+\t\t\t} else {\n+\t\t\t\tipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *,\n+\t\t\t\t\tm->outer_l2_len);\n+\t\t\t\tudp_hdr = rte_pktmbuf_mtod_offset(m, struct rte_udp_hdr *,\n+\t\t\t\t\t m->outer_l2_len + m->outer_l3_len);\n+\t\t\t\tudp_hdr->dgram_cksum = rte_ipv6_phdr_cksum(ipv6_hdr, m->ol_flags);\n+\t\t\t}\n+\t\t}\n \t}\n \n \t/*\n", "prefixes": [ "v2", "5/8" ] }