patch 'gro: fix identifying fragmented packets' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/22/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/6ad5ecf28dd63fb63ac70b11117b33335217d4e3

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 6ad5ecf28dd63fb63ac70b11117b33335217d4e3 Mon Sep 17 00:00:00 2001
From: Kumara Parameshwaran <kumaraparamesh92 at gmail.com>
Date: Mon, 27 Jun 2022 16:01:14 +0530
Subject: [PATCH] gro: fix identifying fragmented packets
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ]

A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP
(0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in
rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the
GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for
RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the
IP header should be parsed to recognize the appropriate IP type and
invoke the respective gro handler.

Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")

Signed-off-by: Kumara Parameshwaran <kumaraparamesh92 at gmail.com>
Reviewed-by: Jiayu Hu <jiayu.hu at intel.com>
---
 lib/librte_gro/rte_gro.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c
index 8ca4da67e9..7a788523ad 100644
--- a/lib/librte_gro/rte_gro.c
+++ b/lib/librte_gro/rte_gro.c
@@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
 
 #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_FRAG) != RTE_PTYPE_L4_FRAG) && \
 		(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
 
 #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
@@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
 
 #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_L4_FRAG) != RTE_PTYPE_L4_FRAG) && \
 		((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
 		 RTE_PTYPE_TUNNEL_VXLAN) && \
 		((ptype & RTE_PTYPE_INNER_L4_TCP) == \
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:01:01.631873733 +0800
+++ 0062-gro-fix-identifying-fragmented-packets.patch	2022-07-20 15:00:58.807667007 +0800
@@ -1 +1 @@
-From bdf2f895a66044bc643e98a7262d70c245252927 Mon Sep 17 00:00:00 2001
+From 6ad5ecf28dd63fb63ac70b11117b33335217d4e3 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ]
@@ -15 +17,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
- lib/gro/rte_gro.c | 2 ++
+ lib/librte_gro/rte_gro.c | 2 ++
@@ -23,5 +25,5 @@
-diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
-index 6f7dd4d709..e35399fd42 100644
---- a/lib/gro/rte_gro.c
-+++ b/lib/gro/rte_gro.c
-@@ -32,6 +32,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
+diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c
+index 8ca4da67e9..7a788523ad 100644
+--- a/lib/librte_gro/rte_gro.c
++++ b/lib/librte_gro/rte_gro.c
+@@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
@@ -35 +37 @@
-@@ -40,6 +41,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
+@@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {