X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fbihash_template.c;h=38354a129921d942925562e8ba037f1b39a2e49e;hb=51f1b26e85a758338b13bacfdf4ba9e7d7cb7f8f;hp=89bfc8b6b56acc675f369e55e837a8d8c07c998d;hpb=16e4a4a0ae39ebc1ded1b6dba2799b176aee1828;p=vpp.git diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c index 89bfc8b6b56..38354a12992 100644 --- a/src/vppinfra/bihash_template.c +++ b/src/vppinfra/bihash_template.c @@ -19,13 +19,81 @@ #define MAP_HUGE_SHIFT 26 #endif +#ifndef BIIHASH_MIN_ALLOC_LOG2_PAGES +#define BIIHASH_MIN_ALLOC_LOG2_PAGES 10 +#endif + +#ifndef BIHASH_USE_HEAP +#define BIHASH_USE_HEAP 1 +#endif + static inline void *BV (alloc_aligned) (BVT (clib_bihash) * h, uword nbytes) { uword rv; /* Round to an even number of cache lines */ - nbytes += CLIB_CACHE_LINE_BYTES - 1; - nbytes &= ~(CLIB_CACHE_LINE_BYTES - 1); + nbytes = round_pow2 (nbytes, CLIB_CACHE_LINE_BYTES); + + if (BIHASH_USE_HEAP) + { + void *rv, *oldheap; + uword page_sz = sizeof (BVT (clib_bihash_value)); + uword chunk_sz = round_pow2 (page_sz << BIIHASH_MIN_ALLOC_LOG2_PAGES, + CLIB_CACHE_LINE_BYTES); + + BVT (clib_bihash_alloc_chunk) * chunk = h->chunks; + + /* if there is enough space in the currenrt chunk */ + if (chunk && chunk->bytes_left >= nbytes) + { + rv = chunk->next_alloc; + chunk->bytes_left -= nbytes; + chunk->next_alloc += nbytes; + return rv; + } + + /* requested allocation is bigger than chunk size */ + if (nbytes >= chunk_sz) + { + oldheap = clib_mem_set_heap (h->heap); + chunk = clib_mem_alloc_aligned (nbytes + sizeof (*chunk), + CLIB_CACHE_LINE_BYTES); + clib_mem_set_heap (oldheap); + clib_memset_u8 (chunk, 0, sizeof (*chunk)); + chunk->size = nbytes; + rv = (u8 *) (chunk + 1); + if (h->chunks) + { + /* take 2nd place in the list */ + chunk->next = h->chunks->next; + chunk->prev = h->chunks; + h->chunks->next = chunk; + if (chunk->next) + chunk->next->prev = chunk; + } + else + h->chunks = chunk; + + return rv; + } + + oldheap = clib_mem_set_heap (h->heap); + chunk = clib_mem_alloc_aligned (chunk_sz + sizeof (*chunk), + CLIB_CACHE_LINE_BYTES); + clib_mem_set_heap (oldheap); + chunk->size = chunk_sz; + chunk->bytes_left = chunk_sz; + chunk->next_alloc = (u8 *) (chunk + 1); + chunk->next = h->chunks; + chunk->prev = 0; + if (chunk->next) + chunk->next->prev = chunk; + h->chunks = chunk; + rv = chunk->next_alloc; + chunk->bytes_left -= nbytes; + chunk->next_alloc += nbytes; + return rv; + } rv = alloc_arena_next (h); alloc_arena_next (h) += nbytes; @@ -38,7 +106,7 @@ static inline void *BV (alloc_aligned) (BVT (clib_bihash) * h, uword nbytes) void *base, *rv; uword alloc = alloc_arena_next (h) - alloc_arena_mapped (h); int mmap_flags = MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS; - int mmap_flags_huge = (mmap_flags | MAP_HUGETLB | + int mmap_flags_huge = (mmap_flags | MAP_HUGETLB | MAP_LOCKED | BIHASH_LOG2_HUGEPAGE_SIZE << MAP_HUGE_SHIFT); /* new allocation is 25% of existing one */ @@ -53,7 +121,7 @@ static inline void *BV (alloc_aligned) (BVT (clib_bihash) * h, uword nbytes) rv = mmap (base, alloc, PROT_READ | PROT_WRITE, mmap_flags_huge, -1, 0); /* fallback - maybe we are still able to allocate normal pages */ - if (rv == MAP_FAILED) + if (rv == MAP_FAILED || mlock (base, alloc) != 0) rv = mmap (base, alloc, PROT_READ | PROT_WRITE, mmap_flags, -1, 0); if (rv == MAP_FAILED) @@ -69,13 +137,22 @@ static void BV (clib_bihash_instantiate) (BVT (clib_bihash) * h) { uword bucket_size; - alloc_arena (h) = clib_mem_vm_reserve (0, h->memory_size, - BIHASH_LOG2_HUGEPAGE_SIZE); - if (alloc_arena (h) == ~0) - os_out_of_memory (); - alloc_arena_next (h) = 0; - alloc_arena_size (h) = h->memory_size; - alloc_arena_mapped (h) = 0; + if (BIHASH_USE_HEAP) + { + h->heap = clib_mem_get_heap (); + h->chunks = 0; + alloc_arena (h) = (uword) clib_mem_get_heap_base (h->heap); + } + else + { + alloc_arena (h) = clib_mem_vm_reserve (0, h->memory_size, + BIHASH_LOG2_HUGEPAGE_SIZE); + if (alloc_arena (h) == ~0) + os_out_of_memory (); + alloc_arena_next (h) = 0; + alloc_arena_size (h) = h->memory_size; + alloc_arena_mapped (h) = 0; + } bucket_size = h->nbuckets * sizeof (h->buckets[0]); @@ -84,29 +161,34 @@ static void BV (clib_bihash_instantiate) (BVT (clib_bihash) * h) h->nbuckets * BIHASH_KVP_PER_PAGE * sizeof (BVT (clib_bihash_kv)); h->buckets = BV (alloc_aligned) (h, bucket_size); + clib_memset_u8 (h->buckets, 0, bucket_size); if (BIHASH_KVP_AT_BUCKET_LEVEL) { - int i; + int i, j; BVT (clib_bihash_bucket) * b; b = h->buckets; for (i = 0; i < h->nbuckets; i++) { + BVT (clib_bihash_kv) * v; b->offset = BV (clib_bihash_get_offset) (h, (void *) (b + 1)); b->refcnt = 1; /* Mark all elements free */ - clib_memset ((b + 1), 0xff, - BIHASH_KVP_PER_PAGE * sizeof (BVT (clib_bihash_kv))); - + v = (void *) (b + 1); + for (j = 0; j < BIHASH_KVP_PER_PAGE; j++) + { + BV (clib_bihash_mark_free) (v); + v++; + } /* Compute next bucket start address */ b = (void *) (((uword) b) + sizeof (*b) + (BIHASH_KVP_PER_PAGE * sizeof (BVT (clib_bihash_kv)))); } } - CLIB_MEMORY_BARRIER (); + CLIB_MEMORY_STORE_BARRIER (); h->instantiated = 1; } @@ -121,9 +203,11 @@ void BV (clib_bihash_init2) (BVT (clib_bihash_init2_args) * a) h->name = (u8 *) a->name; h->nbuckets = a->nbuckets; h->log2_nbuckets = max_log2 (a->nbuckets); - h->memory_size = a->memory_size; + h->memory_size = BIHASH_USE_HEAP ? 0 : a->memory_size; h->instantiated = 0; - h->fmt_fn = a->fmt_fn; + h->dont_add_to_all_bihash_list = a->dont_add_to_all_bihash_list; + h->fmt_fn = BV (format_bihash); + h->kvp_fmt_fn = a->kvp_fmt_fn; alloc_arena (h) = 0; @@ -133,7 +217,8 @@ void BV (clib_bihash_init2) (BVT (clib_bihash_init2_args) * a) * If someone starts complaining that's not enough, we can shift * the offset by CLIB_LOG2_CACHE_LINE_BYTES... */ - ASSERT (h->memory_size < (1ULL << BIHASH_BUCKET_OFFSET_BITS)); + if (BIHASH_USE_HEAP) + ASSERT (h->memory_size < (1ULL << BIHASH_BUCKET_OFFSET_BITS)); /* Add this hash table to the list */ if (a->dont_add_to_all_bihash_list == 0) @@ -184,7 +269,7 @@ void BV (clib_bihash_init) #define MFD_ALLOW_SEALING 0x0002U #endif -void BV (clib_bihash_master_init_svm) +void BV (clib_bihash_initiator_init_svm) (BVT (clib_bihash) * h, char *name, u32 nbuckets, u64 memory_size) { uword bucket_size; @@ -192,9 +277,11 @@ void BV (clib_bihash_master_init_svm) vec_header_t *freelist_vh; int fd; + ASSERT (BIHASH_USE_HEAP == 0); + ASSERT (memory_size < (1ULL << 32)); /* Set up for memfd sharing */ - if ((fd = memfd_create (name, MFD_ALLOW_SEALING)) == -1) + if ((fd = clib_mem_vm_create_fd (CLIB_MEM_PAGE_SZ_DEFAULT, name) == -1) { clib_unix_warning ("memfd_create"); return; @@ -233,6 +320,7 @@ void BV (clib_bihash_master_init_svm) bucket_size = nbuckets * sizeof (h->buckets[0]); h->buckets = BV (alloc_aligned) (h, bucket_size); + clib_memset_u8 (h->buckets, 0, bucket_size); h->sh->buckets_as_u64 = (u64) BV (clib_bihash_get_offset) (h, h->buckets); h->alloc_lock = BV (alloc_aligned) (h, CLIB_CACHE_LINE_BYTES); @@ -249,17 +337,20 @@ void BV (clib_bihash_master_init_svm) (u64) BV (clib_bihash_get_offset) (h, freelist_vh->vector_data); h->freelists = (void *) (freelist_vh->vector_data); - h->fmt_fn = NULL; + h->fmt_fn = BV (format_bihash); + h->kvp_fmt_fn = NULL; h->instantiated = 1; } -void BV (clib_bihash_slave_init_svm) +void BV (clib_bihash_responder_init_svm) (BVT (clib_bihash) * h, char *name, int fd) { u8 *mmap_addr; u64 memory_size; BVT (clib_bihash_shared_header) * sh; + ASSERT (BIHASH_USE_HEAP == 0); + /* Trial mapping, to learn the segment size */ mmap_addr = mmap (0, 4096, PROT_READ, MAP_SHARED, fd, 0 /* offset */ ); if (mmap_addr == MAP_FAILED) @@ -297,14 +388,20 @@ void BV (clib_bihash_slave_init_svm) h->alloc_lock = BV (clib_bihash_get_value) (h, h->sh->alloc_lock_as_u64); h->freelists = BV (clib_bihash_get_value) (h, h->sh->freelists_as_u64); - h->fmt_fn = NULL; + h->fmt_fn = BV (format_bihash); + h->kvp_fmt_fn = NULL; } #endif /* BIHASH_32_64_SVM */ void BV (clib_bihash_set_kvp_format_fn) (BVT (clib_bihash) * h, - format_function_t * fmt_fn) + format_function_t * kvp_fmt_fn) +{ + h->kvp_fmt_fn = kvp_fmt_fn; +} + +int BV (clib_bihash_is_initialised) (const BVT (clib_bihash) * h) { - h->fmt_fn = fmt_fn; + return (h->instantiated != 0); } void BV (clib_bihash_free) (BVT (clib_bihash) * h) @@ -315,17 +412,41 @@ void BV (clib_bihash_free) (BVT (clib_bihash) * h) goto never_initialized; h->instantiated = 0; + + if (BIHASH_USE_HEAP) + { + BVT (clib_bihash_alloc_chunk) * next, *chunk; + void *oldheap = clib_mem_set_heap (h->heap); + + chunk = h->chunks; + while (chunk) + { + next = chunk->next; + clib_mem_free (chunk); + chunk = next; + } + clib_mem_set_heap (oldheap); + } + vec_free (h->working_copies); vec_free (h->working_copy_lengths); + clib_mem_free ((void *) h->alloc_lock); #if BIHASH_32_64_SVM == 0 vec_free (h->freelists); #else if (h->memfd > 0) (void) close (h->memfd); #endif - clib_mem_vm_free ((void *) (uword) (alloc_arena (h)), alloc_arena_size (h)); + if (BIHASH_USE_HEAP == 0) + clib_mem_vm_free ((void *) (uword) (alloc_arena (h)), + alloc_arena_size (h)); never_initialized: - clib_memset (h, 0, sizeof (*h)); + if (h->dont_add_to_all_bihash_list) + { + clib_memset_u8 (h, 0, sizeof (*h)); + return; + } + clib_memset_u8 (h, 0, sizeof (*h)); for (i = 0; i < vec_len (clib_all_bihashes); i++) { if ((void *) h == clib_all_bihashes[i]) @@ -342,6 +463,7 @@ static BVT (clib_bihash_value) * BV (value_alloc) (BVT (clib_bihash) * h, u32 log2_pages) { + int i; BVT (clib_bihash_value) * rv = 0; ASSERT (h->alloc_lock[0]); @@ -361,12 +483,15 @@ BV (value_alloc) (BVT (clib_bihash) * h, u32 log2_pages) initialize: ASSERT (rv); - /* - * Latest gcc complains that the length arg is zero - * if we replace (1<freelists) > log2_pages); + if (BIHASH_USE_HEAP && log2_pages >= BIIHASH_MIN_ALLOC_LOG2_PAGES) + { + /* allocations bigger or equal to chunk size always contain single + * alloc and they can be given back to heap */ + void *oldheap; + BVT (clib_bihash_alloc_chunk) * c; + c = (BVT (clib_bihash_alloc_chunk) *) v - 1; + + if (c->prev) + c->prev->next = c->next; + else + h->chunks = c->next; + + if (c->next) + c->next->prev = c->prev; + + oldheap = clib_mem_set_heap (h->heap); + clib_mem_free (c); + clib_mem_set_heap (oldheap); + return; + } + if (CLIB_DEBUG > 0) - clib_memset (v, 0xFE, sizeof (*v) * (1 << log2_pages)); + clib_memset_u8 (v, 0xFE, sizeof (*v) * (1 << log2_pages)); v->next_free_as_u64 = (u64) h->freelists[log2_pages]; h->freelists[log2_pages] = (u64) BV (clib_bihash_get_offset) (h, v); @@ -433,7 +580,7 @@ BV (make_working_copy) (BVT (clib_bihash) * h, BVT (clib_bihash_bucket) * b) clib_memcpy_fast (working_copy, v, sizeof (*v) * (1 << b->log2_pages)); working_bucket.as_u64 = b->as_u64; working_bucket.offset = BV (clib_bihash_get_offset) (h, working_copy); - CLIB_MEMORY_BARRIER (); + CLIB_MEMORY_STORE_BARRIER (); b->as_u64 = working_bucket.as_u64; h->working_copies[thread_index] = working_copy; } @@ -463,8 +610,7 @@ BV (split_and_rehash) /* rehash the item onto its new home-page */ new_hash = BV (clib_bihash_hash) (&(old_values->kvp[i])); - new_hash >>= h->log2_nbuckets; - new_hash &= (1 << new_log2_pages) - 1; + new_hash = extract_bits (new_hash, h->log2_nbuckets, new_log2_pages); new_v = &new_values[new_hash]; /* Across the new home-page */ @@ -534,19 +680,28 @@ BV (split_and_rehash_linear) return new_values; } -static inline int BV (clib_bihash_add_del_inline) - (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, int is_add, - int (*is_stale_cb) (BVT (clib_bihash_kv) *, void *), void *arg) +static_always_inline int BV (clib_bihash_add_del_inline_with_hash) ( + BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, u64 hash, int is_add, + int (*is_stale_cb) (BVT (clib_bihash_kv) *, void *), void *is_stale_arg, + void (*overwrite_cb) (BVT (clib_bihash_kv) *, void *), void *overwrite_arg) { BVT (clib_bihash_bucket) * b, tmp_b; BVT (clib_bihash_value) * v, *new_v, *save_new_v, *working_copy; int i, limit; - u64 hash, new_hash; + u64 new_hash; u32 new_log2_pages, old_log2_pages; u32 thread_index = os_get_thread_index (); int mark_bucket_linear; int resplit_once; + /* *INDENT-OFF* */ + static const BVT (clib_bihash_bucket) mask = { + .linear_search = 1, + .log2_pages = -1 + }; + /* *INDENT-ON* */ + +#if BIHASH_LAZY_INSTANTIATE /* * Create the table (is_add=1,2), or flunk the request now (is_add=0) * Use the alloc_lock to protect the instantiate operation. @@ -561,13 +716,19 @@ static inline int BV (clib_bihash_add_del_inline) BV (clib_bihash_instantiate) (h); BV (clib_bihash_alloc_unlock) (h); } +#else + /* Debug image: make sure the table has been instantiated */ + ASSERT (h->instantiated != 0); +#endif - hash = BV (clib_bihash_hash) (add_v); + /* + * Debug image: make sure that an item being added doesn't accidentally + * look like a free item. + */ + ASSERT ((is_add && BV (clib_bihash_is_free) (add_v)) == 0); b = BV (clib_bihash_get_bucket) (h, hash); - hash >>= h->log2_nbuckets; - BV (clib_bihash_lock_bucket) (b); /* First elt in the bucket? */ @@ -587,7 +748,7 @@ static inline int BV (clib_bihash_add_del_inline) tmp_b.as_u64 = 0; /* clears bucket lock */ tmp_b.offset = BV (clib_bihash_get_offset) (h, v); tmp_b.refcnt = 1; - CLIB_MEMORY_BARRIER (); + CLIB_MEMORY_STORE_BARRIER (); b->as_u64 = tmp_b.as_u64; /* unlocks the bucket */ BV (clib_bihash_increment_stat) (h, BIHASH_STAT_alloc_add, 1); @@ -599,9 +760,13 @@ static inline int BV (clib_bihash_add_del_inline) limit = BIHASH_KVP_PER_PAGE; v = BV (clib_bihash_get_value) (h, b->offset); - v += (b->linear_search == 0) ? hash & ((1 << b->log2_pages) - 1) : 0; - if (b->linear_search) - limit <<= b->log2_pages; + if (PREDICT_FALSE (b->as_u64 & mask.as_u64)) + { + if (PREDICT_FALSE (b->linear_search)) + limit <<= b->log2_pages; + else + v += extract_bits (hash, h->log2_nbuckets, b->log2_pages); + } if (is_add) { @@ -618,6 +783,8 @@ static inline int BV (clib_bihash_add_del_inline) */ for (i = 0; i < limit; i++) { + if (BV (clib_bihash_is_free) (&(v->kvp[i]))) + continue; if (BV (clib_bihash_key_compare) (v->kvp[i].key, add_v->key)) { /* Add but do not overwrite? */ @@ -626,9 +793,10 @@ static inline int BV (clib_bihash_add_del_inline) BV (clib_bihash_unlock_bucket) (b); return (-2); } - - CLIB_MEMORY_BARRIER (); /* Add a delay */ - clib_memcpy_fast (&(v->kvp[i]), add_v, sizeof (*add_v)); + if (overwrite_cb) + overwrite_cb (&(v->kvp[i]), overwrite_arg); + clib_memcpy_fast (&(v->kvp[i].value), + &add_v->value, sizeof (add_v->value)); BV (clib_bihash_unlock_bucket) (b); BV (clib_bihash_increment_stat) (h, BIHASH_STAT_replace, 1); return (0); @@ -647,7 +815,7 @@ static inline int BV (clib_bihash_add_del_inline) */ clib_memcpy_fast (&(v->kvp[i].value), &add_v->value, sizeof (add_v->value)); - CLIB_MEMORY_BARRIER (); /* Make sure the value has settled */ + CLIB_MEMORY_STORE_BARRIER (); /* Make sure the value has settled */ clib_memcpy_fast (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)); b->refcnt++; @@ -662,10 +830,10 @@ static inline int BV (clib_bihash_add_del_inline) { for (i = 0; i < limit; i++) { - if (is_stale_cb (&(v->kvp[i]), arg)) + if (is_stale_cb (&(v->kvp[i]), is_stale_arg)) { - CLIB_MEMORY_BARRIER (); clib_memcpy_fast (&(v->kvp[i]), add_v, sizeof (*add_v)); + CLIB_MEMORY_STORE_BARRIER (); BV (clib_bihash_unlock_bucket) (b); BV (clib_bihash_increment_stat) (h, BIHASH_STAT_replace, 1); return (0); @@ -678,10 +846,13 @@ static inline int BV (clib_bihash_add_del_inline) { for (i = 0; i < limit; i++) { + /* no sense even looking at this one */ + if (BV (clib_bihash_is_free) (&(v->kvp[i]))) + continue; /* Found the key? Kill it... */ if (BV (clib_bihash_key_compare) (v->kvp[i].key, add_v->key)) { - clib_memset (&(v->kvp[i]), 0xff, sizeof (*(add_v))); + BV (clib_bihash_mark_free) (&(v->kvp[i])); /* Is the bucket empty? */ if (PREDICT_TRUE (b->refcnt > 1)) { @@ -696,14 +867,20 @@ static inline int BV (clib_bihash_add_del_inline) b->linear_search = 0; b->log2_pages = 0; /* Clean up the bucket-level kvp array */ - clib_memset - ((b + 1), 0xff, - BIHASH_KVP_PER_PAGE * sizeof (BVT (clib_bihash_kv))); + BVT (clib_bihash_kv) *v = (void *) (b + 1); + int j; + for (j = 0; j < BIHASH_KVP_PER_PAGE; j++) + { + BV (clib_bihash_mark_free) (v); + v++; + } + CLIB_MEMORY_STORE_BARRIER (); BV (clib_bihash_unlock_bucket) (b); BV (clib_bihash_increment_stat) (h, BIHASH_STAT_del, 1); goto free_backing_store; } + CLIB_MEMORY_STORE_BARRIER (); BV (clib_bihash_unlock_bucket) (b); BV (clib_bihash_increment_stat) (h, BIHASH_STAT_del, 1); return (0); @@ -712,7 +889,6 @@ static inline int BV (clib_bihash_add_del_inline) { /* Save old bucket value, need log2_pages to free it */ tmp_b.as_u64 = b->as_u64; - CLIB_MEMORY_BARRIER (); /* Kill and unlock the bucket */ b->as_u64 = 0; @@ -783,9 +959,8 @@ static inline int BV (clib_bihash_add_del_inline) limit = BIHASH_KVP_PER_PAGE; if (mark_bucket_linear) limit <<= new_log2_pages; - new_hash >>= h->log2_nbuckets; - new_hash &= (1 << new_log2_pages) - 1; - new_v += mark_bucket_linear ? 0 : new_hash; + else + new_v += extract_bits (new_hash, h->log2_nbuckets, new_log2_pages); for (i = 0; i < limit; i++) { @@ -818,7 +993,7 @@ expand_ok: tmp_b.refcnt = h->saved_bucket.refcnt + 1; ASSERT (tmp_b.refcnt > 0); tmp_b.lock = 0; - CLIB_MEMORY_BARRIER (); + CLIB_MEMORY_STORE_BARRIER (); b->as_u64 = tmp_b.as_u64; #if BIHASH_KVP_AT_BUCKET_LEVEL @@ -839,6 +1014,23 @@ expand_ok: return (0); } +static_always_inline int BV (clib_bihash_add_del_inline) + (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, int is_add, + int (*is_stale_cb) (BVT (clib_bihash_kv) *, void *), void *arg) +{ + u64 hash = BV (clib_bihash_hash) (add_v); + return BV (clib_bihash_add_del_inline_with_hash) (h, add_v, hash, is_add, + is_stale_cb, arg, 0, 0); +} + +int BV (clib_bihash_add_del_with_hash) (BVT (clib_bihash) * h, + BVT (clib_bihash_kv) * add_v, u64 hash, + int is_add) +{ + return BV (clib_bihash_add_del_inline_with_hash) (h, add_v, hash, is_add, 0, + 0, 0, 0); +} + int BV (clib_bihash_add_del) (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, int is_add) { @@ -852,53 +1044,20 @@ int BV (clib_bihash_add_or_overwrite_stale) return BV (clib_bihash_add_del_inline) (h, add_v, 1, stale_callback, arg); } +int BV (clib_bihash_add_with_overwrite_cb) ( + BVT (clib_bihash) * h, BVT (clib_bihash_kv) * add_v, + void (overwrite_cb) (BVT (clib_bihash_kv) *, void *), void *arg) +{ + u64 hash = BV (clib_bihash_hash) (add_v); + return BV (clib_bihash_add_del_inline_with_hash) (h, add_v, hash, 1, 0, 0, + overwrite_cb, arg); +} + int BV (clib_bihash_search) (BVT (clib_bihash) * h, BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep) { - u64 hash; - BVT (clib_bihash_value) * v; - BVT (clib_bihash_bucket) * b; - int i, limit; - - ASSERT (valuep); - -#if BIHASH_LAZY_INSTANTIATE - if (PREDICT_FALSE (alloc_arena (h) == 0)) - return -1; -#endif - - hash = BV (clib_bihash_hash) (search_key); - - b = BV (clib_bihash_get_bucket) (h, hash); - - if (BV (clib_bihash_bucket_is_empty) (b)) - return -1; - - if (PREDICT_FALSE (b->lock)) - { - volatile BVT (clib_bihash_bucket) * bv = b; - while (bv->lock) - CLIB_PAUSE (); - } - - hash >>= h->log2_nbuckets; - - v = BV (clib_bihash_get_value) (h, b->offset); - limit = BIHASH_KVP_PER_PAGE; - v += (b->linear_search == 0) ? hash & ((1 << b->log2_pages) - 1) : 0; - if (PREDICT_FALSE (b->linear_search)) - limit <<= b->log2_pages; - - for (i = 0; i < limit; i++) - { - if (BV (clib_bihash_key_compare) (v->kvp[i].key, search_key->key)) - { - *valuep = v->kvp[i]; - return 0; - } - } - return -1; + return BV (clib_bihash_search_inline_2) (h, search_key, valuep); } u8 *BV (format_bihash) (u8 * s, va_list * args) @@ -911,13 +1070,12 @@ u8 *BV (format_bihash) (u8 * s, va_list * args) u64 active_elements = 0; u64 active_buckets = 0; u64 linear_buckets = 0; - u64 used_bytes; - s = format (s, "Hash table %s\n", h->name ? h->name : (u8 *) "(unnamed)"); + s = format (s, "Hash table '%s'\n", h->name ? h->name : (u8 *) "(unnamed)"); #if BIHASH_LAZY_INSTANTIATE - if (PREDICT_FALSE (alloc_arena (h) == 0)) - return format (s, "[empty, uninitialized]"); + if (PREDICT_FALSE (h->instantiated == 0)) + return format (s, " empty, uninitialized"); #endif for (i = 0; i < h->nbuckets; i++) @@ -956,11 +1114,11 @@ u8 *BV (format_bihash) (u8 * s, va_list * args) } if (verbose) { - if (h->fmt_fn) + if (h->kvp_fmt_fn) { s = format (s, " %d: %U\n", j * BIHASH_KVP_PER_PAGE + k, - h->fmt_fn, &(v->kvp[k]), verbose); + h->kvp_fmt_fn, &(v->kvp[k]), verbose); } else { @@ -997,13 +1155,34 @@ u8 *BV (format_bihash) (u8 * s, va_list * args) } s = format (s, " %lld linear search buckets\n", linear_buckets); - used_bytes = alloc_arena_next (h); - s = format (s, - " arena: base %llx, next %llx\n" - " used %lld b (%lld Mbytes) of %lld b (%lld Mbytes)\n", - alloc_arena (h), alloc_arena_next (h), - used_bytes, used_bytes >> 20, - alloc_arena_size (h), alloc_arena_size (h) >> 20); + if (BIHASH_USE_HEAP) + { + BVT (clib_bihash_alloc_chunk) * c = h->chunks; + uword bytes_left = 0, total_size = 0, n_chunks = 0; + + while (c) + { + bytes_left += c->bytes_left; + total_size += c->size; + n_chunks += 1; + c = c->next; + } + s = format (s, + " heap: %u chunk(s) allocated\n" + " bytes: used %U, scrap %U\n", n_chunks, + format_memory_size, total_size, + format_memory_size, bytes_left); + } + else + { + u64 used_bytes = alloc_arena_next (h); + s = format (s, + " arena: base %llx, next %llx\n" + " used %lld b (%lld Mbytes) of %lld b (%lld Mbytes)\n", + alloc_arena (h), alloc_arena_next (h), + used_bytes, used_bytes >> 20, + alloc_arena_size (h), alloc_arena_size (h) >> 20); + } return s; } @@ -1017,7 +1196,7 @@ void BV (clib_bihash_foreach_key_value_pair) #if BIHASH_LAZY_INSTANTIATE - if (PREDICT_FALSE (alloc_arena (h) == 0)) + if (PREDICT_FALSE (h->instantiated == 0)) return; #endif