From 302b25a00ed913767798d58148ef4d36092ee490 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 19 Oct 2020 13:23:33 +0000 Subject: ipsec: Add to the SA info directly in the bihash Type: improvement this save the cache miss on the protect structure. Signed-off-by: Neale Ranns Change-Id: I867d5e49df5edfd6b368f17a34747f32840080e4 --- src/vppinfra/bihash_24_16.h | 102 +++++++++++++++++++++++++++++++++++++++++ src/vppinfra/bihash_8_16.h | 109 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 211 insertions(+) create mode 100644 src/vppinfra/bihash_24_16.h create mode 100644 src/vppinfra/bihash_8_16.h (limited to 'src/vppinfra') diff --git a/src/vppinfra/bihash_24_16.h b/src/vppinfra/bihash_24_16.h new file mode 100644 index 00000000000..4e979b49410 --- /dev/null +++ b/src/vppinfra/bihash_24_16.h @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#undef BIHASH_TYPE +#undef BIHASH_KVP_PER_PAGE +#undef BIHASH_32_64_SVM +#undef BIHASH_ENABLE_STATS +#undef BIHASH_KVP_AT_BUCKET_LEVEL +#undef BIHASH_LAZY_INSTANTIATE +#undef BIHASH_BUCKET_PREFETCH_CACHE_LINES +#undef BIHASH_USE_HEAP + +#define BIHASH_TYPE _24_16 +#define BIHASH_KVP_PER_PAGE 4 +#define BIHASH_KVP_AT_BUCKET_LEVEL 0 +#define BIHASH_LAZY_INSTANTIATE 1 +#define BIHASH_BUCKET_PREFETCH_CACHE_LINES 1 +#define BIHASH_USE_HEAP 1 + +#ifndef __included_bihash_24_16_h__ +#define __included_bihash_24_16_h__ + +#include +#include +#include +#include +#include + +typedef struct +{ + u64 key[3]; + u64 value[2]; +} clib_bihash_kv_24_16_t; + +static inline int +clib_bihash_is_free_24_16 (const clib_bihash_kv_24_16_t * v) +{ + /* Free values are clib_memset to 0xff, check a bit... */ + if (v->key[0] == ~0ULL && v->value[0] == ~0ULL && v->value[1] == ~0ULL) + return 1; + return 0; +} + +static inline u64 +clib_bihash_hash_24_16 (const clib_bihash_kv_24_16_t * v) +{ +#ifdef clib_crc32c_uses_intrinsics + return clib_crc32c ((u8 *) v->key, 24); +#else + u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2]; + return clib_xxhash (tmp); +#endif +} + +static inline u8 * +format_bihash_kvp_24_16 (u8 * s, va_list * args) +{ + clib_bihash_kv_24_16_t *v = va_arg (*args, clib_bihash_kv_24_16_t *); + + s = format (s, "key %llu %llu %llu value %llu %llu", + v->key[0], v->key[1], v->key[2], v->value[0], v->value[1]); + return s; +} + +static inline int +clib_bihash_key_compare_24_16 (u64 * a, u64 * b) +{ +#if defined (CLIB_HAVE_VEC512) + u64x8 v = u64x8_load_unaligned (a) ^ u64x8_load_unaligned (b); + return (u64x8_is_zero_mask (v) & 0x7) == 0; +#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_UNALIGNED_LOAD_STORE) + u64x2 v = { a[2] ^ b[2], 0 }; + v |= u64x2_load_unaligned (a) ^ u64x2_load_unaligned (b); + return u64x2_is_all_zero (v); +#else + return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0; +#endif +} + +#undef __included_bihash_template_h__ +#include + +#endif /* __included_bihash_24_16_h__ */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vppinfra/bihash_8_16.h b/src/vppinfra/bihash_8_16.h new file mode 100644 index 00000000000..b42b32c33d2 --- /dev/null +++ b/src/vppinfra/bihash_8_16.h @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#undef BIHASH_TYPE +#undef BIHASH_KVP_PER_PAGE +#undef BIHASH_32_64_SVM +#undef BIHASH_ENABLE_STATS +#undef BIHASH_KVP_AT_BUCKET_LEVEL +#undef BIHASH_LAZY_INSTANTIATE +#undef BIHASH_BUCKET_PREFETCH_CACHE_LINES +#undef BIHASH_USE_HEAP + +#define BIHASH_TYPE _8_16 +#define BIHASH_KVP_PER_PAGE 7 +#define BIHASH_KVP_AT_BUCKET_LEVEL 1 +#define BIHASH_LAZY_INSTANTIATE 0 +#define BIHASH_BUCKET_PREFETCH_CACHE_LINES 2 +#define BIHASH_USE_HEAP 1 + +#ifndef __included_bihash_8_16_h__ +#define __included_bihash_8_16_h__ + +#include +#include +#include +#include +#include + +/** 8 octet key, 8 octet key value pair */ +typedef struct +{ + u64 key; /**< the key */ + u64 value[2]; /**< the value */ +} clib_bihash_kv_8_16_t; + +/** Decide if a clib_bihash_kv_8_16_t instance is free + @param v- pointer to the (key,value) pair +*/ +static inline int +clib_bihash_is_free_8_16 (clib_bihash_kv_8_16_t * v) +{ + if (v->key == ~0ULL && v->value[0] == ~0ULL && v->value[1] == ~0ULL) + return 1; + return 0; +} + +/** Hash a clib_bihash_kv_8_16_t instance + @param v - pointer to the (key,value) pair, hash the key (only) +*/ +static inline u64 +clib_bihash_hash_8_16 (clib_bihash_kv_8_16_t * v) +{ + /* Note: to torture-test linear scan, make this fn return a constant */ +#ifdef clib_crc32c_uses_intrinsics + return clib_crc32c ((u8 *) & v->key, 8); +#else + return clib_xxhash (v->key); +#endif +} + +/** Format a clib_bihash_kv_8_16_t instance + @param s - u8 * vector under construction + @param args (vararg) - the (key,value) pair to format + @return s - the u8 * vector under construction +*/ +static inline u8 * +format_bihash_kvp_8_16 (u8 * s, va_list * args) +{ + clib_bihash_kv_8_16_t *v = va_arg (*args, clib_bihash_kv_8_16_t *); + + s = + format (s, "key %llu value [%ll,%llx]u", v->key, v->value[0], + v->value[1]); + return s; +} + +/** Compare two clib_bihash_kv_8_16_t instances + @param a - first key + @param b - second key +*/ +static inline int +clib_bihash_key_compare_8_16 (u64 a, u64 b) +{ + return a == b; +} + +#undef __included_bihash_template_h__ +#include + +#endif /* __included_bihash_8_16_h__ */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg