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 960012B91 for ; Fri, 8 Mar 2019 18:47:57 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:47:54 +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 x28HloAI002625; Fri, 8 Mar 2019 19:47:52 +0200 From: Yongseok Koh To: Qiming Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 8 Mar 2019 09:46:40 -0800 Message-Id: <20190308174749.30771-2-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: fix getting RSS configuration' 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:47:57 -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 c8be9e55ec9b9d37d418ecc6abd8037a8b84fd0d Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Fri, 30 Nov 2018 17:05:58 +0800 Subject: [PATCH] net/i40e: fix getting RSS configuration [ upstream commit e5584414817f3fb79655d38c728b675e4fcc1db4 ] RSS hash configure get API (i40e_dev_rss_hash_conf_get()) didn't check the return value of i40e_get_rss_key(). i40e_dev_rss_hash_conf_get() will return success even getting RSS hash key failed. This patch fixes the issue. Fixes: d0a349409bd7 ("i40e: support AQ based RSS config") Signed-off-by: Qiming Yang Reviewed-by: Ferruh Yigit --- drivers/net/i40e/i40e_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 500673a92..4a80405a6 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -7089,9 +7089,12 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint64_t hena; + int ret; - i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key, + ret = i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key, &rss_conf->rss_key_len); + if (ret) + return ret; hena = (uint64_t)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)); hena |= ((uint64_t)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1))) << 32; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:40.501856871 -0800 +++ 0002-net-i40e-fix-getting-RSS-configuration.patch 2019-03-08 09:46:39.919395000 -0800 @@ -1,15 +1,16 @@ -From e5584414817f3fb79655d38c728b675e4fcc1db4 Mon Sep 17 00:00:00 2001 +From c8be9e55ec9b9d37d418ecc6abd8037a8b84fd0d Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Fri, 30 Nov 2018 17:05:58 +0800 Subject: [PATCH] net/i40e: fix getting RSS configuration +[ upstream commit e5584414817f3fb79655d38c728b675e4fcc1db4 ] + RSS hash configure get API (i40e_dev_rss_hash_conf_get()) didn't check the return value of i40e_get_rss_key(). i40e_dev_rss_hash_conf_get() will return success even getting RSS hash key failed. This patch fixes the issue. Fixes: d0a349409bd7 ("i40e: support AQ based RSS config") -Cc: stable@dpdk.org Signed-off-by: Qiming Yang Reviewed-by: Ferruh Yigit @@ -18,10 +19,10 @@ 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c -index 7030eb1fa..552a7a566 100644 +index 500673a92..4a80405a6 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c -@@ -7459,9 +7459,12 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -7089,9 +7089,12 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint64_t hena;