From: christian.ehrhardt@canonical.com
To: Mingjin Ye <mingjinx.ye@intel.com>
Cc: Qi Zhang <qi.z.zhang@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/ice: fix scalar Rx path segment' has been queued to stable release 19.11.14
Date: Wed, 16 Nov 2022 11:40:05 +0100 [thread overview]
Message-ID: <20221116104012.2975036-10-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com>
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/23/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/dcad322034374223a5d514bf4eae2a554e542e90
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From dcad322034374223a5d514bf4eae2a554e542e90 Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye@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@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@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 f97d93a78d..6dcb2f702a 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue,
} else
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;
}
first_seg->port = rxq->port_id;
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-16 11:36:50.797570481 +0100
+++ 0010-net-ice-fix-scalar-Rx-path-segment.patch 2022-11-16 11:36:50.420775502 +0100
@@ -1 +1 @@
-From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001
+From dcad322034374223a5d514bf4eae2a554e542e90 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index cd046a3432..3224a02db2 100644
+index f97d93a78d..6dcb2f702a 100644
@@ -26 +27 @@
-@@ -2113,6 +2113,10 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue,
next prev parent reply other threads:[~2022-11-16 10:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 10:39 patch 'net/bonding: set initial value of descriptor count alignment' " christian.ehrhardt
2022-11-16 10:39 ` patch 'net/bonding: fix dropping valid MAC packets' " christian.ehrhardt
2022-11-16 10:39 ` patch 'app/testpmd: make quit flag volatile' " christian.ehrhardt
2022-11-16 10:39 ` patch 'net/bonding: fix mbuf fast free handling' " christian.ehrhardt
2022-11-16 10:40 ` patch 'eal: fix doxygen comments for UUID' " christian.ehrhardt
2022-11-16 10:40 ` patch 'power: fix some doxygen comments' " christian.ehrhardt
2022-11-16 10:40 ` patch 'test/hash: remove dead code in extendable bucket test' " christian.ehrhardt
2022-11-16 10:40 ` patch 'net/mlx5: fix hairpin split with set VLAN VID action' " christian.ehrhardt
2022-11-16 10:40 ` patch 'net/ice/base: fix duplicate flow rules' " christian.ehrhardt
2022-11-16 10:40 ` christian.ehrhardt [this message]
2022-11-16 10:40 ` patch 'net/ice: fix scalar Tx path segment' " christian.ehrhardt
2022-11-16 10:40 ` patch 'examples/fips_validation: fix typo in error log' " christian.ehrhardt
2022-11-16 10:40 ` patch 'test/crypto: fix bitwise operator in a SNOW3G case' " christian.ehrhardt
2022-11-16 10:40 ` patch 'doc: fix typo depreciated instead of deprecated' " christian.ehrhardt
2022-11-16 10:40 ` patch 'drivers: fix typos found by Lintian' " christian.ehrhardt
2022-11-16 10:40 ` patch 'doc: fix net drivers ordering' " christian.ehrhardt
2022-11-16 10:40 ` patch 'ring: remove leftover comment about watermark' " christian.ehrhardt
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=20221116104012.2975036-10-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=mingjinx.ye@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
/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).