[dpdk-stable] patch 'app/testpmd: fix Tx checksum when TSO enabled' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. 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 7daf128b8294ddd1599ab34a105ada53b0305284 Mon Sep 17 00:00:00 2001
From: Peng Huang <peng.huang at intel.com>
Date: Thu, 24 Oct 2019 09:37:34 +0000
Subject: [PATCH] app/testpmd: fix Tx checksum when TSO enabled

[ upstream commit 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 ]

This patch fixed the TX checksum value problem when enabled TSO in
tunnel packets, because outer UDP checksum calculation depend on
the TSO configuration.

Fixes: 0f62d63593ed ("app/testpmd: support tunneled TSO in checksum engine")

Signed-off-by: Peng Huang <peng.huang at intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/csumonly.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index ae59e76c31..70f3b392cf 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -432,6 +432,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
 
 	udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len);
 
+	if (tso_enabled)
+		ol_flags |= PKT_TX_TCP_SEG;
+
 	/* outer UDP checksum is done in software as we have no hardware
 	 * supporting it today, and no API for it. In the other side, for
 	 * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:29.855222072 +0000
+++ 0088-app-testpmd-fix-Tx-checksum-when-TSO-enabled.patch	2019-12-19 14:32:26.209299888 +0000
@@ -1,14 +1,15 @@
-From 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 Mon Sep 17 00:00:00 2001
+From 7daf128b8294ddd1599ab34a105ada53b0305284 Mon Sep 17 00:00:00 2001
 From: Peng Huang <peng.huang at intel.com>
 Date: Thu, 24 Oct 2019 09:37:34 +0000
 Subject: [PATCH] app/testpmd: fix Tx checksum when TSO enabled
 
+[ upstream commit 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 ]
+
 This patch fixed the TX checksum value problem when enabled TSO in
 tunnel packets, because outer UDP checksum calculation depend on
 the TSO configuration.
 
 Fixes: 0f62d63593ed ("app/testpmd: support tunneled TSO in checksum engine")
-Cc: stable at dpdk.org
 
 Signed-off-by: Peng Huang <peng.huang at intel.com>
 Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
@@ -17,19 +18,19 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
-index e12695d947..5738128e69 100644
+index ae59e76c31..70f3b392cf 100644
 --- a/app/test-pmd/csumonly.c
 +++ b/app/test-pmd/csumonly.c
-@@ -544,6 +544,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
- 	udp_hdr = (struct rte_udp_hdr *)
- 		((char *)outer_l3_hdr + info->outer_l3_len);
+@@ -432,6 +432,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
+ 
+ 	udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len);
  
 +	if (tso_enabled)
 +		ol_flags |= PKT_TX_TCP_SEG;
 +
- 	/* Skip SW outer UDP checksum generation if HW supports it */
- 	if (tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) {
- 		if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4))
+ 	/* outer UDP checksum is done in software as we have no hardware
+ 	 * supporting it today, and no API for it. In the other side, for
+ 	 * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be
 -- 
 2.20.1