From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Praveen Shetty <praveen.shetty@intel.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>
Subject: [PATCH] net/intel: improve Rx descriptor ring size checks
Date: Mon, 15 Dec 2025 17:35:43 +0000 [thread overview]
Message-ID: <20251215173543.1707960-1-bruce.richardson@intel.com> (raw)
The default Rx ring size checks did not account for the fact that the
port would not work correctly if the Rx ring size was only twice the
free threshold size or less, so add in a new check for this. This would
generally only apply in cases where very small rings sizes are being
used, for example, with default Rx free thresh of 32, only ring size of
64 would cause issues.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/cpfl/cpfl_rxtx.c | 7 +++++++
drivers/net/intel/i40e/i40e_rxtx.c | 7 +++++++
drivers/net/intel/iavf/iavf_rxtx.c | 20 +++++---------------
drivers/net/intel/ice/ice_rxtx.c | 7 +++++++
drivers/net/intel/idpf/idpf_rxtx.c | 7 +++++++
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 7 +++++++
6 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c b/drivers/net/intel/cpfl/cpfl_rxtx.c
index 453ec975d5..1479f55d23 100644
--- a/drivers/net/intel/cpfl/cpfl_rxtx.c
+++ b/drivers/net/intel/cpfl/cpfl_rxtx.c
@@ -362,6 +362,13 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
if (idpf_qc_rx_thresh_check(nb_desc, rx_free_thresh) != 0)
return -EINVAL;
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_free_thresh) {
+ PMD_INIT_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_free_thresh);
+ return -EINVAL;
+ }
+
/* Free memory if needed */
if (dev->data->rx_queues[queue_idx] != NULL) {
cpfl_rx_queue_release(dev->data->rx_queues[queue_idx]);
diff --git a/drivers/net/intel/i40e/i40e_rxtx.c b/drivers/net/intel/i40e/i40e_rxtx.c
index 255414dd03..f4a7222bc1 100644
--- a/drivers/net/intel/i40e/i40e_rxtx.c
+++ b/drivers/net/intel/i40e/i40e_rxtx.c
@@ -2113,6 +2113,13 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_conf->rx_free_thresh) {
+ PMD_DRV_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_conf->rx_free_thresh);
+ return -EINVAL;
+ }
+
/* Free memory if needed */
if (dev->data->rx_queues[queue_idx]) {
i40e_rx_queue_release(dev->data->rx_queues[queue_idx]);
diff --git a/drivers/net/intel/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c
index d8662fd815..f4be309ef8 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.c
+++ b/drivers/net/intel/iavf/iavf_rxtx.c
@@ -146,20 +146,6 @@ iavf_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
return 0;
}
-static inline int
-check_rx_thresh(uint16_t nb_desc, uint16_t thresh)
-{
- /* The following constraints must be satisfied:
- * thresh < rxq->nb_rx_desc
- */
- if (thresh >= nb_desc) {
- PMD_INIT_LOG(ERR, "rx_free_thresh (%u) must be less than %u",
- thresh, nb_desc);
- return -EINVAL;
- }
- return 0;
-}
-
static inline int
check_tx_thresh(uint16_t nb_desc, uint16_t tx_rs_thresh,
uint16_t tx_free_thresh)
@@ -589,8 +575,12 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
rx_free_thresh = (rx_conf->rx_free_thresh == 0) ?
IAVF_DEFAULT_RX_FREE_THRESH :
rx_conf->rx_free_thresh;
- if (check_rx_thresh(nb_desc, rx_free_thresh) != 0)
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_free_thresh) {
+ PMD_INIT_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_free_thresh);
return -EINVAL;
+ }
/* Free memory if needed */
if (dev->data->rx_queues[queue_idx]) {
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index 74db0fbec9..42f2d5c590 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -1295,6 +1295,13 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_conf->rx_free_thresh) {
+ PMD_INIT_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_conf->rx_free_thresh);
+ return -EINVAL;
+ }
+
offloads = rx_conf->offloads | dev->data->dev_conf.rxmode.offloads;
if (mp)
diff --git a/drivers/net/intel/idpf/idpf_rxtx.c b/drivers/net/intel/idpf/idpf_rxtx.c
index 4796d8b862..136882e084 100644
--- a/drivers/net/intel/idpf/idpf_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_rxtx.c
@@ -244,6 +244,13 @@ idpf_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
if (idpf_qc_rx_thresh_check(nb_desc, rx_free_thresh) != 0)
return -EINVAL;
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_free_thresh) {
+ PMD_INIT_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_free_thresh);
+ return -EINVAL;
+ }
+
/* Free memory if needed */
if (dev->data->rx_queues[queue_idx] != NULL) {
idpf_qc_rx_queue_release(dev->data->rx_queues[queue_idx]);
diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
index a7583c178a..4d2033114e 100644
--- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
@@ -3206,6 +3206,13 @@ ixgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
+ /* Check that ring size is > 2 * rx_free_thresh */
+ if (nb_desc <= 2 * rx_conf->rx_free_thresh) {
+ PMD_INIT_LOG(ERR, "rx ring size (%u) must be > 2 * rx_free_thresh (%u)",
+ nb_desc, 2 * rx_conf->rx_free_thresh);
+ return -EINVAL;
+ }
+
/* Free memory prior to re-allocation if needed... */
if (dev->data->rx_queues[queue_idx] != NULL) {
ixgbe_rx_queue_release(dev->data->rx_queues[queue_idx]);
--
2.51.0
next reply other threads:[~2025-12-15 17:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-15 17:35 Bruce Richardson [this message]
2025-12-15 17:54 ` Morten Brørup
2025-12-15 17:58 ` Bruce Richardson
2025-12-15 18:20 ` Bruce Richardson
2025-12-15 18:53 ` Morten Brørup
2025-12-16 8:48 ` Bruce Richardson
2025-12-16 9:25 ` Morten Brørup
2025-12-16 9:52 ` Bruce Richardson
2025-12-16 10:48 ` Morten Brørup
2025-12-15 18:43 ` [PATCH v2] " Bruce Richardson
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=20251215173543.1707960-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=praveen.shetty@intel.com \
--cc=vladimir.medvedkin@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).