X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_hash%2Frte_fbk_hash.c;h=55c9f358319c01adf544cce3d8b6b9280128fe49;hb=490424e6c966b8a08b653ccd32c9d88e5a2716c1;hp=a19d33ca169afb28843c35d485e8e8c98cc9d0f7;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/librte_hash/rte_fbk_hash.c index a19d33ca16..55c9f35831 100644 --- a/lib/librte_hash/rte_fbk_hash.c +++ b/lib/librte_hash/rte_fbk_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 @@ -41,9 +40,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -51,26 +49,16 @@ #include #include #include +#include #include "rte_fbk_hash.h" -#include "rte_jhash.h" -#include "rte_hash_crc.h" - -TAILQ_HEAD(rte_fbk_hash_list, rte_fbk_hash_table); -/* global list of fbk_hashes (used for debug/dump) */ -static struct rte_fbk_hash_list *fbk_hash_list = NULL; - -/* macro to prevent duplication of list creation check code */ -#define CHECK_FBK_HASH_LIST_CREATED() do { \ - if (fbk_hash_list == NULL) \ - if ((fbk_hash_list = RTE_TAILQ_RESERVE("RTE_FBK_HASH", \ - rte_fbk_hash_list)) == NULL){ \ - rte_errno = E_RTE_NO_TAILQ; \ - return NULL; \ - } \ -} while (0) +TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry); +static struct rte_tailq_elem rte_fbk_hash_tailq = { + .name = "RTE_FBK_HASH", +}; +EAL_REGISTER_TAILQ(rte_fbk_hash_tailq) /** * Performs a lookup for an existing hash table, and returns a pointer to @@ -85,17 +73,24 @@ static struct rte_fbk_hash_list *fbk_hash_list = NULL; struct rte_fbk_hash_table * rte_fbk_hash_find_existing(const char *name) { - struct rte_fbk_hash_table *h; + struct rte_fbk_hash_table *h = NULL; + struct rte_tailq_entry *te; + struct rte_fbk_hash_list *fbk_hash_list; - /* check that we have an initialised tail queue */ - CHECK_FBK_HASH_LIST_CREATED(); + fbk_hash_list = RTE_TAILQ_CAST(rte_fbk_hash_tailq.head, + rte_fbk_hash_list); - TAILQ_FOREACH(h, fbk_hash_list, next) { + rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK); + TAILQ_FOREACH(te, fbk_hash_list, next) { + h = (struct rte_fbk_hash_table *) te->data; if (strncmp(name, h->name, RTE_FBK_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; } @@ -112,20 +107,16 @@ rte_fbk_hash_find_existing(const char *name) struct rte_fbk_hash_table * rte_fbk_hash_create(const struct rte_fbk_hash_params *params) { - struct rte_fbk_hash_table *ht; + struct rte_fbk_hash_table *ht = NULL; + struct rte_tailq_entry *te; char hash_name[RTE_FBK_HASH_NAMESIZE]; const uint32_t mem_size = sizeof(*ht) + (sizeof(ht->t[0]) * params->entries); uint32_t i; + struct rte_fbk_hash_list *fbk_hash_list; - /* check that we have access to create things in shared memory. */ - if (rte_eal_process_type() == RTE_PROC_SECONDARY){ - rte_errno = E_RTE_SECONDARY; - return NULL; - } - - /* check that we have an initialised tail queue */ - CHECK_FBK_HASH_LIST_CREATED(); + fbk_hash_list = RTE_TAILQ_CAST(rte_fbk_hash_tailq.head, + rte_fbk_hash_list); /* Error checking of parameters. */ if ((!rte_is_power_of_2(params->entries)) || @@ -134,29 +125,44 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) (params->entries_per_bucket == 0) || (params->entries_per_bucket > params->entries) || (params->entries > RTE_FBK_HASH_ENTRIES_MAX) || - (params->entries_per_bucket > RTE_FBK_HASH_ENTRIES_MAX)){ + (params->entries_per_bucket > RTE_FBK_HASH_ENTRIES_PER_BUCKET_MAX)){ rte_errno = EINVAL; return NULL; } - rte_snprintf(hash_name, sizeof(hash_name), "FBK_%s", params->name); + snprintf(hash_name, sizeof(hash_name), "FBK_%s", params->name); + + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); + + /* guarantee there's no existing */ + TAILQ_FOREACH(te, fbk_hash_list, next) { + ht = (struct rte_fbk_hash_table *) te->data; + if (strncmp(params->name, ht->name, RTE_FBK_HASH_NAMESIZE) == 0) + break; + } + ht = NULL; + if (te != NULL) { + rte_errno = EEXIST; + goto exit; + } + + te = rte_zmalloc("FBK_HASH_TAILQ_ENTRY", sizeof(*te), 0); + if (te == NULL) { + RTE_LOG(ERR, HASH, "Failed to allocate tailq entry\n"); + goto exit; + } /* Allocate memory for table. */ -#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) - return NULL; - ht = (struct rte_fbk_hash_table *)mz->addr; -#else - ht = (struct rte_fbk_hash_table *)rte_malloc(hash_name, mem_size, 0); - if (ht == NULL) - return NULL; -#endif - memset(ht, 0, mem_size); + ht = (struct rte_fbk_hash_table *)rte_zmalloc_socket(hash_name, mem_size, + 0, params->socket_id); + if (ht == NULL) { + RTE_LOG(ERR, HASH, "Failed to allocate fbk hash table\n"); + rte_free(te); + goto exit; + } /* Set up hash table context. */ - rte_snprintf(ht->name, sizeof(ht->name), "%s", params->name); + snprintf(ht->name, sizeof(ht->name), "%s", params->name); ht->entries = params->entries; ht->entries_per_bucket = params->entries_per_bucket; ht->used_entries = 0; @@ -175,15 +181,13 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) ht->init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT; } - if (ht->hash_func == rte_hash_crc_4byte && - !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."); - ht->hash_func = rte_jhash_1word; - } + te->data = (void *) ht; + + TAILQ_INSERT_TAIL(fbk_hash_list, te, next); + +exit: + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); - TAILQ_INSERT_TAIL(fbk_hash_list, ht, next); return ht; } @@ -196,14 +200,32 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) void rte_fbk_hash_free(struct rte_fbk_hash_table *ht) { + struct rte_tailq_entry *te; + struct rte_fbk_hash_list *fbk_hash_list; + if (ht == NULL) return; - /* No way to deallocate memzones - but can de-allocate from malloc */ -#if !defined(RTE_LIBRTE_HASH_USE_MEMZONE) - TAILQ_REMOVE(fbk_hash_list, ht, next); + + fbk_hash_list = RTE_TAILQ_CAST(rte_fbk_hash_tailq.head, + rte_fbk_hash_list); + + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); + + /* find out tailq entry */ + TAILQ_FOREACH(te, fbk_hash_list, next) { + if (te->data == (void *) ht) + break; + } + + if (te == NULL) { + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + return; + } + + TAILQ_REMOVE(fbk_hash_list, te, next); + + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + rte_free(ht); -#endif - RTE_SET_USED(ht); - return; + rte_free(te); } -