X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_hash%2Frte_hash.c;h=924571614ef96e5160fee295a440479af4c2cf7c;hb=a2348166ea186506d45b61d5073d16ad974e79bb;hp=5ff8d69e21b682f37d95062abeea1d98dc3dcd17;hpb=1a9f648be2911b8890c03a8be25842587f3fa885;p=dpdk.git diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c index 5ff8d69e21..924571614e 100644 --- a/lib/librte_hash/rte_hash.c +++ b/lib/librte_hash/rte_hash.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 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 @@ -40,14 +39,13 @@ #include #include -#include /* for definition of CACHE_LINE_SIZE */ +#include /* for definition of RTE_CACHE_LINE_SIZE */ #include #include #include #include #include #include -#include #include #include #include @@ -60,8 +58,12 @@ #include "rte_hash.h" +TAILQ_HEAD(rte_hash_list, rte_tailq_entry); -TAILQ_HEAD(rte_hash_list, rte_hash); +static struct rte_tailq_elem rte_hash_tailq = { + .name = "RTE_HASH", +}; +EAL_REGISTER_TAILQ(rte_hash_tailq) /* Macro to enable/disable run-time checking of function parameters */ #if defined(RTE_LIBRTE_HASH_DEBUG) @@ -142,24 +144,24 @@ 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 */ - if ((hash_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_HASH, rte_hash_list)) == NULL) { - rte_errno = E_RTE_NO_TAILQ; - return NULL; - } + hash_list = RTE_TAILQ_CAST(rte_hash_tailq.head, rte_hash_list); rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK); - TAILQ_FOREACH(h, hash_list, next) { + TAILQ_FOREACH(te, hash_list, next) { + h = (struct rte_hash *) te->data; if (strncmp(name, h->name, RTE_HASH_NAMESIZE) == 0) break; } rte_rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK); - if (h == NULL) + if (te == NULL) { rte_errno = ENOENT; + return NULL; + } return h; } @@ -167,17 +169,13 @@ 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; - /* 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; - } + hash_list = RTE_TAILQ_CAST(rte_hash_tailq.head, rte_hash_list); /* Check for valid parameters */ if ((params == NULL) || @@ -193,7 +191,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; @@ -201,34 +199,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; rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); /* guarantee there's no existing */ - TAILQ_FOREACH(h, hash_list, next) { + TAILQ_FOREACH(te, hash_list, next) { + h = (struct rte_hash *) te->data; if (strncmp(params->name, h->name, RTE_HASH_NAMESIZE) == 0) break; } - if (h != NULL) + 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, - CACHE_LINE_SIZE, params->socket_id); + RTE_CACHE_LINE_SIZE, params->socket_id); if (h == NULL) { RTE_LOG(ERR, HASH, "memory allocation failed\n"); + rte_free(te); goto exit; } /* 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,7 +249,9 @@ rte_hash_create(const struct rte_hash_parameters *params) h->hash_func = (params->hash_func == NULL) ? DEFAULT_HASH_FUNC : params->hash_func; - TAILQ_INSERT_TAIL(hash_list, h, next); + te->data = (void *) h; + + TAILQ_INSERT_TAIL(hash_list, te, next); exit: rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); @@ -254,15 +262,37 @@ exit: void rte_hash_free(struct rte_hash *h) { + struct rte_tailq_entry *te; + struct rte_hash_list *hash_list; + if (h == NULL) return; - RTE_EAL_TAILQ_REMOVE(RTE_TAILQ_HASH, rte_hash_list, h); + hash_list = RTE_TAILQ_CAST(rte_hash_tailq.head, rte_hash_list); + + 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); + rte_free(te); } static inline int32_t -__rte_hash_add_key_with_hash(const struct rte_hash *h, +__rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t sig) { hash_sig_t *sig_bucket; @@ -298,7 +328,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, } int32_t -rte_hash_add_key_with_hash(const struct rte_hash *h, +rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t sig) { RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL); @@ -313,7 +343,7 @@ rte_hash_add_key(const struct rte_hash *h, const void *key) } static inline int32_t -__rte_hash_del_key_with_hash(const struct rte_hash *h, +__rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t sig) { hash_sig_t *sig_bucket; @@ -340,7 +370,7 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h, } int32_t -rte_hash_del_key_with_hash(const struct rte_hash *h, +rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t sig) { RETURN_IF_TRUE(((h == NULL) || (key == NULL)), -EINVAL); @@ -355,7 +385,7 @@ rte_hash_del_key(const struct rte_hash *h, const void *key) } static inline int32_t -__rte_hash_lookup_with_hash(const struct rte_hash *h, +__rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key, hash_sig_t sig) { hash_sig_t *sig_bucket; @@ -381,7 +411,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, } int32_t -rte_hash_lookup_with_hash(const struct rte_hash *h, +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);