New upstream version 18.11-rc1

[deb_dpdk.git] / lib / librte_hash / rte_cuckoo_hash.h

diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h
index b43f467..5dfbbc4 100644 (file)
--- a/lib/librte_hash/rte_cuckoo_hash.h
+++ b/lib/librte_hash/rte_cuckoo_hash.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2016 Intel Corporation
+ * Copyright(c) 2018 Arm Limited
  */
 
 /* rte_cuckoo_hash.h
@@ -104,8 +105,6 @@ const rte_hash_cmp_eq_t cmp_jump_table[NUM_KEY_CMP_CASES] = {
 
 #define LCORE_CACHE_SIZE               64
 
-#define RTE_HASH_MAX_PUSHES             100
-
 #define RTE_HASH_BFS_QUEUE_MAX_LEN       1000
 
 #define RTE_XABORT_CUCKOO_PATH_INVALIDED 0x4
@@ -125,25 +124,24 @@ struct rte_hash_key {
        };
        /* Variable key size */
        char key[0];
-} __attribute__((aligned(KEY_ALIGNMENT)));
+};
 
 /* All different signature compare functions */
 enum rte_hash_sig_compare_function {
        RTE_HASH_COMPARE_SCALAR = 0,
        RTE_HASH_COMPARE_SSE,
-       RTE_HASH_COMPARE_AVX2,
        RTE_HASH_COMPARE_NUM
 };
 
 /** Bucket structure */
 struct rte_hash_bucket {
-       hash_sig_t sig_current[RTE_HASH_BUCKET_ENTRIES];
+       uint16_t sig_current[RTE_HASH_BUCKET_ENTRIES];
 
        uint32_t key_idx[RTE_HASH_BUCKET_ENTRIES];
 
-       hash_sig_t sig_alt[RTE_HASH_BUCKET_ENTRIES];
-
        uint8_t flag[RTE_HASH_BUCKET_ENTRIES];
+
+       void *next;
 } __rte_cache_aligned;
 
 /** A hash table structure. */
@@ -164,10 +162,23 @@ struct rte_hash {
        /**< Length of hash key. */
        uint8_t hw_trans_mem_support;
        /**< If hardware transactional memory is used. */
-       uint8_t multi_writer_support;
-       /**< If multi-writer support is enabled. */
+       uint8_t use_local_cache;
+       /**< If multi-writer support is enabled, use local cache
+        * to allocate key-store slots.
+        */
        uint8_t readwrite_concur_support;
        /**< If read-write concurrency support is enabled */
+       uint8_t ext_table_support;     /**< Enable extendable bucket table */
+       uint8_t no_free_on_del;
+       /**< If key index should be freed on calling rte_hash_del_xxx APIs.
+        * If this is set, rte_hash_free_key_with_position must be called to
+        * free the key index associated with the deleted entry.
+        * This flag is enabled by default.
+        */
+       uint8_t readwrite_concur_lf_support;
+       /**< If read-write concurrency lock free support is enabled */
+       uint8_t writer_takes_lock;
+       /**< Indicates if the writer threads need to take lock */
        rte_hash_function hash_func;    /**< Function used to calculate hash. */
        uint32_t hash_func_init_val;    /**< Init value used by hash_func. */
        rte_hash_cmp_eq_t rte_hash_custom_cmp_eq;
@@ -186,10 +197,15 @@ struct rte_hash {
         * to the key table.
         */
        rte_rwlock_t *readwrite_lock; /**< Read-write lock thread-safety. */
+       struct rte_hash_bucket *buckets_ext; /**< Extra buckets array */
+       struct rte_ring *free_ext_bkts; /**< Ring of indexes of free buckets */
+       uint32_t *tbl_chng_cnt;
+       /**< Indicates if the hash table changed from last read. */
 } __rte_cache_aligned;
 
 struct queue_node {
        struct rte_hash_bucket *bkt; /* Current bucket on the bfs search */
+       uint32_t cur_bkt_idx;
 
        struct queue_node *prev;     /* Parent(bucket) in search path */
        int prev_slot;               /* Parent(slot) in search path */