net: fix how L4 checksum choice is tested

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

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index 4fcf548..51198b4 100644 (file)
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -381,7 +381,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
                default_hash_func = (rte_hash_function)rte_hash_crc;
 #endif
        /* Setup hash context */
-       snprintf(h->name, sizeof(h->name), "%s", params->name);
+       strlcpy(h->name, params->name, sizeof(h->name));
        h->entries = params->entries;
        h->key_len = params->key_len;
        h->key_entry_size = key_entry_size;
@@ -1583,18 +1583,23 @@ rte_hash_get_key_with_position(const struct rte_hash *h, const int32_t position,
        return 0;
 }
 
-int __rte_experimental
+int
 rte_hash_free_key_with_position(const struct rte_hash *h,
                                const int32_t position)
 {
-       RETURN_IF_TRUE(((h == NULL) || (position == EMPTY_SLOT)), -EINVAL);
+       /* Key index where key is stored, adding the first dummy index */
+       uint32_t key_idx = position + 1;
+
+       RETURN_IF_TRUE(((h == NULL) || (key_idx == EMPTY_SLOT)), -EINVAL);
 
        unsigned int lcore_id, n_slots;
        struct lcore_cache *cached_free_slots;
-       const int32_t total_entries = h->num_buckets * RTE_HASH_BUCKET_ENTRIES;
+       const uint32_t total_entries = h->use_local_cache ?
+               h->entries + (RTE_MAX_LCORE - 1) * (LCORE_CACHE_SIZE - 1) + 1
+                                                       : h->entries + 1;
 
        /* Out of bounds */
-       if (position >= total_entries)
+       if (key_idx >= total_entries)
                return -EINVAL;
        if (h->ext_table_support && h->readwrite_concur_lf_support) {
                uint32_t index = h->ext_bkt_to_free[position];
@@ -1619,11 +1624,11 @@ rte_hash_free_key_with_position(const struct rte_hash *h,
                }
                /* Put index of new free slot in cache. */
                cached_free_slots->objs[cached_free_slots->len] =
-                                       (void *)((uintptr_t)position);
+                                       (void *)((uintptr_t)key_idx);
                cached_free_slots->len++;
        } else {
                rte_ring_sp_enqueue(h->free_slots,
-                               (void *)((uintptr_t)position));
+                               (void *)((uintptr_t)key_idx));
        }
 
        return 0;
@@ -1656,7 +1661,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
 #elif defined(RTE_MACHINE_CPUFLAG_NEON)
        case RTE_HASH_COMPARE_NEON: {
                uint16x8_t vmat, vsig, x;
-               uint64x2_t x64;
                int16x8_t shift = {-15, -13, -11, -9, -7, -5, -3, -1};
 
                vsig = vld1q_dup_u16((uint16_t const *)&sig);
@@ -1664,16 +1668,13 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
                vmat = vceqq_u16(vsig,
                        vld1q_u16((uint16_t const *)prim_bkt->sig_current));
                x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
-               x64 = vpaddlq_u32(vpaddlq_u16(x));
-               *prim_hash_matches = (uint32_t)(vgetq_lane_u64(x64, 0) +
-                       vgetq_lane_u64(x64, 1));
+               *prim_hash_matches = (uint32_t)(vaddvq_u16(x));
                /* Compare all signatures in the secondary bucket */
                vmat = vceqq_u16(vsig,
                        vld1q_u16((uint16_t const *)sec_bkt->sig_current));
                x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
-               x64 = vpaddlq_u32(vpaddlq_u16(x));
-               *sec_hash_matches = (uint32_t)(vgetq_lane_u64(x64, 0) +
-                       vgetq_lane_u64(x64, 1)); }
+               *sec_hash_matches = (uint32_t)(vaddvq_u16(x));
+               }
                break;
 #endif
        default: