[dpdk-stable] patch 'hash: fix position returned in free slots' 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/9ad57899f6f785239451296b293124faa6ca2b45

Thanks.

Kevin Traynor

---
>From 9ad57899f6f785239451296b293124faa6ca2b45 Mon Sep 17 00:00:00 2001
From: Dharmik Thakkar <dharmik.thakkar at arm.com>
Date: Thu, 9 May 2019 17:19:05 +0000
Subject: [PATCH] hash: fix position returned in free slots

[ upstream commit 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 ]

Currently, in rte_hash_free_key_with_position(), the position returned
to the ring of free_slots leads to an unexpected conflict with a key
already in use.

This patch fixes incorrect position returned to the ring of free_slots.

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 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index c01489ba5..07c248191 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1537,12 +1537,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 				const int32_t position)
 {
-	RETURN_IF_TRUE(((h == NULL) || (position == EMPTY_SLOT)), -EINVAL);
+	/* Key index where key is stored, adding the first dummy index */
+	uint32_t key_idx = position + 1;
+
+	RETURN_IF_TRUE(((h == NULL) || (key_idx == EMPTY_SLOT)), -EINVAL);
 
 	unsigned int lcore_id, n_slots;
 	struct lcore_cache *cached_free_slots;
-	const int32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
+	const uint32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
 
 	/* Out of bounds */
-	if (position >= total_entries)
+	if (key_idx >= total_entries)
 		return -EINVAL;
 
@@ -1561,9 +1564,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
 		/* Put index of new free slot in cache. */
 		cached_free_slots->objs[cached_free_slots->len] =
-					(void *)((uintptr_t)position);
+					(void *)((uintptr_t)key_idx);
 		cached_free_slots->len++;
 	} else {
 		rte_ring_sp_enqueue(h->free_slots,
-				(void *)((uintptr_t)position));
+				(void *)((uintptr_t)key_idx));
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:07.885058526 +0100
+++ 0012-hash-fix-position-returned-in-free-slots.patch	2019-05-14 15:39:07.309558891 +0100
@@ -1 +1 @@
-From 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 Mon Sep 17 00:00:00 2001
+From 9ad57899f6f785239451296b293124faa6ca2b45 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 261267b7f..1f5808eba 100644
+index c01489ba5..07c248191 100644
@@ -28 +29 @@
-@@ -1588,12 +1588,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+@@ -1537,12 +1537,15 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
@@ -46,2 +47,2 @@
- 	if (h->ext_table_support && h->readwrite_concur_lf_support) {
-@@ -1620,9 +1623,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
+ 
+@@ -1561,9 +1564,9 @@ rte_hash_free_key_with_position(const struct rte_hash *h,