patch 'hash: fix reading unaligned bits in Toeplitz hash' has been queued to stable release 21.11.5

[Kevin Traynor]

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/086b98481996e9bced4c406b5901d1dadc69176a

Thanks.

Kevin

---
>From 086b98481996e9bced4c406b5901d1dadc69176a Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
Date: Fri, 30 Jun 2023 17:09:26 +0000
Subject: [PATCH] hash: fix reading unaligned bits in Toeplitz hash

[ upstream commit 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 ]

Fixes: 28ebff11c2dc ("hash: add predictable RSS")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
Acked-by: Konstantin Ananyev <konstantin.v.ananyev at yandex.ru>
---
 lib/hash/rte_thash.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 6847e36f4b..2b97482cfb 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -672,5 +672,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx)
 
 static inline uint8_t
-read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset)
+read_unaligned_byte(uint8_t *ptr, unsigned int offset)
 {
 	uint8_t ret = 0;
@@ -683,5 +683,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset)
 	}
 
-	return ret >> (CHAR_BIT - len);
+	return ret;
 }
 
@@ -690,4 +690,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)
 {
 	uint32_t ret = 0;
+	int shift;
 
 	len = RTE_MAX(len, 0);
@@ -697,11 +698,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)
 		ret <<= CHAR_BIT;
 
-		ret |= read_unaligned_byte(ptr, RTE_MIN(len, CHAR_BIT),
-			offset);
+		ret |= read_unaligned_byte(ptr, offset);
 		offset += CHAR_BIT;
 		len -= CHAR_BIT;
 	}
 
-	return ret;
+	shift = (len == 0) ? 0 :
+		(CHAR_BIT - ((len + CHAR_BIT) % CHAR_BIT));
+	return ret >> shift;
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:08.863931070 +0100
+++ 0114-hash-fix-reading-unaligned-bits-in-Toeplitz-hash.patch	2023-07-20 16:17:55.106752325 +0100
@@ -1 +1 @@
-From 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 Mon Sep 17 00:00:00 2001
+From 086b98481996e9bced4c406b5901d1dadc69176a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a54f8de715c29613cf3d34ce3910d2bd27bffb9 ]
+
@@ -7 +8,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
-index 0249883b8d..2228af576b 100644
+index 6847e36f4b..2b97482cfb 100644
@@ -19 +20 @@
-@@ -671,5 +671,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx)
+@@ -672,5 +672,5 @@ rte_thash_get_gfni_matrices(struct rte_thash_ctx *ctx)
@@ -26 +27 @@
-@@ -682,5 +682,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset)
+@@ -683,5 +683,5 @@ read_unaligned_byte(uint8_t *ptr, unsigned int len, unsigned int offset)
@@ -33 +34 @@
-@@ -689,4 +689,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)
+@@ -690,4 +690,5 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)
@@ -39 +40 @@
-@@ -696,11 +697,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)
+@@ -697,11 +698,12 @@ read_unaligned_bits(uint8_t *ptr, int len, int offset)