[dpdk-stable] patch 'ip_frag: revert fix fragmenting IPv4 fragment' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/21. 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/1f01d7a0f29460da1f2f58a7fa465b746a7a8baf

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 1f01d7a0f29460da1f2f58a7fa465b746a7a8baf Mon Sep 17 00:00:00 2001
From: Huichao Cai <chcchc88 at 163.com>
Date: Mon, 25 Oct 2021 15:55:53 +0800
Subject: [PATCH] ip_frag: revert fix fragmenting IPv4 fragment
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 013bb504c81ed4efce61a8c5c1bd169f539797ef ]

The patch ("ip_frag: fix fragmenting IPv4 fragment") introduces
a bug and needs to be rolled back. This is because the patch
and variables "flag_offset" conflict with each other.

Bugzilla ID: 835
Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment")

Signed-off-by: Huichao Cai <chcchc88 at 163.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 lib/librte_ip_frag/rte_ipv4_fragmentation.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index fead5a985a..2e7739d027 100644
--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -75,7 +75,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
 	uint32_t out_pkt_pos, in_seg_data_pos;
 	uint32_t more_in_segs;
 	uint16_t fragment_offset, flag_offset, frag_size, header_len;
-	uint16_t frag_bytes_remaining, not_last_frag;
+	uint16_t frag_bytes_remaining;
 
 	/*
 	 * Formal parameter checking.
@@ -116,9 +116,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
 	in_seg = pkt_in;
 	in_seg_data_pos = header_len;
 	out_pkt_pos = 0;
-	fragment_offset = (uint16_t)((flag_offset &
-	    RTE_IPV4_HDR_OFFSET_MASK) << RTE_IPV4_HDR_FO_SHIFT);
-	not_last_frag = (uint16_t)(flag_offset & IPV4_HDR_MF_MASK);
+	fragment_offset = 0;
 
 	more_in_segs = 1;
 	while (likely(more_in_segs)) {
@@ -188,8 +186,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
 
 		__fill_ipv4hdr_frag(out_hdr, in_hdr, header_len,
 		    (uint16_t)out_pkt->pkt_len,
-		    flag_offset, fragment_offset,
-		    not_last_frag || more_in_segs);
+		    flag_offset, fragment_offset, more_in_segs);
 
 		fragment_offset = (uint16_t)(fragment_offset +
 		    out_pkt->pkt_len - header_len);
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.962173283 +0800
+++ 0252-ip_frag-revert-fix-fragmenting-IPv4-fragment.patch	2021-11-10 14:17:02.094077597 +0800
@@ -1 +1 @@
-From 013bb504c81ed4efce61a8c5c1bd169f539797ef Mon Sep 17 00:00:00 2001
+From 1f01d7a0f29460da1f2f58a7fa465b746a7a8baf Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 013bb504c81ed4efce61a8c5c1bd169f539797ef ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -17 +19 @@
- lib/ip_frag/rte_ipv4_fragmentation.c | 9 +++------
+ lib/librte_ip_frag/rte_ipv4_fragmentation.c | 9 +++------
@@ -20 +22 @@
-diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
+diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -22,2 +24,2 @@
---- a/lib/ip_frag/rte_ipv4_fragmentation.c
-+++ b/lib/ip_frag/rte_ipv4_fragmentation.c
+--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
++++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c