[dpdk-stable] patch 'net: fix checksum on big endian CPUs' has been queued to LTS release 18.11.10

Kevin Traynor ktraynor at redhat.com
Thu Aug 20 17:33:25 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.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 08/25/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4

Thanks.

Kevin.

---
>From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001
From: Hongzhi Guo <guohongzhi1 at huawei.com>
Date: Fri, 10 Jul 2020 19:43:13 +0800
Subject: [PATCH] net: fix checksum on big endian CPUs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ]

With current code, the checksum of odd-length buffers is wrong on
big endian CPUs: the last byte is not properly summed to the
accumulator.

Fix this by left-shifting the remaining byte by 8. For instance,
if the last byte is 0x42, we should add 0x4200 to the accumulator
on big endian CPUs.

This change is similar to what is suggested in Errata 3133 of
RFC 1071.

Fixes: 6006818cfb26("net: new checksum functions")

Signed-off-by: Hongzhi Guo <guohongzhi1 at huawei.com>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_net/rte_ip.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 728a045b9d..a589a702af 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
 
 	/* if length is in odd bytes */
-	if (len == 1)
-		sum += *((const uint8_t *)u16_buf);
+	if (len == 1) {
+		uint16_t left = 0;
+		*(uint8_t *)&left = *(const uint8_t *)u16_buf;
+		sum += left;
+	}
 
 	return sum;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.588499082 +0100
+++ 0020-net-fix-checksum-on-big-endian-CPUs.patch	2020-08-20 16:26:15.805324152 +0100
@@ -1 +1 @@
-From 982bb68cab2b93724f9625d53c309e73fa194e6e Mon Sep 17 00:00:00 2001
+From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -31 +32 @@
-index a9ffc33571..fcd1eb342d 100644
+index 728a045b9d..a589a702af 100644
@@ -34 +35 @@
-@@ -140,6 +140,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
+@@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)



More information about the stable mailing list