X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_hash%2Frte_hash.c;h=b6a2b2f47931375d97ee20260e62139840ae40a9;hb=ff708facfcbf42f3dcb3c62d82ecd93e7b8c2506;hp=9990f9b30e976d107a5c2ec551c5441a58eed77a;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git

diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c
index 9990f9b30e..b6a2b2f479 100644
--- a/lib/librte_hash/rte_hash.c
+++ b/lib/librte_hash/rte_hash.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
+ *
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <string.h>
@@ -40,39 +39,27 @@
 #include <sys/queue.h>
 
 #include <rte_common.h>
-#include <rte_memory.h>         /* for definition of CACHE_LINE_SIZE */
+#include <rte_memory.h>         /* for definition of RTE_CACHE_LINE_SIZE */
 #include <rte_log.h>
 #include <rte_memcpy.h>
 #include <rte_prefetch.h>
 #include <rte_branch_prediction.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
+#include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
 #include <rte_errno.h>
 #include <rte_string_fns.h>
 #include <rte_cpuflags.h>
 #include <rte_log.h>
+#include <rte_rwlock.h>
+#include <rte_spinlock.h>
 
 #include "rte_hash.h"
-#include "rte_jhash.h"
-#include "rte_hash_crc.h"
 
 
-TAILQ_HEAD(rte_hash_list, rte_hash);
-
-/* global list of hashes (used for debug/dump) */
-static struct rte_hash_list *hash_list;
-
-/* macro to prevent duplication of list creation check code */
-#define CHECK_HASH_LIST_CREATED() do { \
-	if (hash_list == NULL) \
-		if ((hash_list = RTE_TAILQ_RESERVE("RTE_HASH", rte_hash_list)) == NULL){ \
-			rte_errno = E_RTE_NO_TAILQ; \
-			return NULL; \
-		} \
-} while (0)
+TAILQ_HEAD(rte_hash_list, rte_tailq_entry);
 
 /* Macro to enable/disable run-time checking of function parameters */
 #if defined(RTE_LIBRTE_HASH_DEBUG)
@@ -84,7 +71,13 @@ static struct rte_hash_list *hash_list;
 #endif
 
 /* Hash function used if none is specified */
+#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#include <rte_hash_crc.h>
 #define DEFAULT_HASH_FUNC       rte_hash_crc
+#else
+#include <rte_jhash.h>
+#define DEFAULT_HASH_FUNC       rte_jhash
+#endif
 
 /* Signature bucket size is a multiple of this value */
 #define SIG_BUCKET_ALIGNMENT    16
@@ -147,17 +140,29 @@ find_first(uint32_t sig, const uint32_t *sig_bucket, uint32_t num_sigs)
 struct rte_hash *
 rte_hash_find_existing(const char *name)
 {
-	struct rte_hash *h;
+	struct rte_hash *h = NULL;
+	struct rte_tailq_entry *te;
+	struct rte_hash_list *hash_list;
 
 	/* check that we have an initialised tail queue */
-	CHECK_HASH_LIST_CREATED();
+	if ((hash_list =
+			RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) {
+		rte_errno = E_RTE_NO_TAILQ;
+		return NULL;
+	}
 
-	TAILQ_FOREACH(h, hash_list, next) {
+	rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
+	TAILQ_FOREACH(te, hash_list, next) {
+		h = (struct rte_hash *) te->data;
 		if (strncmp(name, h->name, RTE_HASH_NAMESIZE) == 0)
 			break;
 	}
-	if (h == NULL)
+	rte_rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK);
+
+	if (te == NULL) {
 		rte_errno = ENOENT;
+		return NULL;
+	}
 	return h;
 }
 
@@ -165,18 +170,19 @@ struct rte_hash *
 rte_hash_create(const struct rte_hash_parameters *params)
 {
 	struct rte_hash *h = NULL;
+	struct rte_tailq_entry *te;
 	uint32_t num_buckets, sig_bucket_size, key_size,
 		hash_tbl_size, sig_tbl_size, key_tbl_size, mem_size;
 	char hash_name[RTE_HASH_NAMESIZE];
+	struct rte_hash_list *hash_list;
 
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY){
-		rte_errno = E_RTE_SECONDARY;
+	/* check that we have an initialised tail queue */
+	if ((hash_list =
+	     RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) {
+		rte_errno = E_RTE_NO_TAILQ;
 		return NULL;
 	}
 
-	/* check that we have an initialised tail queue */
-	CHECK_HASH_LIST_CREATED();
-
 	/* Check for valid parameters */
 	if ((params == NULL) ||
 			(params->entries > RTE_HASH_ENTRIES_MAX) ||
@@ -191,7 +197,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
 		return NULL;
 	}
 
-	rte_snprintf(hash_name, sizeof(hash_name), "HT_%s", params->name);
+	snprintf(hash_name, sizeof(hash_name), "HT_%s", params->name);
 
 	/* Calculate hash dimensions */
 	num_buckets = params->entries / params->bucket_entries;
@@ -199,36 +205,42 @@ rte_hash_create(const struct rte_hash_parameters *params)
 				     sizeof(hash_sig_t), SIG_BUCKET_ALIGNMENT);
 	key_size =  align_size(params->key_len, KEY_ALIGNMENT);
 
-	hash_tbl_size = align_size(sizeof(struct rte_hash), CACHE_LINE_SIZE);
+	hash_tbl_size = align_size(sizeof(struct rte_hash), RTE_CACHE_LINE_SIZE);
 	sig_tbl_size = align_size(num_buckets * sig_bucket_size,
-				  CACHE_LINE_SIZE);
+				  RTE_CACHE_LINE_SIZE);
 	key_tbl_size = align_size(num_buckets * key_size *
-				  params->bucket_entries, CACHE_LINE_SIZE);
+				  params->bucket_entries, RTE_CACHE_LINE_SIZE);
 
 	/* Total memory required for hash context */
 	mem_size = hash_tbl_size + sig_tbl_size + key_tbl_size;
 
-	/* Allocate as a memzone, or in normal memory space */
-#if defined(RTE_LIBRTE_HASH_USE_MEMZONE)
-	const struct rte_memzone *mz;
-	mz = rte_memzone_reserve(hash_name, mem_size, params->socket_id, 0);
-	if (mz == NULL) {
-		RTE_LOG(ERR, HASH, "memzone reservation failed\n");
-		return NULL;
+	rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+	/* guarantee there's no existing */
+	TAILQ_FOREACH(te, hash_list, next) {
+		h = (struct rte_hash *) te->data;
+		if (strncmp(params->name, h->name, RTE_HASH_NAMESIZE) == 0)
+			break;
 	}
-	memset(mz->addr, 0, mem_size);
-	h = (struct rte_hash *)mz->addr;
-#else
-	h = (struct rte_hash *)rte_zmalloc(hash_name, mem_size,
-					   CACHE_LINE_SIZE);
+	if (te != NULL)
+		goto exit;
+
+	te = rte_zmalloc("HASH_TAILQ_ENTRY", sizeof(*te), 0);
+	if (te == NULL) {
+		RTE_LOG(ERR, HASH, "tailq entry allocation failed\n");
+		goto exit;
+	}
+
+	h = (struct rte_hash *)rte_zmalloc_socket(hash_name, mem_size,
+					   RTE_CACHE_LINE_SIZE, params->socket_id);
 	if (h == NULL) {
 		RTE_LOG(ERR, HASH, "memory allocation failed\n");
-		return NULL;
+		rte_free(te);
+		goto exit;
 	}
-#endif
 
 	/* Setup hash context */
-	rte_snprintf(h->name, sizeof(h->name), "%s", params->name);
+	snprintf(h->name, sizeof(h->name), "%s", params->name);
 	h->entries = params->entries;
 	h->bucket_entries = params->bucket_entries;
 	h->key_len = params->key_len;
@@ -243,43 +255,64 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	h->hash_func = (params->hash_func == NULL) ?
 		DEFAULT_HASH_FUNC : params->hash_func;
 
-	if (h->hash_func == rte_hash_crc &&
-			!rte_cpu_get_flag_enabled(RTE_CPUFLAG_SSE4_2)) {
-		RTE_LOG(WARNING, HASH, "CRC32 instruction requires SSE4.2, "
-				"which is not supported on this system. "
-				"Falling back to software hash\n.");
-		h->hash_func = rte_jhash;
-	}
+	te->data = (void *) h;
+
+	TAILQ_INSERT_TAIL(hash_list, te, next);
+
+exit:
+	rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
-	TAILQ_INSERT_TAIL(hash_list, h, next);
 	return h;
 }
 
 void
 rte_hash_free(struct rte_hash *h)
 {
+	struct rte_tailq_entry *te;
+	struct rte_hash_list *hash_list;
+
 	if (h == NULL)
 		return;
-#if !defined(RTE_LIBRTE_HASH_USE_MEMZONE)
-	TAILQ_REMOVE(hash_list, h, next);
+
+	/* check that we have an initialised tail queue */
+	if ((hash_list =
+	     RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) {
+		rte_errno = E_RTE_NO_TAILQ;
+		return;
+	}
+
+	rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+	/* find out tailq entry */
+	TAILQ_FOREACH(te, hash_list, next) {
+		if (te->data == (void *) h)
+			break;
+	}
+
+	if (te == NULL) {
+		rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+		return;
+	}
+
+	TAILQ_REMOVE(hash_list, te, next);
+
+	rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+
 	rte_free(h);
-#endif
-	/* No way to deallocate memzones */
-	return;
+	rte_free(te);
 }
 
-int32_t
-rte_hash_add_key(const struct rte_hash *h, const void *key)
+static inline int32_t
+__rte_hash_add_key_with_hash(const struct rte_hash *h,
+				const void *key, hash_sig_t sig)
 {
-	hash_sig_t sig, *sig_bucket;
+	hash_sig_t *sig_bucket;
 	uint8_t *key_bucket;
 	uint32_t bucket_index, i;
 	int32_t pos;
 
-	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
-
 	/* Get the hash signature and bucket index */
-	sig = h->hash_func(key, h->key_len, h->hash_func_init_val) | h->sig_msb;
+	sig |= h->sig_msb;
 	bucket_index = sig & h->bucket_bitmask;
 	sig_bucket = get_sig_tbl_bucket(h, bucket_index);
 	key_bucket = get_key_tbl_bucket(h, bucket_index);
@@ -306,16 +339,30 @@ rte_hash_add_key(const struct rte_hash *h, const void *key)
 }
 
 int32_t
-rte_hash_del_key(const struct rte_hash *h, const void *key)
+rte_hash_add_key_with_hash(const struct rte_hash *h,
+				const void *key, hash_sig_t sig)
 {
-	hash_sig_t sig, *sig_bucket;
-	uint8_t *key_bucket;
-	uint32_t bucket_index, i;
+	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_add_key_with_hash(h, key, sig);
+}
 
+int32_t
+rte_hash_add_key(const struct rte_hash *h, const void *key)
+{
 	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_add_key_with_hash(h, key, rte_hash_hash(h, key));
+}
+
+static inline int32_t
+__rte_hash_del_key_with_hash(const struct rte_hash *h,
+				const void *key, hash_sig_t sig)
+{
+	hash_sig_t *sig_bucket;
+	uint8_t *key_bucket;
+	uint32_t bucket_index, i;
 
 	/* Get the hash signature and bucket index */
-	sig = h->hash_func(key, h->key_len, h->hash_func_init_val) | h->sig_msb;
+	sig = sig | h->sig_msb;
 	bucket_index = sig & h->bucket_bitmask;
 	sig_bucket = get_sig_tbl_bucket(h, bucket_index);
 	key_bucket = get_key_tbl_bucket(h, bucket_index);
@@ -334,16 +381,30 @@ rte_hash_del_key(const struct rte_hash *h, const void *key)
 }
 
 int32_t
-rte_hash_lookup(const struct rte_hash *h, const void *key)
+rte_hash_del_key_with_hash(const struct rte_hash *h,
+				const void *key, hash_sig_t sig)
 {
-	hash_sig_t sig, *sig_bucket;
-	uint8_t *key_bucket;
-	uint32_t bucket_index, i;
+	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_del_key_with_hash(h, key, sig);
+}
 
+int32_t
+rte_hash_del_key(const struct rte_hash *h, const void *key)
+{
 	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_del_key_with_hash(h, key, rte_hash_hash(h, key));
+}
+
+static inline int32_t
+__rte_hash_lookup_with_hash(const struct rte_hash *h,
+			const void *key, hash_sig_t sig)
+{
+	hash_sig_t *sig_bucket;
+	uint8_t *key_bucket;
+	uint32_t bucket_index, i;
 
 	/* Get the hash signature and bucket index */
-	sig = h->hash_func(key, h->key_len, h->hash_func_init_val) | h->sig_msb;
+	sig |= h->sig_msb;
 	bucket_index = sig & h->bucket_bitmask;
 	sig_bucket = get_sig_tbl_bucket(h, bucket_index);
 	key_bucket = get_key_tbl_bucket(h, bucket_index);
@@ -360,15 +421,30 @@ rte_hash_lookup(const struct rte_hash *h, const void *key)
 	return -ENOENT;
 }
 
+int32_t
+rte_hash_lookup_with_hash(const struct rte_hash *h,
+			const void *key, hash_sig_t sig)
+{
+	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_lookup_with_hash(h, key, sig);
+}
+
+int32_t
+rte_hash_lookup(const struct rte_hash *h, const void *key)
+{
+	RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL);
+	return __rte_hash_lookup_with_hash(h, key, rte_hash_hash(h, key));
+}
+
 int
-rte_hash_lookup_multi(const struct rte_hash *h, const void **keys,
+rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys,
 		      uint32_t num_keys, int32_t *positions)
 {
 	uint32_t i, j, bucket_index;
-	hash_sig_t sigs[RTE_HASH_LOOKUP_MULTI_MAX];
+	hash_sig_t sigs[RTE_HASH_LOOKUP_BULK_MAX];
 
 	RETURN_IF_TRUE(((h == NULL) || (keys == NULL) || (num_keys == 0) ||
-			(num_keys > RTE_HASH_LOOKUP_MULTI_MAX) ||
+			(num_keys > RTE_HASH_LOOKUP_BULK_MAX) ||
 			(positions == NULL)), -EINVAL);
 
 	/* Get the hash signature and bucket index */