[dpdk-stable] patch 'hash: fix total entries count' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/20/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.

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/4b66ba8b26af23c282f36b532c17accb2bfa2a99

Thanks.

Kevin Traynor

---
>From 4b66ba8b26af23c282f36b532c17accb2bfa2a99 Mon Sep 17 00:00:00 2001
From: Dharmik Thakkar <dharmik.thakkar at arm.com>
Date: Thu, 9 May 2019 17:19:06 +0000
Subject: [PATCH] hash: fix total entries count

[ upstream commit 52c7abbea95064edd73eee6ab1ceafaab066d55a ]

In rte_hash, with current implementation, it is possible that keys
are stored at indexes greater than the number of total entries.

Currently, in rte_hash_free_key_with_position(), due to incorrect
computation of total_entries, application cannot free keys with
indexes greater than the number of total entries.

This patch fixes this incorrect computation of total_entries.

Bugzilla ID: 261
Fixes: 9d033dac7d7c ("hash: support no free on delete")

Reported-by: Linfan <zhongdahulinfan at 163.com>
Suggested-by: Linfan <zhongdahulinfan at 163.com>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar at arm.com>
Acked-by: Yipeng Wang <yipeng1.wang at intel.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 07c248191..d7a5f4c21 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1544,5 +1544,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 	unsigned int lcore_id, n_slots;
 	struct lcore_cache *cached_free_slots;
-	const uint32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
+	const uint32_t total_entries = h->use_local_cache ?
+		h->entries + (RTE_MAX_LCORE - 1) * (LCORE_CACHE_SIZE - 1) + 1
+							: h->entries + 1;
 
 	/* Out of bounds */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.931165432 +0100
+++ 0013-hash-fix-total-entries-count.patch	2019-05-14 15:39:07.311558851 +0100
@@ -1 +1 @@
-From 52c7abbea95064edd73eee6ab1ceafaab066d55a Mon Sep 17 00:00:00 2001
+From 4b66ba8b26af23c282f36b532c17accb2bfa2a99 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 52c7abbea95064edd73eee6ab1ceafaab066d55a ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index 1f5808eba..2dc423fba 100644
+index 07c248191..d7a5f4c21 100644
@@ -31 +32 @@
-@@ -1595,5 +1595,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+@@ -1544,5 +1544,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h,