[dpdk-stable] patch 'app/testpmd: fix error detection in MTU command' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/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 2333f80c8f65ad5dd876f8b03228867f0e5122de Mon Sep 17 00:00:00 2001
From: Shy Shyman <shys at mellanox.com>
Date: Mon, 8 Jun 2020 17:17:47 +0300
Subject: [PATCH] app/testpmd: fix error detection in MTU command

[ upstream commit 3b931ddb5e1fe8b29caafbad53738005ee9fef0c ]

MTU is used in testpmd to set the maximum payload size for packets.
According to testpmd, the setting influence RX only.
In rte_ethdev there's no relation between MTU setting and JUMBO offload
or rx_max_pkt_len.

The previous fix in patch referenced below was meant to update the
correlated variables of max_pkt_len and JUMBO offload, but by doing so
it assumes that MTU setting can only exist when JUMBO offload supported
in the device. For example fail-safe device does supports set MTU and
doesn't support JUMBO offload, and in this case, though set MTU
succeeds, an error message is still printed since the JUMBO packet
offload is disabled.

The fix separates the two conditions to make sure the error
triggers only in case the set_mtu action actually failed.

Fixes: 150c9ac2df13 ("app/testpmd: update Rx offload after setting MTU")

Signed-off-by: Shy Shyman <shys at mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
---
 app/test-pmd/config.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index d5d246617..e345cea6d 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1262,8 +1262,9 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
 		return;
 	}
 	diag = rte_eth_dev_set_mtu(port_id, mtu);
-	if (diag == 0 &&
-	    dev_info.rx_offload_capa & DEV_RX_OFFLOAD_JUMBO_FRAME) {
+	if (diag)
+		printf("Set MTU failed. diag=%d\n", diag);
+	else if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_JUMBO_FRAME) {
 		/*
 		 * Ether overhead in driver is equal to the difference of
 		 * max_rx_pktlen and max_mtu in rte_eth_dev_info when the
@@ -1278,10 +1279,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
 		} else
 			rte_port->dev_conf.rxmode.offloads &=
 						~DEV_RX_OFFLOAD_JUMBO_FRAME;
-
-		return;
 	}
-	printf("Set MTU failed. diag=%d\n", diag);
 }
 
 /* Generic flow management functions. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:49.620698065 +0100
+++ 0026-app-testpmd-fix-error-detection-in-MTU-command.patch	2020-07-24 12:53:48.215005118 +0100
@@ -1,8 +1,10 @@
-From 3b931ddb5e1fe8b29caafbad53738005ee9fef0c Mon Sep 17 00:00:00 2001
+From 2333f80c8f65ad5dd876f8b03228867f0e5122de Mon Sep 17 00:00:00 2001
 From: Shy Shyman <shys at mellanox.com>
 Date: Mon, 8 Jun 2020 17:17:47 +0300
 Subject: [PATCH] app/testpmd: fix error detection in MTU command
 
+[ upstream commit 3b931ddb5e1fe8b29caafbad53738005ee9fef0c ]
+
 MTU is used in testpmd to set the maximum payload size for packets.
 According to testpmd, the setting influence RX only.
 In rte_ethdev there's no relation between MTU setting and JUMBO offload
@@ -20,7 +22,6 @@
 triggers only in case the set_mtu action actually failed.
 
 Fixes: 150c9ac2df13 ("app/testpmd: update Rx offload after setting MTU")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shy Shyman <shys at mellanox.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -30,10 +31,10 @@
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
-index 016bcb09c..a7112c998 100644
+index d5d246617..e345cea6d 100644
 --- a/app/test-pmd/config.c
 +++ b/app/test-pmd/config.c
-@@ -1281,8 +1281,9 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
+@@ -1262,8 +1262,9 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
  		return;
  	}
  	diag = rte_eth_dev_set_mtu(port_id, mtu);
@@ -45,7 +46,7 @@
  		/*
  		 * Ether overhead in driver is equal to the difference of
  		 * max_rx_pktlen and max_mtu in rte_eth_dev_info when the
-@@ -1297,10 +1298,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
+@@ -1278,10 +1279,7 @@ port_mtu_set(portid_t port_id, uint16_t mtu)
  		} else
  			rte_port->dev_conf.rxmode.offloads &=
  						~DEV_RX_OFFLOAD_JUMBO_FRAME;