DPDK patches and discussions
 help / color / mirror / Atom feed
From: Qi Zhang <qi.z.zhang@intel.com>
To: beilei.xing@intel.com, wenzhuo.lu@intel.com,
	qiming.yang@intel.com, konstantin.ananyev@intel.com
Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, stable@dpdk.org
Subject: [dpdk-dev] [PATCH 2/3] net/ice: fix invalid Tx threshold setup
Date: Sat,  4 May 2019 17:29:38 +0800	[thread overview]
Message-ID: <20190504092939.25326-3-qi.z.zhang@intel.com> (raw)
Message-ID: <20190504092938.J9ZankpFv-qjMovnrtZwZ1ExOc4ZDVOKECl_0Jb5JqA@z> (raw)
In-Reply-To: <20190504092939.25326-1-qi.z.zhang@intel.com>

Tx desc's DD status is not cleaned by NIC automatically after packets
have been transmitted until software refill a new packet during next
loop. So when tx_free_thresh + tx_rs_thresh > nb_desc, it is possible
that an outdated DD status be checked as tx_next_dd, then segment fault
happen due to free a NULL mbuf pointer.

Then patch fixes this issue by
1. try to adapt tx_rs_thresh to an aggresive tx_free_thresh.
2. queue setup fail when tx_free_thresh + tx_rs_thresh > nb_desc

Fixes: 50370662b727 ("net/ice: support device and queue ops")
Cc: stable@dpdk.org

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index ace766b1d..620a5ea2b 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -764,17 +764,32 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
 	 *  - tx_rs_thresh must be a divisor of the ring size.
 	 *  - tx_free_thresh must be greater than 0.
 	 *  - tx_free_thresh must be less than the size of the ring minus 3.
+	 *  - tx_free_thresh + tx_rs_thresh must not exceed nb_desc.
 	 *
 	 * One descriptor in the TX ring is used as a sentinel to avoid a H/W
 	 * race condition, hence the maximum threshold constraints. When set
 	 * to zero use default values.
 	 */
-	tx_rs_thresh = (uint16_t)(tx_conf->tx_rs_thresh ?
-				  tx_conf->tx_rs_thresh :
-				  ICE_DEFAULT_TX_RSBIT_THRESH);
 	tx_free_thresh = (uint16_t)(tx_conf->tx_free_thresh ?
 				    tx_conf->tx_free_thresh :
 				    ICE_DEFAULT_TX_FREE_THRESH);
+	/* force tx_rs_thresh to adapt an aggresive tx_free_thresh */
+	tx_rs_thresh =
+		(ICE_DEFAULT_TX_RSBIT_THRESH + tx_free_thresh > nb_desc) ?
+			nb_desc - tx_free_thresh : ICE_DEFAULT_TX_RSBIT_THRESH;
+	if (tx_conf->tx_rs_thresh)
+		tx_rs_thresh = tx_conf->tx_rs_thresh;
+	if (tx_rs_thresh + tx_free_thresh > nb_desc) {
+		PMD_INIT_LOG(ERR, "tx_rs_thresh + tx_free_thresh must not "
+				"exceed nb_desc. (tx_rs_thresh=%u "
+				"tx_free_thresh=%u nb_desc=%u port = %d queue=%d)",
+				(unsigned int)tx_rs_thresh,
+				(unsigned int)tx_free_thresh,
+				(unsigned int)nb_desc,
+				(int)dev->data->port_id,
+				(int)queue_idx);
+		return -EINVAL;
+	}
 	if (tx_rs_thresh >= (nb_desc - 2)) {
 		PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than the "
 			     "number of TX descriptors minus 2. "
-- 
2.13.6


  parent reply	other threads:[~2019-05-04  9:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-04  9:29 [dpdk-dev] [PATCH 0/3] fix invalid Tx threshhold setup Qi Zhang
2019-05-04  9:29 ` Qi Zhang
2019-05-04  9:29 ` [dpdk-dev] [PATCH 1/3] net/i40e: fix invalid Tx threshold setup Qi Zhang
2019-05-04  9:29   ` Qi Zhang
2019-05-04  9:29 ` Qi Zhang [this message]
2019-05-04  9:29   ` [dpdk-dev] [PATCH 2/3] net/ice: " Qi Zhang
2019-05-04  9:29 ` [dpdk-dev] [PATCH 3/3] net/ixgbe: " Qi Zhang
2019-05-04  9:29   ` Qi Zhang
2019-05-15  6:36 ` [dpdk-dev] [PATCH 0/3] fix invalid Tx threshhold setup Xing, Beilei
2019-05-15  6:36   ` Xing, Beilei
2019-05-15  7:09   ` Zhang, Qi Z
2019-05-15  7:09     ` Zhang, Qi Z

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=20190504092939.25326-3-qi.z.zhang@intel.com \
    --to=qi.z.zhang@intel.com \
    --cc=beilei.xing@intel.com \
    --cc=dev@dpdk.org \
    --cc=konstantin.ananyev@intel.com \
    --cc=qiming.yang@intel.com \
    --cc=stable@dpdk.org \
    --cc=wenzhuo.lu@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).