From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id B6EAD27D for ; Fri, 8 Mar 2019 18:48:12 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:48:08 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloAQ002625; Fri, 8 Mar 2019 19:48:07 +0200 From: Yongseok Koh To: Zhirun Yan Cc: Haiyue Wang , Qi Zhang , dpdk stable Date: Fri, 8 Mar 2019 09:46:48 -0800 Message-Id: <20190308174749.30771-10-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/i40e: remove redundant reset of queue number' has been queued to LTS release 17.11.6 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: Fri, 08 Mar 2019 17:48:13 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From feac3e2b6779135da1b450fe269175628e6dbdf4 Mon Sep 17 00:00:00 2001 From: Zhirun Yan Date: Thu, 13 Dec 2018 12:49:28 +0000 Subject: [PATCH] net/i40e: remove redundant reset of queue number [ upstream commit ef8b7c505f10897621c0801d8ef3e961385246f8 ] Before this patch, there are two functions will call i40e_dev_free_queues to free queues. For rte_eth_dev_close(), its redundant because of duplication. For rte_eth_dev_reset() its redundant because of not necessary, since following dev_configure is required after dev_reset and it will be updated correctly. This patch removes redundant code in i40e_dev_free_queues(). Fixes: 6b4537128394 ("i40e: free queue memory when closing") Signed-off-by: Zhirun Yan Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index ce6a30507..1725be66e 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2638,7 +2638,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_rx_queue_release(dev->data->rx_queues[i]); dev->data->rx_queues[i] = NULL; } - dev->data->nb_rx_queues = 0; for (i = 0; i < dev->data->nb_tx_queues; i++) { if (!dev->data->tx_queues[i]) @@ -2646,7 +2645,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_tx_queue_release(dev->data->tx_queues[i]); dev->data->tx_queues[i] = NULL; } - dev->data->nb_tx_queues = 0; } #define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:40.890614393 -0800 +++ 0010-net-i40e-remove-redundant-reset-of-queue-number.patch 2019-03-08 09:46:39.997397000 -0800 @@ -1,8 +1,10 @@ -From ef8b7c505f10897621c0801d8ef3e961385246f8 Mon Sep 17 00:00:00 2001 +From feac3e2b6779135da1b450fe269175628e6dbdf4 Mon Sep 17 00:00:00 2001 From: Zhirun Yan Date: Thu, 13 Dec 2018 12:49:28 +0000 Subject: [PATCH] net/i40e: remove redundant reset of queue number +[ upstream commit ef8b7c505f10897621c0801d8ef3e961385246f8 ] + Before this patch, there are two functions will call i40e_dev_free_queues to free queues. For rte_eth_dev_close(), its redundant because of duplication. For rte_eth_dev_reset() its @@ -12,7 +14,6 @@ This patch removes redundant code in i40e_dev_free_queues(). Fixes: 6b4537128394 ("i40e: free queue memory when closing") -Cc: stable@dpdk.org Signed-off-by: Zhirun Yan Signed-off-by: Haiyue Wang @@ -22,10 +23,10 @@ 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c -index ab74a488f..82a170929 100644 +index ce6a30507..1725be66e 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c -@@ -2753,7 +2753,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) +@@ -2638,7 +2638,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_rx_queue_release(dev->data->rx_queues[i]); dev->data->rx_queues[i] = NULL; } @@ -33,7 +34,7 @@ for (i = 0; i < dev->data->nb_tx_queues; i++) { if (!dev->data->tx_queues[i]) -@@ -2761,7 +2760,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) +@@ -2646,7 +2645,6 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) i40e_dev_tx_queue_release(dev->data->tx_queues[i]); dev->data->tx_queues[i] = NULL; }