From: Bing Zhao <bingz@nvidia.com>
To: <matan@nvidia.com>, <viacheslavo@nvidia.com>,
<rasland@nvidia.com>, <suanmingm@nvidia.com>, <orika@nvidia.com>
Cc: <dev@dpdk.org>, Eli Britstein <elibr@nvidia.com>, <stable@dpdk.org>
Subject: [PATCH] net/mlx5: zero encap UDP csum for IPv4 too
Date: Mon, 13 Nov 2023 09:29:41 +0200 [thread overview]
Message-ID: <20231113072941.6914-1-bingz@nvidia.com> (raw)
From: Eli Britstein <elibr@nvidia.com>
A zero UDP csum indicates it should not be validated by the receiver.
The HW may not calculate UDP csum after encap.
The cited commit made sure the UDP csum is zero for UDP over IPv6,
mistakenly not handling UDP over IPv4. Fix it.
Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation")
Cc: stable@dpdk.org
Signed-off-by: Eli Britstein <elibr@nvidia.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 9753af2cb1..115d730317 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4713,6 +4713,7 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error)
{
struct rte_ether_hdr *eth = NULL;
struct rte_vlan_hdr *vlan = NULL;
+ struct rte_ipv4_hdr *ipv4 = NULL;
struct rte_ipv6_hdr *ipv6 = NULL;
struct rte_udp_hdr *udp = NULL;
char *next_hdr;
@@ -4729,24 +4730,27 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error)
next_hdr += sizeof(struct rte_vlan_hdr);
}
- /* HW calculates IPv4 csum. no need to proceed */
- if (proto == RTE_ETHER_TYPE_IPV4)
- return 0;
-
/* non IPv4/IPv6 header. not supported */
- if (proto != RTE_ETHER_TYPE_IPV6) {
+ if (proto != RTE_ETHER_TYPE_IPV4 && proto != RTE_ETHER_TYPE_IPV6) {
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION,
NULL, "Cannot offload non IPv4/IPv6");
}
- ipv6 = (struct rte_ipv6_hdr *)next_hdr;
-
- /* ignore non UDP */
- if (ipv6->proto != IPPROTO_UDP)
- return 0;
+ if (proto == RTE_ETHER_TYPE_IPV4) {
+ ipv4 = (struct rte_ipv4_hdr *)next_hdr;
+ /* ignore non UDP */
+ if (ipv4->next_proto_id != IPPROTO_UDP)
+ return 0;
+ udp = (struct rte_udp_hdr *)(ipv4 + 1);
+ } else {
+ ipv6 = (struct rte_ipv6_hdr *)next_hdr;
+ /* ignore non UDP */
+ if (ipv6->proto != IPPROTO_UDP)
+ return 0;
+ udp = (struct rte_udp_hdr *)(ipv6 + 1);
+ }
- udp = (struct rte_udp_hdr *)(ipv6 + 1);
udp->dgram_cksum = 0;
return 0;
--
2.34.1
next reply other threads:[~2023-11-13 7:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 7:29 Bing Zhao [this message]
2023-11-13 8:01 ` Suanming Mou
2023-11-14 8:14 ` Raslan Darawsheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231113072941.6914-1-bingz@nvidia.com \
--to=bingz@nvidia.com \
--cc=dev@dpdk.org \
--cc=elibr@nvidia.com \
--cc=matan@nvidia.com \
--cc=orika@nvidia.com \
--cc=rasland@nvidia.com \
--cc=stable@dpdk.org \
--cc=suanmingm@nvidia.com \
--cc=viacheslavo@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).