patch 'app/testpmd: fix tunnel TSO configuration' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 11/21/23. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/37d5553ccc6c561d6706c3ea76bf03275b82ba2f

Thanks.

Kevin

---
>From 37d5553ccc6c561d6706c3ea76bf03275b82ba2f Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Sat, 11 Nov 2023 12:59:43 +0800
Subject: [PATCH] app/testpmd: fix tunnel TSO configuration

[ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ]

Currently, there are two conditions to set tunnel TSO, like "parse
tunnel" and "outer IP checksum".
If these conditions are not satisfied, testpmd should not change their
configuration, like tx_offloads on port and per queue, and no need to
request "reconfig device".

Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 app/test-pmd/cmdline.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index ac6531ba52..43857c8008 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -5120,10 +5120,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 			return;
 		}
-		check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa);
-
-		ports[res->port_id].dev_conf.txmode.offloads |=
-			(all_tunnel_tso & dev_info.tx_offload_capa);
-		printf("TSO segment size for tunneled packets is %d\n",
-			ports[res->port_id].tunnel_tso_segsz);
 
 		/* Below conditions are needed to make it work:
@@ -5138,12 +5132,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 		 * checksum in IP header anymore.
 		 */
-
-		if (!ports[res->port_id].parse_tunnel)
+		if (!ports[res->port_id].parse_tunnel) {
 			fprintf(stderr,
-				"Warning: csum parse_tunnel must be set so that tunneled packets are recognized\n");
+				"Error: csum parse_tunnel must be set so that tunneled packets are recognized\n");
+			return;
+		}
 		if (!(ports[res->port_id].dev_conf.txmode.offloads &
-		      RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM))
+		      RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) {
 			fprintf(stderr,
-				"Warning: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n");
+				"Error: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n");
+			return;
+		}
+
+		check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa);
+		ports[res->port_id].dev_conf.txmode.offloads |=
+				(all_tunnel_tso & dev_info.tx_offload_capa);
+		printf("TSO segment size for tunneled packets is %d\n",
+			ports[res->port_id].tunnel_tso_segsz);
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-16 13:21:53.929678372 +0000
+++ 0058-app-testpmd-fix-tunnel-TSO-configuration.patch	2023-11-16 13:21:52.570946725 +0000
@@ -1 +1 @@
-From e43dc93803c4623840472c6109ef05e26286ec2f Mon Sep 17 00:00:00 2001
+From 37d5553ccc6c561d6706c3ea76bf03275b82ba2f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 2e3365557a..a231d112b0 100644
+index ac6531ba52..43857c8008 100644
@@ -25 +26 @@
-@@ -5097,10 +5097,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
+@@ -5120,10 +5120,4 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
@@ -36 +37 @@
-@@ -5115,12 +5109,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
+@@ -5138,12 +5132,21 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,