patch 'net/iavf: fix TSO with big segments' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:22:02 CEST 2023
Hi,
FYI, your patch has been queued to stable release 22.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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=50e27677ba28f46145692b2c180c138e677d1aa2
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 50e27677ba28f46145692b2c180c138e677d1aa2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 27 Sep 2023 11:41:46 +0200
Subject: [PATCH] net/iavf: fix TSO with big segments
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ]
Packets to be segmented with TSO are usually larger than MTU.
Plus, a single segment for the whole packet may be used: in OVS case,
an external rte_malloc'd buffer is used for packets received
from vhost-user ports.
Before this fix, TSO packets were dropped by net/iavf with the following
message:
2023-09-18T14:08:52.739Z|00610|dpdk(pmd-c31/id:11)|ERR|iavf_prep_pkts():
INVALID mbuf: bad data_len=[2962]
Remove the check on data_len.
Fixes: 19ee91c6bd9a ("net/iavf: check illegal packet sizes")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
drivers/net/iavf/iavf_rxtx.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 77c37423dd..b6bc904228 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2975,7 +2975,6 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
struct rte_mbuf *m;
struct iavf_tx_queue *txq = tx_queue;
struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id];
- uint16_t max_frame_size = dev->data->mtu + IAVF_ETH_OVERHEAD;
struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
@@ -3004,9 +3003,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
- /* check the data_len in mbuf */
- if (m->data_len < IAVF_TX_MIN_PKT_LEN ||
- m->data_len > max_frame_size) {
+ if (m->pkt_len < IAVF_TX_MIN_PKT_LEN) {
rte_errno = EINVAL;
return i;
}
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:37.778043300 +0800
+++ 0093-net-iavf-fix-TSO-with-big-segments.patch 2023-10-22 22:17:34.356723700 +0800
@@ -1 +1 @@
-From 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 Mon Sep 17 00:00:00 2001
+From 50e27677ba28f46145692b2c180c138e677d1aa2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ]
@@ -19 +21,0 @@
-Cc: stable at dpdk.org
@@ -28 +30 @@
-index 21a06b8351..c6ef6af1d8 100644
+index 77c37423dd..b6bc904228 100644
@@ -31 +33 @@
-@@ -3636,7 +3636,6 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -2975,7 +2975,6 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -39 +41 @@
-@@ -3665,9 +3664,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3004,9 +3003,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
More information about the stable
mailing list