[dpdk-stable] patch 'app/testpmd: fix DCB set' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/20. 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.

Luca Boccassi

---
>From 7c36f2ea8b0efec5a75a367cf739cc023af0609c Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu at intel.com>
Date: Tue, 12 May 2020 10:13:56 +0000
Subject: [PATCH] app/testpmd: fix DCB set

[ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ]

When set DCB in testpmd, there is a segmentation fault. It is
because the local variable rss_conf in get_eth_dcb_conf()
is not cleared, so that the pointer member variable rss_key has
a random address, which leads to an error in the following
processing. This patch initialized the local variable rss_conf
to avoid this situation.

Fixes: ac7c491c3fec ("app/testpmd: fix DCB config")

Signed-off-by: Ting Xu <ting.xu at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/testpmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 46d0f1c875..0b126594b7 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3193,6 +3193,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,
 		struct rte_eth_dcb_tx_conf *tx_conf =
 				&eth_conf->tx_adv_conf.dcb_tx_conf;
 
+		memset(&rss_conf, 0, sizeof(struct rte_eth_rss_conf));
+
 		rc = rte_eth_dev_rss_hash_conf_get(pid, &rss_conf);
 		if (rc != 0)
 			return rc;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:40.298575521 +0100
+++ 0028-app-testpmd-fix-DCB-set.patch	2020-05-22 10:37:39.148413072 +0100
@@ -1,8 +1,10 @@
-From 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 Mon Sep 17 00:00:00 2001
+From 7c36f2ea8b0efec5a75a367cf739cc023af0609c Mon Sep 17 00:00:00 2001
 From: Ting Xu <ting.xu at intel.com>
 Date: Tue, 12 May 2020 10:13:56 +0000
 Subject: [PATCH] app/testpmd: fix DCB set
 
+[ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ]
+
 When set DCB in testpmd, there is a segmentation fault. It is
 because the local variable rss_conf in get_eth_dcb_conf()
 is not cleared, so that the pointer member variable rss_key has
@@ -11,7 +13,6 @@
 to avoid this situation.
 
 Fixes: ac7c491c3fec ("app/testpmd: fix DCB config")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ting Xu <ting.xu at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
-index baccc3a495..4989d22ca8 100644
+index 46d0f1c875..0b126594b7 100644
 --- a/app/test-pmd/testpmd.c
 +++ b/app/test-pmd/testpmd.c
-@@ -3460,6 +3460,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,
+@@ -3193,6 +3193,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,
  		struct rte_eth_dcb_tx_conf *tx_conf =
  				&eth_conf->tx_adv_conf.dcb_tx_conf;