patch 'app/testpmd: fix DCB in VT configuration' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/5d3a7aab1960e4216e97dca86a24cebcd22685f7

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 5d3a7aab1960e4216e97dca86a24cebcd22685f7 Mon Sep 17 00:00:00 2001
From: Jie Wang <jie1x.wang at intel.com>
Date: Mon, 15 Nov 2021 11:29:58 +0800
Subject: [PATCH] app/testpmd: fix DCB in VT configuration
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit cbe70fded831acac4ccbde8e11ba33ce8c24227c ]

When set port DCB in VT mode enabled, it should remove RSS HASH
offload before reconfiguring the device and queues.

Because port multi-queue mode is changed from RSS to DCB in VT.

Fixes: 2a977b891f99 ("app/testpmd: fix DCB configuration")

Signed-off-by: Jie Wang <jie1x.wang at intel.com>
Acked-by: Aman Singh <aman.deep.singh at intel.com>
---
 app/test-pmd/testpmd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 35a48e39cc..5af7dea3fe 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3582,6 +3582,13 @@ init_port_dcb_config(portid_t pid,
 	if (retval < 0)
 		return retval;
 	port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
+	/* remove RSS HASH offload for DCB in vt mode */
+	if (port_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
+		port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_RSS_HASH;
+		for (i = 0; i < nb_rxq; i++)
+			rte_port->rx_conf[i].offloads &=
+				~DEV_RX_OFFLOAD_RSS_HASH;
+	}
 
 	/* re-configure the device . */
 	retval = rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:04.297779601 +0800
+++ 0015-app-testpmd-fix-DCB-in-VT-configuration.patch	2021-11-28 22:41:03.223542730 +0800
@@ -1 +1 @@
-From cbe70fded831acac4ccbde8e11ba33ce8c24227c Mon Sep 17 00:00:00 2001
+From 5d3a7aab1960e4216e97dca86a24cebcd22685f7 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit cbe70fded831acac4ccbde8e11ba33ce8c24227c ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index a66dfb297c..c18942279a 100644
+index 35a48e39cc..5af7dea3fe 100644
@@ -24 +26 @@
-@@ -3948,6 +3948,13 @@ init_port_dcb_config(portid_t pid,
+@@ -3582,6 +3582,13 @@ init_port_dcb_config(portid_t pid,
@@ -27 +29 @@
- 	port_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_VLAN_FILTER;
+ 	port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
@@ -29,2 +31,2 @@
-+	if (port_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_VMDQ_DCB) {
-+		port_conf.rxmode.offloads &= ~RTE_ETH_RX_OFFLOAD_RSS_HASH;
++	if (port_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
++		port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_RSS_HASH;
@@ -33 +35 @@
-+				~RTE_ETH_RX_OFFLOAD_RSS_HASH;
++				~DEV_RX_OFFLOAD_RSS_HASH;