From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 9CBBE5F16 for ; Mon, 30 Jul 2018 18:22:18 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAs3-00009D-1p; Mon, 30 Jul 2018 16:18:07 +0000 From: Christian Ehrhardt To: Shaopeng He Cc: Qi Zhang , dpdk stable Date: Mon, 30 Jul 2018 18:13:03 +0200 Message-Id: <20180730161342.16566-138-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com> References: <20180730161342.16566-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] patch 'net/i40e: fix Tx queue setup after stop' has been queued to stable release 18.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 16:22:18 -0000 Hi, FYI, your patch has been queued to stable release 18.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/01/18. So please shout if anyone has objections. Thanks. Christian Ehrhardt --- >>From 6c0d25f11345d29ea1831c2c3db342672fde9107 Mon Sep 17 00:00:00 2001 From: Shaopeng He Date: Tue, 10 Jul 2018 06:37:27 -0400 Subject: [PATCH] net/i40e: fix Tx queue setup after stop [ upstream commit e062bdc6cbaef636b68e1cdd2a0aa14eebbdc1c6 ] Currently, i40e_dev_tx_queue_setup_runtime checks simple tx and treats mbuf fast free offloading as No-simple, which is classified as simple tx in i40e_set_tx_function_flag. This inconsistent behavior causes tx queue setup fail after queue was stopped. This patch fixes this bug. Fixes: 399421100e08 ("net/i40e: fix missing mbuf fast free offload") Signed-off-by: Shaopeng He Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 6032d5541..2bbb82fc3 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2087,7 +2087,7 @@ i40e_dev_tx_queue_setup_runtime(struct rte_eth_dev *dev, } /* check simple tx conflict */ if (ad->tx_simple_allowed) { - if (txq->offloads != 0 || + if ((txq->offloads & ~DEV_TX_OFFLOAD_MBUF_FAST_FREE) != 0 || txq->tx_rs_thresh < RTE_PMD_I40E_TX_MAX_BURST) { PMD_DRV_LOG(ERR, "No-simple tx is required."); return -EINVAL; -- 2.17.1