From: "Hu, Jiayu" <jiayu.hu@intel.com>
To: "yang_y_yi@163.com" <yang_y_yi@163.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Ananyev, Konstantin" <konstantin.ananyev@intel.com>,
"thomas@monjalon.net" <thomas@monjalon.net>,
"yangyi01@inspur.com" <yangyi01@inspur.com>
Subject: Re: [dpdk-dev] [PATCH v2] gro: fix an error when packet is IPv6
Date: Thu, 5 Nov 2020 06:08:17 +0000 [thread overview]
Message-ID: <fc9e1aa7c1a74cc0ac45c7e9ba0f7ae4@intel.com> (raw)
In-Reply-To: <20201105025444.140140-1-yang_y_yi@163.com>
Acked-by: Jiayu Hu <jiayu.hu@intel.com>
> -----Original Message-----
> From: yang_y_yi@163.com <yang_y_yi@163.com>
> Sent: Thursday, November 5, 2020 10:55 AM
> To: dev@dpdk.org
> Cc: Hu, Jiayu <jiayu.hu@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>; thomas@monjalon.net;
> yangyi01@inspur.com; yang_y_yi@163.com
> Subject: [PATCH v2] gro: fix an error when packet is IPv6
>
> From: Yi Yang <yangyi01@inspur.com>
>
> For VxLAN packets, GRO will mistakenly reassemble them
> if inner L3 is IPv6, inner L4 is TCP or UDP, and outer L3
> is IPv4 because the value of IS_IPV4_VXLAN_TCP4/UDP4_PKT
> is true for them.
>
> This fix makes sure IS_IPV4_TCP_PKT, IS_IPV4_UDP_PKT,
> IS_IPV4_VXLAN_TCP4_PKT and IS_IPV4_VXLAN_UDP4_PKT can make
> decision precisely.
>
> Fixes: e2d811063673 ("gro: support VXLAN UDP/IPv4")
> Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
> Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")
> Fixes: 0d2cbe59b719 ("lib/gro: support TCP/IPv4")
> Signed-off-by: Yi Yang <yangyi01@inspur.com>
> ---
> lib/librte_gro/rte_gro.c | 34 ++++++++++++++++++++--------------
> 1 file changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c
> index e56bd20..8ca4da6 100644
> --- a/lib/librte_gro/rte_gro.c
> +++ b/lib/librte_gro/rte_gro.c
> @@ -32,32 +32,38 @@
> NULL};
>
> #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
> - ((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP))
> + ((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \
> + (RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
>
> #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
> - ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP))
> + ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
> + (RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
>
> #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype)
> && \
> ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
> ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
> RTE_PTYPE_TUNNEL_VXLAN) && \
> - ((ptype & RTE_PTYPE_INNER_L4_TCP) == \
> - RTE_PTYPE_INNER_L4_TCP) && \
> - (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
> - (RTE_PTYPE_INNER_L3_IPV4 | \
> - RTE_PTYPE_INNER_L3_IPV4_EXT | \
> - RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
> + ((ptype & RTE_PTYPE_INNER_L4_TCP) == \
> + RTE_PTYPE_INNER_L4_TCP) && \
> + (((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4) || \
> + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4_EXT) || \
> + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
>
> #define IS_IPV4_VXLAN_UDP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype)
> && \
> ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
> ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
> RTE_PTYPE_TUNNEL_VXLAN) && \
> - ((ptype & RTE_PTYPE_INNER_L4_UDP) == \
> - RTE_PTYPE_INNER_L4_UDP) && \
> - (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
> - (RTE_PTYPE_INNER_L3_IPV4 | \
> - RTE_PTYPE_INNER_L3_IPV4_EXT | \
> - RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
> + ((ptype & RTE_PTYPE_INNER_L4_UDP) == \
> + RTE_PTYPE_INNER_L4_UDP) && \
> + (((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4) || \
> + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4_EXT) || \
> + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> + RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
>
> /*
> * GRO context structure. It keeps the table structures, which are
> --
> 1.8.3.1
next prev parent reply other threads:[~2020-11-05 6:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 4:22 [dpdk-dev] [PATCH] " yang_y_yi
2020-11-05 1:41 ` Hu, Jiayu
2020-11-05 1:48 ` yang_y_yi
2020-11-05 2:54 ` [dpdk-dev] [PATCH v2] " yang_y_yi
2020-11-05 6:08 ` Hu, Jiayu [this message]
2020-11-14 8:47 ` Thomas Monjalon
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=fc9e1aa7c1a74cc0ac45c7e9ba0f7ae4@intel.com \
--to=jiayu.hu@intel.com \
--cc=dev@dpdk.org \
--cc=konstantin.ananyev@intel.com \
--cc=thomas@monjalon.net \
--cc=yang_y_yi@163.com \
--cc=yangyi01@inspur.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).