hash: remove unnecessary pause

[dpdk.git] / lib / librte_hash / rte_fbk_hash.c

diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/librte_hash/rte_fbk_hash.c
index c342c0d..c9b470d 100644 (file)
--- a/lib/librte_hash/rte_fbk_hash.c
+++ b/lib/librte_hash/rte_fbk_hash.c
@@ -1,34 +1,5 @@
-/**
- *   BSD LICENSE
- *
- *   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
- *   are met:
- *
- *     * 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
- *       distribution.
- *     * 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
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdint.h>
@@ -39,7 +10,6 @@
 
 #include <sys/queue.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_malloc.h>
@@ -55,6 +25,11 @@
 
 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
  * the table if found.
@@ -72,13 +47,8 @@ rte_fbk_hash_find_existing(const char *name)
        struct rte_tailq_entry *te;
        struct rte_fbk_hash_list *fbk_hash_list;
 
-       /* check that we have an initialised tail queue */
-       if ((fbk_hash_list =
-                       RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH,
-                                       rte_fbk_hash_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       fbk_hash_list = RTE_TAILQ_CAST(rte_fbk_hash_tailq.head,
+                                      rte_fbk_hash_list);
 
        rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK);
        TAILQ_FOREACH(te, fbk_hash_list, next) {
@@ -114,14 +84,10 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
                        sizeof(*ht) + (sizeof(ht->t[0]) * params->entries);
        uint32_t i;
        struct rte_fbk_hash_list *fbk_hash_list;
+       rte_fbk_hash_fn default_hash_func = (rte_fbk_hash_fn)rte_jhash_1word;
 
-       /* check that we have an initialised tail queue */
-       if ((fbk_hash_list =
-                       RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH,
-                                       rte_fbk_hash_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return NULL;
-       }
+       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)) ||
@@ -145,8 +111,11 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
                if (strncmp(params->name, ht->name, RTE_FBK_HASH_NAMESIZE) == 0)
                        break;
        }
-       if (te != NULL)
+       ht = NULL;
+       if (te != NULL) {
+               rte_errno = EEXIST;
                goto exit;
+       }
 
        te = rte_zmalloc("FBK_HASH_TAILQ_ENTRY", sizeof(*te), 0);
        if (te == NULL) {
@@ -155,7 +124,7 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
        }
 
        /* Allocate memory for table. */
-       ht = (struct rte_fbk_hash_table *)rte_zmalloc_socket(hash_name, mem_size,
+       ht = 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");
@@ -163,6 +132,14 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
                goto exit;
        }
 
+       /* Default hash function */
+#if defined(RTE_ARCH_X86)
+       default_hash_func = (rte_fbk_hash_fn)rte_hash_crc_4byte;
+#elif defined(RTE_ARCH_ARM64)
+       if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32))
+               default_hash_func = (rte_fbk_hash_fn)rte_hash_crc_4byte;
+#endif
+
        /* Set up hash table context. */
        snprintf(ht->name, sizeof(ht->name), "%s", params->name);
        ht->entries = params->entries;
@@ -179,7 +156,7 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
                ht->init_val = params->init_val;
        }
        else {
-               ht->hash_func = RTE_FBK_HASH_FUNC_DEFAULT;
+               ht->hash_func = default_hash_func;
                ht->init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT;
        }
 
@@ -208,13 +185,8 @@ rte_fbk_hash_free(struct rte_fbk_hash_table *ht)
        if (ht == NULL)
                return;
 
-       /* check that we have an initialised tail queue */
-       if ((fbk_hash_list =
-                       RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH,
-                                       rte_fbk_hash_list)) == NULL) {
-               rte_errno = E_RTE_NO_TAILQ;
-               return;
-       }
+       fbk_hash_list = RTE_TAILQ_CAST(rte_fbk_hash_tailq.head,
+                                      rte_fbk_hash_list);
 
        rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
 
@@ -236,4 +208,3 @@ rte_fbk_hash_free(struct rte_fbk_hash_table *ht)
        rte_free(ht);
        rte_free(te);
 }
-