[dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 b0be1fb74d1114f9debcd1c1796faba238c45e96 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang at huawei.com>
Date: Fri, 25 Sep 2020 20:47:15 +0800
Subject: [PATCH] app/testpmd: fix VLAN configuration on failure

[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]

When failing to configure VLAN offloads after the port was started, there
is no need to update the port configuration. Currently, when user
configure an unsupported VLAN offloads and fails, and then restart the
port, it will fails since the configuration has been refreshed.

This patch makes the function return directly instead of refreshing the
configuration when execution fails.

Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration")

Signed-off-by: Chengchang Tang <tangchengchang at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/config.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 01c984d025..139475bd6d 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3080,9 +3080,11 @@ vlan_extend_set(portid_t port_id, int on)
 	}
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_extend_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
@@ -3107,9 +3109,11 @@ rx_vlan_strip_set(portid_t port_id, int on)
 	}
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_strip_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
@@ -3148,9 +3152,11 @@ rx_vlan_filter_set(portid_t port_id, int on)
 	}
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("rx_vlan_filter_set(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
@@ -3175,9 +3181,11 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on)
 	}
 
 	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
-	if (diag < 0)
+	if (diag < 0) {
 		printf("%s(port_pi=%d, on=%d) failed "
 	       "diag=%d\n", __func__, port_id, on, diag);
+		return;
+	}
 	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:14.454441032 +0000
+++ 0086-app-testpmd-fix-VLAN-configuration-on-failure.patch	2020-10-28 10:35:11.624831790 +0000
@@ -1,8 +1,10 @@
-From 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 Mon Sep 17 00:00:00 2001
+From b0be1fb74d1114f9debcd1c1796faba238c45e96 Mon Sep 17 00:00:00 2001
 From: Chengchang Tang <tangchengchang at huawei.com>
 Date: Fri, 25 Sep 2020 20:47:15 +0800
 Subject: [PATCH] app/testpmd: fix VLAN configuration on failure
 
+[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ]
+
 When failing to configure VLAN offloads after the port was started, there
 is no need to update the port configuration. Currently, when user
 configure an unsupported VLAN offloads and fails, and then restart the
@@ -12,7 +14,6 @@
 configuration when execution fails.
 
 Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chengchang Tang <tangchengchang at huawei.com>
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -22,10 +23,10 @@
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
-index 03bf26bc94..0bec547f51 100644
+index 01c984d025..139475bd6d 100644
 --- a/app/test-pmd/config.c
 +++ b/app/test-pmd/config.c
-@@ -3509,9 +3509,11 @@ vlan_extend_set(portid_t port_id, int on)
+@@ -3080,9 +3080,11 @@ vlan_extend_set(portid_t port_id, int on)
  	}
  
  	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
@@ -38,7 +39,7 @@
  	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
  }
  
-@@ -3536,9 +3538,11 @@ rx_vlan_strip_set(portid_t port_id, int on)
+@@ -3107,9 +3109,11 @@ rx_vlan_strip_set(portid_t port_id, int on)
  	}
  
  	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
@@ -51,7 +52,7 @@
  	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
  }
  
-@@ -3577,9 +3581,11 @@ rx_vlan_filter_set(portid_t port_id, int on)
+@@ -3148,9 +3152,11 @@ rx_vlan_filter_set(portid_t port_id, int on)
  	}
  
  	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);
@@ -64,7 +65,7 @@
  	ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads;
  }
  
-@@ -3604,9 +3610,11 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on)
+@@ -3175,9 +3181,11 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on)
  	}
  
  	diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);