X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fbihash_template.c;h=698053867a494fade138e4cf31fbef9716c206e4;hb=178cf493d009995b28fdf220f04c98860ff79a9b;hp=fa92c8b71e82b8022a8f794b78fe11f53be75076;hpb=9466c45ceed735b0fc2820f0444ba0dfea03a8f1;p=vpp.git diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c index fa92c8b71e8..698053867a4 100644 --- a/src/vppinfra/bihash_template.c +++ b/src/vppinfra/bihash_template.c @@ -26,10 +26,10 @@ static inline void *BV (alloc_aligned) (BVT (clib_bihash) * h, uword nbytes) rv = alloc_arena_next (h); alloc_arena_next (h) += nbytes; - if (rv >= (alloc_arena (h) + alloc_arena_size (h))) + if (rv >= alloc_arena_size (h)) os_out_of_memory (); - return (void *) rv; + return (void *) (uword) (rv + alloc_arena (h)); } @@ -53,7 +53,7 @@ void BV (clib_bihash_init) ASSERT (memory_size < (1ULL << BIHASH_BUCKET_OFFSET_BITS)); alloc_arena (h) = (uword) clib_mem_vm_alloc (memory_size); - alloc_arena_next (h) = alloc_arena (h); + alloc_arena_next (h) = 0; alloc_arena_size (h) = memory_size; bucket_size = nbuckets * sizeof (h->buckets[0]); @@ -71,17 +71,14 @@ void BV (clib_bihash_init) #endif void BV (clib_bihash_master_init_svm) - (BVT (clib_bihash) * h, char *name, u32 nbuckets, - u64 base_address, u64 memory_size) + (BVT (clib_bihash) * h, char *name, u32 nbuckets, u64 memory_size) { uword bucket_size; u8 *mmap_addr; vec_header_t *freelist_vh; int fd; - ASSERT (base_address); - ASSERT (base_address + memory_size < (1ULL << 32)); - + ASSERT (memory_size < (1ULL << 32)); /* Set up for memfd sharing */ if ((fd = memfd_create (name, MFD_ALLOW_SEALING)) == -1) { @@ -99,9 +96,8 @@ void BV (clib_bihash_master_init_svm) if ((fcntl (fd, F_ADD_SEALS, F_SEAL_SHRINK)) == -1) clib_unix_warning ("fcntl (F_ADD_SEALS)"); - mmap_addr = mmap (u64_to_pointer (base_address), memory_size, - PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, - 0 /* offset */ ); + mmap_addr = mmap (0, memory_size, + PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 /* offset */ ); if (mmap_addr == MAP_FAILED) { @@ -118,23 +114,27 @@ void BV (clib_bihash_master_init_svm) h->log2_nbuckets = max_log2 (nbuckets); alloc_arena (h) = (u64) (uword) mmap_addr; - alloc_arena_next (h) = alloc_arena (h) + CLIB_CACHE_LINE_BYTES; + alloc_arena_next (h) = CLIB_CACHE_LINE_BYTES; alloc_arena_size (h) = memory_size; bucket_size = nbuckets * sizeof (h->buckets[0]); h->buckets = BV (alloc_aligned) (h, bucket_size); - h->sh->buckets_as_u64 = (u64) (uword) h->buckets; + 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); h->alloc_lock[0] = 0; - h->sh->alloc_lock_as_u64 = (u64) (uword) (h->alloc_lock); - freelist_vh = BV (alloc_aligned) (h, sizeof (vec_header_t) + - BIHASH_FREELIST_LENGTH * sizeof (u64)); + h->sh->alloc_lock_as_u64 = + (u64) BV (clib_bihash_get_offset) (h, (void *) h->alloc_lock); + freelist_vh = + BV (alloc_aligned) (h, + sizeof (vec_header_t) + + BIHASH_FREELIST_LENGTH * sizeof (u64)); freelist_vh->len = BIHASH_FREELIST_LENGTH; freelist_vh->dlmalloc_header_offset = 0xDEADBEEF; - h->sh->freelists_as_u64 = (u64) (uword) freelist_vh->vector_data; - h->freelists = (void *) (uword) (h->sh->freelists_as_u64); + h->sh->freelists_as_u64 = + (u64) BV (clib_bihash_get_offset) (h, freelist_vh->vector_data); + h->freelists = (void *) (freelist_vh->vector_data); h->fmt_fn = NULL; } @@ -143,10 +143,10 @@ void BV (clib_bihash_slave_init_svm) (BVT (clib_bihash) * h, char *name, int fd) { u8 *mmap_addr; - u64 base_address, memory_size; + u64 memory_size; BVT (clib_bihash_shared_header) * sh; - /* Trial mapping, to place the segment */ + /* Trial mapping, to learn the segment size */ mmap_addr = mmap (0, 4096, PROT_READ, MAP_SHARED, fd, 0 /* offset */ ); if (mmap_addr == MAP_FAILED) { @@ -156,15 +156,13 @@ void BV (clib_bihash_slave_init_svm) sh = (BVT (clib_bihash_shared_header) *) mmap_addr; - base_address = sh->alloc_arena; memory_size = sh->alloc_arena_size; munmap (mmap_addr, 4096); - /* Actual mapping, at the required address */ - mmap_addr = mmap (u64_to_pointer (base_address), memory_size, - PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, - 0 /* offset */ ); + /* Actual mapping, at the required size */ + mmap_addr = mmap (0, memory_size, + PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 /* offset */ ); if (mmap_addr == MAP_FAILED) { @@ -175,15 +173,16 @@ void BV (clib_bihash_slave_init_svm) (void) close (fd); h->sh = (void *) mmap_addr; + alloc_arena (h) = (u64) (uword) mmap_addr; h->memfd = -1; h->name = (u8 *) name; - h->buckets = u64_to_pointer (h->sh->buckets_as_u64); + h->buckets = BV (clib_bihash_get_value) (h, h->sh->buckets_as_u64); h->nbuckets = h->sh->nbuckets; h->log2_nbuckets = max_log2 (h->nbuckets); - h->alloc_lock = u64_to_pointer (h->sh->alloc_lock_as_u64); - h->freelists = u64_to_pointer (h->sh->freelists_as_u64); + 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; } #endif /* BIHASH_32_64_SVM */ @@ -204,7 +203,7 @@ void BV (clib_bihash_free) (BVT (clib_bihash) * h) (void) close (h->memfd); #endif clib_mem_vm_free ((void *) (uword) (alloc_arena (h)), alloc_arena_size (h)); - memset (h, 0, sizeof (*h)); + clib_memset (h, 0, sizeof (*h)); } static @@ -225,7 +224,7 @@ BV (value_alloc) (BVT (clib_bihash) * h, u32 log2_pages) rv = BV (alloc_aligned) (h, (sizeof (*rv) * (1 << log2_pages))); goto initialize; } - rv = (void *) (uword) h->freelists[log2_pages]; + rv = BV (clib_bihash_get_value) (h, (uword) h->freelists[log2_pages]); h->freelists[log2_pages] = rv->next_free_as_u64; initialize: @@ -235,7 +234,7 @@ initialize: * if we replace (1<freelists) > log2_pages); if (CLIB_DEBUG > 0) - memset (v, 0xFE, sizeof (*v) * (1 << log2_pages)); + clib_memset (v, 0xFE, sizeof (*v) * (1 << log2_pages)); v->next_free_as_u64 = (u64) h->freelists[log2_pages]; - h->freelists[log2_pages] = (u64) (uword) v; + h->freelists[log2_pages] = (u64) BV (clib_bihash_get_offset) (h, v); } static inline void @@ -296,7 +295,7 @@ BV (make_working_copy) (BVT (clib_bihash) * h, BVT (clib_bihash_bucket) * b) v = BV (clib_bihash_get_value) (h, b->offset); - clib_memcpy (working_copy, v, sizeof (*v) * (1 << b->log2_pages)); + 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 (); @@ -339,8 +338,8 @@ BV (split_and_rehash) /* Empty slot */ if (BV (clib_bihash_is_free) (&(new_v->kvp[j]))) { - clib_memcpy (&(new_v->kvp[j]), &(old_values->kvp[i]), - sizeof (new_v->kvp[j])); + clib_memcpy_fast (&(new_v->kvp[j]), &(old_values->kvp[i]), + sizeof (new_v->kvp[j])); goto doublebreak; } } @@ -384,8 +383,8 @@ BV (split_and_rehash_linear) if (BV (clib_bihash_is_free) (&(new_values->kvp[j]))) { /* Copy the old value and move along */ - clib_memcpy (&(new_values->kvp[j]), &(old_values->kvp[i]), - sizeof (new_values->kvp[j])); + clib_memcpy_fast (&(new_values->kvp[j]), &(old_values->kvp[i]), + sizeof (new_values->kvp[j])); j++; goto doublebreak; } @@ -473,7 +472,7 @@ static inline int BV (clib_bihash_add_del_inline) if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key))) { CLIB_MEMORY_BARRIER (); /* Add a delay */ - clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v)); + clib_memcpy_fast (&(v->kvp[i]), add_v, sizeof (*add_v)); BV (clib_bihash_unlock_bucket) (b); return (0); } @@ -489,10 +488,11 @@ static inline int BV (clib_bihash_add_del_inline) * Copy the value first, so that if a reader manages * to match the new key, the value will be right... */ - clib_memcpy (&(v->kvp[i].value), - &add_v->value, sizeof (add_v->value)); + clib_memcpy_fast (&(v->kvp[i].value), + &add_v->value, sizeof (add_v->value)); CLIB_MEMORY_BARRIER (); /* Make sure the value has settled */ - clib_memcpy (&(v->kvp[i]), &add_v->key, sizeof (add_v->key)); + clib_memcpy_fast (&(v->kvp[i]), &add_v->key, + sizeof (add_v->key)); b->refcnt++; ASSERT (b->refcnt > 0); BV (clib_bihash_unlock_bucket) (b); @@ -507,7 +507,7 @@ static inline int BV (clib_bihash_add_del_inline) if (is_stale_cb (&(v->kvp[i]), arg)) { CLIB_MEMORY_BARRIER (); - clib_memcpy (&(v->kvp[i]), add_v, sizeof (*add_v)); + clib_memcpy_fast (&(v->kvp[i]), add_v, sizeof (*add_v)); BV (clib_bihash_unlock_bucket) (b); return (0); } @@ -522,7 +522,7 @@ static inline int BV (clib_bihash_add_del_inline) /* Found the key? Kill it... */ if (!memcmp (&(v->kvp[i]), &add_v->key, sizeof (add_v->key))) { - memset (&(v->kvp[i]), 0xff, sizeof (*(add_v))); + clib_memset (&(v->kvp[i]), 0xff, sizeof (*(add_v))); /* Is the bucket empty? */ if (PREDICT_TRUE (b->refcnt > 1)) { @@ -603,7 +603,7 @@ static inline int BV (clib_bihash_add_del_inline) { if (BV (clib_bihash_is_free) (&(new_v->kvp[i]))) { - clib_memcpy (&(new_v->kvp[i]), add_v, sizeof (*add_v)); + clib_memcpy_fast (&(new_v->kvp[i]), add_v, sizeof (*add_v)); goto expand_ok; } } @@ -628,6 +628,9 @@ expand_ok: tmp_b.lock = 0; CLIB_MEMORY_BARRIER (); b->as_u64 = tmp_b.as_u64; + /* free the old bucket */ + v = BV (clib_bihash_get_value) (h, h->saved_bucket.offset); + BV (value_free) (h, v, h->saved_bucket.log2_pages); BV (clib_bihash_alloc_unlock) (h); return (0); } @@ -767,12 +770,13 @@ u8 *BV (format_bihash) (u8 * s, va_list * args) { u32 nfree = 0; BVT (clib_bihash_value) * free_elt; + u64 free_elt_as_u64 = h->freelists[i]; - free_elt = (void *) (uword) h->freelists[i]; - while (free_elt) + while (free_elt_as_u64) { + free_elt = BV (clib_bihash_get_value) (h, free_elt_as_u64); nfree++; - free_elt = (void *) (uword) free_elt->next_free_as_u64; + free_elt_as_u64 = free_elt->next_free_as_u64; } if (nfree || verbose) @@ -780,7 +784,7 @@ 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) - alloc_arena (h); + 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",