From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yipeng1.wang@intel.com>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by dpdk.org (Postfix) with ESMTP id 87A511BE1D
for <dev@dpdk.org>; Sat, 7 Jul 2018 04:53:57 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
06 Jul 2018 19:53:55 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.51,319,1526367600"; d="scan'208";a="62888534"
Received: from skx-yipeng.jf.intel.com ([10.54.81.175])
by FMSMGA003.fm.intel.com with ESMTP; 06 Jul 2018 19:53:44 -0700
From: Yipeng Wang <yipeng1.wang@intel.com>
To: pablo.de.lara.guarch@intel.com
Cc: dev@dpdk.org, yipeng1.wang@intel.com, bruce.richardson@intel.com,
honnappa.nagarahalli@arm.com, vguvva@caviumnetworks.com,
brijesh.s.singh@gmail.com
Date: Fri, 6 Jul 2018 12:46:39 -0700
Message-Id: <1530906406-289697-2-git-send-email-yipeng1.wang@intel.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1530906406-289697-1-git-send-email-yipeng1.wang@intel.com>
References: <1528455078-328182-1-git-send-email-yipeng1.wang@intel.com>
<1530906406-289697-1-git-send-email-yipeng1.wang@intel.com>
Subject: [dpdk-dev] [PATCH v3 1/8] hash: fix multiwriter lock memory
allocation
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jul 2018 02:53:58 -0000
When malloc for multiwriter_lock, the align should be
RTE_CACHE_LINE_SIZE rather than LCORE_CACHE_SIZE.
Also there should be check to verify the success of
rte_malloc.
Fixes: be856325cba3 ("hash: add scalable multi-writer insertion with Intel TSX")
Cc: stable@dpdk.org
Signed-off-by: Yipeng Wang <yipeng1.wang@intel.com>
---
lib/librte_hash/rte_cuckoo_hash.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index a07543a..80dcf41 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -281,7 +281,10 @@ rte_hash_create(const struct rte_hash_parameters *params)
h->add_key = ADD_KEY_MULTIWRITER;
h->multiwriter_lock = rte_malloc(NULL,
sizeof(rte_spinlock_t),
- LCORE_CACHE_SIZE);
+ RTE_CACHE_LINE_SIZE);
+ if (h->multiwriter_lock == NULL)
+ goto err_unlock;
+
rte_spinlock_init(h->multiwriter_lock);
}
} else
--
2.7.4