patch 'gro: fix chain index for more than 2 packets' has been queued to stable release 19.11.14

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Nov 11 12:38:45 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.14

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/18/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/3f705a2a4a38f6566c232664a4660fdd35e3cead

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 3f705a2a4a38f6566c232664a4660fdd35e3cead Mon Sep 17 00:00:00 2001
From: Kumara Parameshwaran <kumaraparamesh92 at gmail.com>
Date: Wed, 7 Sep 2022 15:02:05 +0530
Subject: [PATCH] gro: fix chain index for more than 2 packets

[ upstream commit bc4a7f7ee0281d96b8d93ac2771135a670b4a00f ]

When more than two packets are merged in a flow, and if we receive
a 3rd packet which is matching the sequence of the 2nd packet the
prev_idx will be 1 and not 2, hence resulting in packet re-ordering

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

diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c
index feb5855144..5f3b3a82ce 100644
--- a/lib/librte_gro/gro_tcp4.c
+++ b/lib/librte_gro/gro_tcp4.c
@@ -306,7 +306,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
 			 * length is greater than the max value. Store
 			 * the packet into the flow.
 			 */
-			if (insert_new_item(tbl, pkt, start_time, prev_idx,
+			if (insert_new_item(tbl, pkt, start_time, cur_idx,
 						sent_seq, ip_id, is_atomic) ==
 					INVALID_ARRAY_INDEX)
 				return -1;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:05.783295786 +0100
+++ 0028-gro-fix-chain-index-for-more-than-2-packets.patch	2022-11-11 12:35:04.773192062 +0100
@@ -1 +1 @@
-From bc4a7f7ee0281d96b8d93ac2771135a670b4a00f Mon Sep 17 00:00:00 2001
+From 3f705a2a4a38f6566c232664a4660fdd35e3cead Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc4a7f7ee0281d96b8d93ac2771135a670b4a00f ]
+
@@ -13 +15 @@
- lib/gro/gro_tcp4.c | 2 +-
+ lib/librte_gro/gro_tcp4.c | 2 +-
@@ -16,5 +18,5 @@
-diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c
-index 7498c66141..9758e28fd5 100644
---- a/lib/gro/gro_tcp4.c
-+++ b/lib/gro/gro_tcp4.c
-@@ -305,7 +305,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
+diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c
+index feb5855144..5f3b3a82ce 100644
+--- a/lib/librte_gro/gro_tcp4.c
++++ b/lib/librte_gro/gro_tcp4.c
+@@ -306,7 +306,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,


More information about the stable mailing list