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

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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/25/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/2788848cca3e531f425e809ce9715cbe3d83f403

Thanks.

Kevin

---
From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001
From: Heng Jiang <jiangheng14@huawei.com>
Date: Tue, 18 Jul 2023 11:56:13 +0300
Subject: [PATCH] net/mlx5: fix LRO TCP checksum

[ 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@huawei.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 .mailmap                   | 1 +
 drivers/net/mlx5/mlx5_rx.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 495f89e75d..7de8dbf81d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -483,4 +483,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
 Heng Ding <hengx.ding@intel.com>
 Hengjian Zhang <hengjianx.zhang@intel.com>
+Heng Jiang <jiangheng14@huawei.com>
 Heng Wang <heng.wang@ericsson.com>
 Henning Schild <henning.schild@siemens.com>
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index d354862cff..ab88f2526f 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
 	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)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.228180227 +0100
+++ 0009-net-mlx5-fix-LRO-TCP-checksum.patch	2023-07-21 14:33:59.020253274 +0100
@@ -1 +1 @@
-From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001
+From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 9ce554451b..864d33ee46 100644
+index 495f89e75d..7de8dbf81d 100644
@@ -25 +26 @@
-@@ -497,4 +497,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
+@@ -483,4 +483,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
@@ -32 +33 @@
-index 71c4638251..392784050f 100644
+index d354862cff..ab88f2526f 100644
@@ -35 +36 @@
-@@ -1091,4 +1091,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
+@@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,