summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDharmik Thakkar <dharmik.thakkar@arm.com>2019-05-09 17:19:05 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-05-09 22:29:36 +0200
commit2bc731197b8afc0ea0a0796dd7cea43474a6e1f9 (patch)
tree4c73e5bbf13e2f0947657789fad1aa2920abc0f4
parent2d119c3baac4409092d064d386deb33d8f61f90f (diff)
downloaddpdk-draft-windows-2bc731197b8afc0ea0a0796dd7cea43474a6e1f9.zip
dpdk-draft-windows-2bc731197b8afc0ea0a0796dd7cea43474a6e1f9.tar.gz
dpdk-draft-windows-2bc731197b8afc0ea0a0796dd7cea43474a6e1f9.tar.xz
hash: fix position returned in free slots
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") Cc: stable@dpdk.org Reported-by: Linfan <zhongdahulinfan@163.com> Suggested-by: Linfan <zhongdahulinfan@163.com> Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com> Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
-rw-r--r--lib/librte_hash/rte_cuckoo_hash.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 261267b..1f5808e 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1587,14 +1587,17 @@ int __rte_experimental
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;
if (h->ext_table_support && h->readwrite_concur_lf_support) {
uint32_t index = h->ext_bkt_to_free[position];
@@ -1619,11 +1622,11 @@ 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));
}
return 0;