From: Mingjin Ye <mingjinx.ye@intel.com>
To: dev@dpdk.org
Cc: qiming.yang@intel.com, stable@dpdk.org, yidingx.zhou@intel.com,
Mingjin Ye <mingjinx.ye@intel.com>,
Qi Zhang <qi.z.zhang@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Wenzhuo Lu <wenzhuo.lu@intel.com>,
Kevin Liu <kevinx.liu@intel.com>
Subject: [PATCH v4 2/2] net/ice: fix scalar Tx path segment
Date: Fri, 11 Nov 2022 16:12:41 +0000 [thread overview]
Message-ID: <20221111161241.861732-2-mingjinx.ye@intel.com> (raw)
In-Reply-To: <20221111161241.861732-1-mingjinx.ye@intel.com>
The scalar Tx path would send empty buffer that causes the Tx queue to
overflow.
This patch adds the last buffer length judgment in tx_prepare to fix this
issue, rte_errno will be set to EINVAL and returned if the last buffer is
empty.
Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes")
Cc: stable@dpdk.org
Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
v3:
* delete unused variable.
* Full detection of mbufs.
---
drivers/net/ice/ice_rxtx.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index e6ddd2513d..9017353943 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3643,6 +3643,22 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
#define ICE_MIN_TSO_MSS 64
#define ICE_MAX_TSO_MSS 9728
#define ICE_MAX_TSO_FRAME_SIZE 262144
+
+/*Check for empty mbuf*/
+static inline uint16_t
+ice_check_empty_mbuf(struct rte_mbuf *tx_pkt)
+{
+ struct rte_mbuf *txd = tx_pkt;
+
+ while (txd != NULL) {
+ if (txd->data_len == 0)
+ return -1;
+ txd = txd->next;
+ }
+
+ return 0;
+}
+
uint16_t
ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
@@ -3689,6 +3705,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
rte_errno = -ret;
return i;
}
+
+ if (ice_check_empty_mbuf(m) != 0) {
+ rte_errno = EINVAL;
+ PMD_DRV_LOG(ERR, "INVALID mbuf: last mbuf data_len=[0]");
+ return i;
+ }
}
return i;
}
--
2.34.1
next prev parent reply other threads:[~2022-11-11 8:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 17:20 [PATCH] net/ice: fix scalar Rx and " Mingjin Ye
2022-11-04 6:57 ` Xu, Ke1
2022-11-09 12:56 ` [PATCH v2] " Mingjin Ye
2022-11-10 2:01 ` Xu, Ke1
2022-11-10 10:37 ` Zhang, Qi Z
2022-11-11 3:12 ` Ye, MingjinX
2022-11-11 12:04 ` [PATCH v3 1/2] net/ice: fix scalar Rx " Mingjin Ye
2022-11-11 4:59 ` Zhang, Qi Z
2022-11-11 12:04 ` [PATCH v3 2/2] net/ice: fix scalar Tx " Mingjin Ye
2022-11-11 5:09 ` Zhang, Qi Z
2022-11-11 8:30 ` Ye, MingjinX
2022-11-11 8:45 ` Zhang, Qi Z
2022-11-11 16:01 ` [PATCH v4 1/2] net/ice: fix scalar Rx " Mingjin Ye
2022-11-11 16:01 ` [PATCH v4 2/2] net/ice: fix scalar Tx " Mingjin Ye
2022-11-11 16:12 ` [PATCH v4 1/2] net/ice: fix scalar Rx " Mingjin Ye
2022-11-11 9:03 ` Zhang, Qi Z
2022-11-11 9:13 ` Xu, Ke1
2022-11-11 16:12 ` Mingjin Ye [this message]
2022-11-11 9:01 ` [PATCH v4 2/2] net/ice: fix scalar Tx " Zhang, Qi Z
2022-11-11 9:14 ` Xu, Ke1
2023-09-19 8:15 ` David Marchand
2023-09-27 8:44 ` David Marchand
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=20221111161241.861732-2-mingjinx.ye@intel.com \
--to=mingjinx.ye@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jingjing.wu@intel.com \
--cc=kevinx.liu@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
--cc=wenzhuo.lu@intel.com \
--cc=yidingx.zhou@intel.com \
/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).