From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id A8EE0558D for ; Wed, 9 Nov 2016 18:21:23 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 09 Nov 2016 09:21:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,614,1473145200"; d="scan'208";a="1082916076" Received: from sie-lab-214-036.ir.intel.com (HELO silpixa00394365.ir.intel.com) ([10.237.214.36]) by fmsmga002.fm.intel.com with ESMTP; 09 Nov 2016 09:21:08 -0800 From: Pablo de Lara To: stable@dpdk.org Cc: yuanhan.liu@linux.intel.com, Pablo de Lara Date: Wed, 9 Nov 2016 17:22:04 +0000 Message-Id: <1478712124-14090-2-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478712124-14090-1-git-send-email-pablo.de.lara.guarch@intel.com> References: <1478712124-14090-1-git-send-email-pablo.de.lara.guarch@intel.com> Subject: [dpdk-stable] [PATCH 2/2] hash: fix bucket size usage X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2016 17:21:24 -0000 Multiwriter insert function was using a fixed value for the bucket size, instead of using the RTE_HASH_BUCKET_ENTRIES macro, which value was changed recently (making it inconsistent in this case). Fixes: be856325cba3 ("hash: add scalable multi-writer insertion with Intel TSX") Signed-off-by: Pablo de Lara --- lib/librte_hash/rte_cuckoo_hash_x86.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_hash/rte_cuckoo_hash_x86.h b/lib/librte_hash/rte_cuckoo_hash_x86.h index fa5630b..ace1bd2 100644 --- a/lib/librte_hash/rte_cuckoo_hash_x86.h +++ b/lib/librte_hash/rte_cuckoo_hash_x86.h @@ -168,7 +168,8 @@ rte_hash_cuckoo_make_space_mw_tm(const struct rte_hash *h, /* Cuckoo bfs Search */ while (likely(tail != head && head < - queue + RTE_HASH_BFS_QUEUE_MAX_LEN - 4)) { + queue + RTE_HASH_BFS_QUEUE_MAX_LEN - + RTE_HASH_BUCKET_ENTRIES)) { curr_bkt = tail->bkt; for (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) { if (curr_bkt->signatures[i].sig == NULL_SIGNATURE) { -- 2.7.4