From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3FA8A1B94D for ; Fri, 14 Dec 2018 18:52:44 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1C8E7FDED; Fri, 14 Dec 2018 17:52:43 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7415660F80; Fri, 14 Dec 2018 17:52:42 +0000 (UTC) From: Kevin Traynor To: Qiming Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 14 Dec 2018 17:51:50 +0000 Message-Id: <20181214175203.24908-6-ktraynor@redhat.com> In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com> References: <20181214175203.24908-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 14 Dec 2018 17:52:43 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix getting RSS configuration' has been queued to stable release 18.08.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: Fri, 14 Dec 2018 17:52:44 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 12/18/18. So please shout if anyone has objections. 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. Kevin Traynor --- >>From 4c38932136f7eafedfb201e9c9d2e91144cacf09 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 a26c72829..c4097394c 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -7328,7 +7328,10 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, 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)); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 17:49:47.862046715 +0000 +++ 0006-net-i40e-fix-getting-RSS-configuration.patch 2018-12-14 17:49:47.000000000 +0000 @@ -1,15 +1,16 @@ -From e5584414817f3fb79655d38c728b675e4fcc1db4 Mon Sep 17 00:00:00 2001 +From 4c38932136f7eafedfb201e9c9d2e91144cacf09 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 a26c72829..c4097394c 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c -@@ -7460,7 +7460,10 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -7328,7 +7328,10 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint64_t hena; + int ret;