From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id DA00D292D for ; Sun, 22 Apr 2018 17:11:48 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 18AF2212E0; Sun, 22 Apr 2018 11:11:48 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:11:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=B0L01+/USHVn5JvYe tkRv2qxqGhrsde+RXp/OUlDHpw=; b=NyoEd9PrBTj4X/MUabF21tU0uIrPUPBpj XFNIi63MtnWwje079bhJ5p3OK8Xvy4P8pIqDifqhS81+adYAew7JywGG02kP4Rls fjLYcc+W5V93agO2NuFO0xG0oqgZdFfmx9OYTAF5ilJoyNiPL8s7O9vfNF1+yTO5 2QWPzA35Hts4zJHxoUiVl1g+ofsrxBXmoelO7H96yq+KIlOyjlORq/aGA9ng8Yd1 70D3iBYcpr14Eo2TDT6ikPRiHUMvDSRep5482alYxHsW6eQIO00ZqiFv/4daiRpR TfhS3nF57NwmS8yVieIxyKsfbUYgFy/2dS6t97f0ctIQ6+SnnJM0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=B0L01+/USHVn5JvYetkRv2qxqGhrsde+RXp/OUlDHpw=; b=Oog8mMo1 dSRqEv6d93m81E+yYs+SbW/gPJHvpEqj4b7Hzmcj0jn4H0BCiUPCEv2m4wpcao49 JvQL7DZM1QV0BtdWK7XGO9jTpAoznFEZyWxpLVMZrA9Sd4pFaaLH/B7Ugaeg7OYE U+CzQd9MW9xThJrnqKkWd7bUqdos8pUn7tVcizs+w3xHBWhlokSWDrI90HvaKIs9 XXkDPqJpVe8UDKkJ15kgdgnPKe83TGx2ueOPHddSR9+0hNzaNIMFzHiq6lqRpK7D jk8dEtLl5xML5qGh10Q1lNskg+LS0BCBYq1SjjebovUHuMv2VpihBVCkC/nX+NDI IccDdK3bkcNQnQ== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 21BFF10261; Sun, 22 Apr 2018 11:11:45 -0400 (EDT) From: Yuanhan Liu To: Pavan Nikhilesh Cc: Pablo de Lara , dpdk stable Date: Sun, 22 Apr 2018 23:09:29 +0800 Message-Id: <20180422150949.17523-39-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'hash: fix missing spinlock unlock in add key' has been queued to LTS release 17.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: , X-List-Received-Date: Sun, 22 Apr 2018 15:11:49 -0000 Hi, FYI, your patch has been queued to LTS release 17.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 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From a139332392d40cd0c66e9def6f12130a891d33fe Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Sun, 4 Mar 2018 20:28:31 +0530 Subject: [PATCH] hash: fix missing spinlock unlock in add key [ upstream commit e166e55c1a472d6bbc388c66f41be5823c63f8b7 ] Fix missing spinlock unlock during add key when key is already present. Fixes: be856325cba3 ("hash: add scalable multi-writer insertion with Intel TSX") Signed-off-by: Pavan Nikhilesh Acked-by: Pablo de Lara --- lib/librte_hash/rte_cuckoo_hash.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index 55fd7bdcc..cbf78fab2 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -573,7 +573,8 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, * Return index where key is stored, * subtracting the first dummy index */ - return prim_bkt->key_idx[i] - 1; + ret = prim_bkt->key_idx[i] - 1; + goto failure; } } } @@ -593,7 +594,8 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, * Return index where key is stored, * subtracting the first dummy index */ - return sec_bkt->key_idx[i] - 1; + ret = sec_bkt->key_idx[i] - 1; + goto failure; } } } -- 2.11.0