patch 'net/mlx5: fix LRO TCP checksum' has been queued to stable release 22.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=1a59660e4d610955a2c5ffe5e36da8a9e3417310

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 1a59660e4d610955a2c5ffe5e36da8a9e3417310 Mon Sep 17 00:00:00 2001
From: Heng Jiang <jiangheng14 at huawei.com>
Date: Tue, 18 Jul 2023 11:56:13 +0300
Subject: [PATCH] net/mlx5: fix LRO TCP checksum
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ]

The variable csum is the sum of three 16 bits integers, the max value
is 0x2FFFD. The corner case of sum of 3 is 0x1FFFF gives the wrong
result: 0x1 + 0xFFFF = 0x10000, the upper 16 bits are not 0.
It must be folded again to ensure that the upper 16 bits are 0.

Fixes: e4c2a16eb1de ("net/mlx5: handle LRO packets in Rx queue")

Signed-off-by: Heng Jiang <jiangheng14 at huawei.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 .mailmap                   | 1 +
 drivers/net/mlx5/mlx5_rx.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index f483c8cd69..6032ae9ea2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -483,6 +483,7 @@ Helin Zhang <helin.zhang at intel.com>
 Hemant Agrawal <hemant.agrawal at nxp.com> <hemant at freescale.com>
 Heng Ding <hengx.ding at intel.com>
 Hengjian Zhang <hengjianx.zhang at intel.com>
+Heng Jiang <jiangheng14 at huawei.com>
 Heng Wang <heng.wang at ericsson.com>
 Henning Schild <henning.schild at siemens.com>
 Henry Cai <caihe at huawei.com>
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index 99a08ef5f1..b41f7a51f5 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1045,6 +1045,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
 	tcp->cksum = 0;
 	csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4);
 	csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff);
+	csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff);
 	csum = (~csum) & 0xffff;
 	if (csum == 0)
 		csum = 0xffff;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:21.042069800 +0800
+++ 0113-net-mlx5-fix-LRO-TCP-checksum.patch	2023-08-09 21:51:18.284352000 +0800
@@ -1 +1 @@
-From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001
+From 1a59660e4d610955a2c5ffe5e36da8a9e3417310 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 9ce554451b..864d33ee46 100644
+index f483c8cd69..6032ae9ea2 100644
@@ -25 +27 @@
-@@ -496,6 +496,7 @@ Helin Zhang <helin.zhang at intel.com>
+@@ -483,6 +483,7 @@ Helin Zhang <helin.zhang at intel.com>
@@ -34 +36 @@
-index 71c4638251..392784050f 100644
+index 99a08ef5f1..b41f7a51f5 100644
@@ -37 +39 @@
-@@ -1090,6 +1090,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
+@@ -1045,6 +1045,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,