[dpdk-stable] patch 'app/testpmd: fix DCB forwarding configuration' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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/19/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/4491ec1fef2491d69f0f83a7b981a41ee322c950

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 4491ec1fef2491d69f0f83a7b981a41ee322c950 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Wed, 28 Apr 2021 14:40:41 +0800
Subject: [PATCH] app/testpmd: fix DCB forwarding configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit a690a070a4f7bc25000a6ba6c71023c29c9d26d4 ]

After DCB mode is configured, the operations of port stop and port start
change the value of the global variable "dcb_test", As a result, the
forwarding configuration from DCB to RSS mode, namely,
“dcb_fwd_config_setup()” to "rss_fwd_config_setup()".

Currently, the 'dcb_flag' field in struct 'rte_port' indicates whether
the port is configured with DCB. And it is sufficient to have
'dcb_config' as a global variable to control the DCB test status. So
this patch deletes the "dcb_test".

In addition, setting 'dcb_config' at the end of init_port_dcb_config()
in case that ports fail to enter DCB mode.

Fixes: 900550de04a7 ("app/testpmd: add dcb support")
Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
Fixes: 7741e4cf16c0 ("app/testpmd: VMDq and DCB updates")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Lijun Ou <oulijun at huawei.com>
Acked-by: Xiaoyun Li <xiaoyun.li at intel.com>
---
 app/test-pmd/testpmd.c | 18 ++++--------------
 app/test-pmd/testpmd.h |  1 -
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0c3361e817..9485953aba 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -228,9 +228,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
 uint8_t dcb_config = 0;
 
-/* Whether the dcb is in testing status */
-uint8_t dcb_test = 0;
-
 /*
  * Configurable number of RX/TX queues.
  */
@@ -2105,8 +2102,7 @@ start_packet_forwarding(int with_tx_first)
 		return;
 	}
 
-
-	if(dcb_test) {
+	if (dcb_config) {
 		for (i = 0; i < nb_fwd_ports; i++) {
 			pt_id = fwd_ports_ids[i];
 			port = &ports[pt_id];
@@ -2327,8 +2323,6 @@ start_port(portid_t pid)
 	if (port_id_is_invalid(pid, ENABLED_WARN))
 		return 0;
 
-	if(dcb_config)
-		dcb_test = 1;
 	RTE_ETH_FOREACH_DEV(pi) {
 		if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
 			continue;
@@ -2513,11 +2507,6 @@ stop_port(portid_t pid)
 	struct rte_port *port;
 	int need_check_link_status = 0;
 
-	if (dcb_test) {
-		dcb_test = 0;
-		dcb_config = 0;
-	}
-
 	if (port_id_is_invalid(pid, ENABLED_WARN))
 		return;
 
@@ -3499,8 +3488,6 @@ init_port_dcb_config(portid_t pid,
 	rte_port = &ports[pid];
 
 	memset(&port_conf, 0, sizeof(struct rte_eth_conf));
-	/* Enter DCB configuration status */
-	dcb_config = 1;
 
 	port_conf.rxmode = rte_port->dev_conf.rxmode;
 	port_conf.txmode = rte_port->dev_conf.txmode;
@@ -3570,6 +3557,9 @@ init_port_dcb_config(portid_t pid,
 
 	rte_port->dcb_flag = 1;
 
+	/* Enter DCB configuration status */
+	dcb_config = 1;
+
 	return 0;
 }
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index a955e731e5..bbe18a7191 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -404,7 +404,6 @@ extern uint64_t noisy_lkup_num_reads;
 extern uint64_t noisy_lkup_num_reads_writes;
 
 extern uint8_t dcb_config;
-extern uint8_t dcb_test;
 
 extern uint16_t mbuf_data_size; /**< Mbuf data space size. */
 extern uint32_t param_total_num_mbufs;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:36.432167326 +0200
+++ 0180-app-testpmd-fix-DCB-forwarding-configuration.patch	2021-05-17 17:40:29.515812186 +0200
@@ -1 +1 @@
-From a690a070a4f7bc25000a6ba6c71023c29c9d26d4 Mon Sep 17 00:00:00 2001
+From 4491ec1fef2491d69f0f83a7b981a41ee322c950 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit a690a070a4f7bc25000a6ba6c71023c29c9d26d4 ]
+
@@ -25 +26,0 @@
-Cc: stable at dpdk.org
@@ -36 +37 @@
-index d4be23f8f8..a076b1dcde 100644
+index 0c3361e817..9485953aba 100644
@@ -39 +40 @@
-@@ -246,9 +246,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
+@@ -228,9 +228,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
@@ -49 +50 @@
-@@ -2167,8 +2164,7 @@ start_packet_forwarding(int with_tx_first)
+@@ -2105,8 +2102,7 @@ start_packet_forwarding(int with_tx_first)
@@ -59 +60 @@
-@@ -2476,8 +2472,6 @@ start_port(portid_t pid)
+@@ -2327,8 +2323,6 @@ start_port(portid_t pid)
@@ -68,3 +69,3 @@
-@@ -2717,11 +2711,6 @@ stop_port(portid_t pid)
- 	portid_t peer_pl[RTE_MAX_ETHPORTS];
- 	int peer_pi;
+@@ -2513,11 +2507,6 @@ stop_port(portid_t pid)
+ 	struct rte_port *port;
+ 	int need_check_link_status = 0;
@@ -80 +81 @@
-@@ -3625,8 +3614,6 @@ init_port_dcb_config(portid_t pid,
+@@ -3499,8 +3488,6 @@ init_port_dcb_config(portid_t pid,
@@ -89 +90 @@
-@@ -3694,6 +3681,9 @@ init_port_dcb_config(portid_t pid,
+@@ -3570,6 +3557,9 @@ init_port_dcb_config(portid_t pid,
@@ -100 +101 @@
-index 6ca872db82..283b5e3680 100644
+index a955e731e5..bbe18a7191 100644
@@ -103 +104 @@
-@@ -425,7 +425,6 @@ extern uint64_t noisy_lkup_num_reads;
+@@ -404,7 +404,6 @@ extern uint64_t noisy_lkup_num_reads;
@@ -109,2 +110,2 @@
- extern uint32_t mbuf_data_size_n;
- extern uint16_t mbuf_data_size[MAX_SEGS_BUFFER_SPLIT];
+ extern uint16_t mbuf_data_size; /**< Mbuf data space size. */
+ extern uint32_t param_total_num_mbufs;