patch 'net/ice: fix scalar Rx path segment' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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/28/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/da678c35428a9e7fddc1495149ca8ad08cff35d7

Thanks.

Kevin

---
>From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye at intel.com>
Date: Fri, 11 Nov 2022 12:04:00 +0000
Subject: [PATCH] net/ice: fix scalar Rx path segment

[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ]

CRC is stripped by the hardware in the scattered Rx path. The last buffer
is invalid if it's packet length is zero.

This patch adds a judgment for the last buffer length to fix this issue,
it would free the mbuf associated to the last one if the last buffer is
empty.

Fixes: 6eac0b7fde95 ("net/ice: support advance Rx/Tx")

Signed-off-by: Mingjin Ye <mingjinx.ye at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 7675f8c405..b91e6eaad5 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue,
 				rxm->data_len = (uint16_t)(rx_packet_len -
 							   RTE_ETHER_CRC_LEN);
+		} else if (rx_packet_len == 0) {
+			rte_pktmbuf_free_seg(rxm);
+			first_seg->nb_segs--;
+			last_seg->next = NULL;
 		}
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.648622457 +0000
+++ 0023-net-ice-fix-scalar-Rx-path-segment.patch	2022-11-23 09:55:57.061149287 +0000
@@ -1 +1 @@
-From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001
+From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index cd046a3432..3224a02db2 100644
+index 7675f8c405..b91e6eaad5 100644
@@ -26 +27 @@
-@@ -2114,4 +2114,8 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue,