From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com
[209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 57E48FFA
for <stable@dpdk.org>; Mon, 30 Apr 2018 16:42:43 +0200 (CEST)
Received: by mail-wr0-f194.google.com with SMTP id o15-v6so8276493wro.11
for <stable@dpdk.org>; Mon, 30 Apr 2018 07:42:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=myw+iqUa6tu0unew5o6hlGJ9lhEm7aE91vwO9gzQs3g=;
b=uihi6EbIKXk9zXRrOEbBc3kMz4VRfn/8MiZcbH7IlZbeBLpzutVXLOl0i70aZExPy/
zBNXZUuFznWlehECaA4P4gopxmV7UNfTL0iBF942i7w/vQdL+G9PoiCZM4xAkCxe1byA
J5Y/2sH1N+91IEkfwbuqzw3Nfq9RVSIuPBFk2KL3lRyLjcmJFp575/SD9c/bj7+A/jRR
8HWvGGEzTfPDGARQhWm8R1zPpvTCtFE+awpiBNeFaiWYE2cQciCcDE9rgL+PLtvq/zem
jPYsoZqN4KqYT5c6NTbS8bY20I/qCLDbSHIpYhvZeNIJ392LR2gvvOWEBkSE84TI1FOe
Pi+A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=myw+iqUa6tu0unew5o6hlGJ9lhEm7aE91vwO9gzQs3g=;
b=B5U+qyWVmI1TIKE/rDblgzyNgTWKquPEV6yOFM1M9A1lxcBCoWGosMz21gWAtLckyN
yB3q+mmnMwJBORp6ttCXYUPdztSlkflni+Psk8rmrsj8jsjpWPG66USw7e7PNp2wfiaO
8WLgboZP4G0zvAMlrYgWgS609HTghJ9ZdRCEWZbdGQoDdZBb7+jvBkIFv6XzTBYSd/hy
4SEOAzOH1pMYNVwU/b8VFlqnFFWPIC67xv+tD9xBl3/x2eScSCLGWxFfhThllb2kKRHU
LgBBO5uPH2yiVXYZDsEFwY8SB30bgKUxEDSgPMtV70Pj9Ekq7LZuTWU/8/hXYjBcMkVG
A0WA==
X-Gm-Message-State: ALQs6tB/DsysvACJUpCkEwjKjZRWgGQwPnMHR9mIcUlYDccNqXghf9zY
RjeFg1F06Xf3PJ0yAsnjue2/sz4ws88=
X-Google-Smtp-Source: AB8JxZrP6s7i9q8qLOyLWIUVj/U4QrgRVsdsThDlfbiupKcdl/v9p3cndDLSN+Rb3LFzmounO19paw==
X-Received: by 2002:adf:b08e:: with SMTP id i14-v6mr9798198wra.9.1525099363051;
Mon, 30 Apr 2018 07:42:43 -0700 (PDT)
Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb])
by smtp.gmail.com with ESMTPSA id y68-v6sm9787357wrb.91.2018.04.30.07.42.41
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Mon, 30 Apr 2018 07:42:42 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Cc: Pablo de Lara <pablo.de.lara.guarch@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Mon, 30 Apr 2018 15:40:26 +0100
Message-Id: <20180430144223.18657-11-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.14.2
In-Reply-To: <20180430144223.18657-1-luca.boccassi@gmail.com>
References: <20180430140606.4615-80-luca.boccassi@gmail.com>
<20180430144223.18657-1-luca.boccassi@gmail.com>
Subject: [dpdk-stable] patch 'hash: fix missing spinlock unlock in add key'
has been queued to stable release 18.02.2
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2018 14:42:44 -0000
Hi,
FYI, your patch has been queued to stable release 18.02.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/02/18. So please
shout if anyone has objections.
Thanks.
Luca Boccassi
---
>>From 7eeacc3b4a3fb3bdc8655736dfda3beb21789f8e Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
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 <pbhagavatula@caviumnetworks.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
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 9b1387b5e..a07543a29 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -552,7 +552,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;
}
}
}
@@ -572,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 sec_bkt->key_idx[i] - 1;
+ ret = sec_bkt->key_idx[i] - 1;
+ goto failure;
}
}
}
--
2.14.2