From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 7C540A00E6 for ; Tue, 14 May 2019 16:44:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E1696833; Tue, 14 May 2019 16:44:54 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DC3BE5F62 for ; Tue, 14 May 2019 16:44:52 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C18089AF6; Tue, 14 May 2019 14:44:50 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59627608B9; Tue, 14 May 2019 14:44:48 +0000 (UTC) From: Kevin Traynor To: Dharmik Thakkar Cc: Linfan , Yipeng Wang , dpdk stable Date: Tue, 14 May 2019 15:43:56 +0100 Message-Id: <20190514144406.7526-12-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 14 May 2019 14:44:52 +0000 (UTC) Subject: [dpdk-stable] patch 'hash: fix position returned in free slots' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Suggested-by: Linfan Signed-off-by: Dharmik Thakkar Acked-by: Yipeng Wang --- 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@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,