NAT44: fix removal of LB static mappings with same local address and port pair (VPP...

[vpp.git] / src / vppinfra / bihash_48_8.h

diff --git a/src/vppinfra/bihash_48_8.h b/src/vppinfra/bihash_48_8.h
index 1a6e769..107bcac 100644 (file)
--- a/src/vppinfra/bihash_48_8.h
+++ b/src/vppinfra/bihash_48_8.h
@@ -14,13 +14,17 @@
  */
 
 #undef BIHASH_TYPE
+#undef BIHASH_KVP_CACHE_SIZE
+#undef BIHASH_KVP_PER_PAGE
 
 #define BIHASH_TYPE _48_8
 #define BIHASH_KVP_PER_PAGE 4
+#define BIHASH_KVP_CACHE_SIZE 2
 
 #ifndef __included_bihash_48_8_h__
 #define __included_bihash_48_8_h__
 
+#include <vppinfra/crc32.h>
 #include <vppinfra/heap.h>
 #include <vppinfra/format.h>
 #include <vppinfra/pool.h>
@@ -41,48 +45,17 @@ clib_bihash_is_free_48_8 (const clib_bihash_kv_48_8_t * v)
   return 0;
 }
 
-#if __SSE4_2__
-#ifndef __defined_crc_u32__
-#define __defined_crc_u32__
-static inline u32
-crc_u32 (u32 data, u32 value)
-{
-  __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data]
-                   "rm" (data));
-  return value;
-}
-#endif /* __defined_crc_u32__ */
-
 static inline u64
 clib_bihash_hash_48_8 (const clib_bihash_kv_48_8_t * v)
 {
-  const u32 *dp = (const u32 *) &v->key[0];
-  u32 value = 0;
-
-  value = crc_u32 (dp[0], value);
-  value = crc_u32 (dp[1], value);
-  value = crc_u32 (dp[2], value);
-  value = crc_u32 (dp[3], value);
-  value = crc_u32 (dp[4], value);
-  value = crc_u32 (dp[5], value);
-  value = crc_u32 (dp[6], value);
-  value = crc_u32 (dp[7], value);
-  value = crc_u32 (dp[8], value);
-  value = crc_u32 (dp[9], value);
-  value = crc_u32 (dp[10], value);
-  value = crc_u32 (dp[11], value);
-
-  return value;
-}
+#ifdef clib_crc32c_uses_intrinsics
+  return clib_crc32c ((u8 *) v->key, 48);
 #else
-static inline u64
-clib_bihash_hash_48_8 (const clib_bihash_kv_48_8_t * v)
-{
   u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2] ^ v->key[3] ^ v->key[4]
     ^ v->key[5];
   return clib_xxhash (tmp);
-}
 #endif
+}
 
 static inline u8 *
 format_bihash_kvp_48_8 (u8 * s, va_list * args)