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 045461B455 for ; Thu, 31 Jan 2019 16:49:20 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83EA63C2CDA; Thu, 31 Jan 2019 15:49:19 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 378245C23E; Thu, 31 Jan 2019 15:49:17 +0000 (UTC) From: Kevin Traynor To: Qiming Yang Cc: Qi Zhang , dpdk stable Date: Thu, 31 Jan 2019 15:48:09 +0000 Message-Id: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 31 Jan 2019 15:49:19 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix get RSS conf' has been queued to LTS release 18.11.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: Thu, 31 Jan 2019 15:49:21 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.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 02/07/19. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From f21e93ea57ffb277b2da7206bc4ab522a4fab4be Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Mon, 24 Dec 2018 23:34:02 +0800 Subject: [PATCH] net/i40e: fix get RSS conf [ upstream commit 286a809c99c033f895c6b08c2af4b741f17ae29b ] rte_eth_dev_rss_hash_conf_get API doesn't force 'rss_conf.rss_key' to be not NULL, so rss_key = NULL should be alllowed in i40e driver. Fixes: 16321de09396 ("ethdev: allow to get RSS hash functions and key") Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- 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 8dc1a4af8..a6b97e164 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -7408,5 +7408,5 @@ i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len) if (!key || !key_len) - return -EINVAL; + return 0; if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) { @@ -7493,4 +7493,7 @@ i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev, int ret; + if (!rss_conf) + return -EINVAL; + ret = i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key, &rss_conf->rss_key_len); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-31 15:44:05.768062227 +0000 +++ 0001-net-i40e-fix-get-RSS-conf.patch 2019-01-31 15:44:05.000000000 +0000 @@ -1,14 +1,15 @@ -From 286a809c99c033f895c6b08c2af4b741f17ae29b Mon Sep 17 00:00:00 2001 +From f21e93ea57ffb277b2da7206bc4ab522a4fab4be Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Mon, 24 Dec 2018 23:34:02 +0800 Subject: [PATCH] net/i40e: fix get RSS conf +[ upstream commit 286a809c99c033f895c6b08c2af4b741f17ae29b ] + rte_eth_dev_rss_hash_conf_get API doesn't force 'rss_conf.rss_key' to be not NULL, so rss_key = NULL should be alllowed in i40e driver. Fixes: 16321de09396 ("ethdev: allow to get RSS hash functions and key") -Cc: stable@dpdk.org Signed-off-by: Qiming Yang Acked-by: Qi Zhang