X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Ffifo_segment.c;h=ec6f082398e824549e90772c80005b5cca188157;hb=8e755a16a71c55555f12381c8a12e22ae7138536;hp=49cd1161a4bfeb5d2dda75a6a4030b58c2e14da7;hpb=f22f4e562e1b922cff036ef628b77fd2d479d015;p=vpp.git diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index 49cd1161a4b..ec6f082398e 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -15,6 +15,12 @@ #include +static char *fifo_segment_mem_status_strings[] = { +#define _(sym,str) str, + foreach_segment_mem_status +#undef _ +}; + /** * Fifo segment free space * @@ -53,6 +59,26 @@ fsh_update_free_bytes (fifo_segment_header_t * fsh) clib_atomic_store_rel_n (&fsh->n_free_bytes, fsh_free_space (fsh)); } +static inline void +fsh_cached_bytes_add (fifo_segment_header_t * fsh, int size) +{ + clib_atomic_fetch_add_rel (&fsh->n_cached_bytes, size); +} + +static inline void +fsh_cached_bytes_sub (fifo_segment_header_t * fsh, int size) +{ + clib_atomic_fetch_sub_rel (&fsh->n_cached_bytes, size); +} + +static inline uword +fsh_n_cached_bytes (fifo_segment_header_t * fsh) +{ + uword n_cached = clib_atomic_load_relax_n (&fsh->n_cached_bytes); + ASSERT (n_cached >= 0); + return n_cached; +} + static void fsh_check_mem (fifo_segment_header_t * fsh) { @@ -133,6 +159,7 @@ fifo_segment_init (fifo_segment_t * fs) ssvm_pop_heap (oldheap); fsh->n_free_bytes = fsh_free_space (fsh); + fsh->n_cached_bytes = 0; max_chunks = fsh->n_free_bytes / FIFO_SEGMENT_MIN_FIFO_SIZE; fsh->n_reserved_bytes = (max_chunks / 4) * sizeof (rb_node_t); sh->ready = 1; @@ -267,8 +294,7 @@ fs_chunk_size_is_valid (fifo_segment_header_t * fsh, u32 size) } static svm_fifo_t * -fs_try_alloc_fifo_freelist (fifo_segment_slice_t * fss, - u32 fl_index, u32 data_bytes) +fs_try_alloc_fifo_freelist (fifo_segment_slice_t * fss, u32 fl_index) { svm_fifo_chunk_t *c; svm_fifo_t *f; @@ -291,6 +317,69 @@ fs_try_alloc_fifo_freelist (fifo_segment_slice_t * fss, return f; } +svm_fifo_chunk_t * +fs_try_alloc_multi_chunk (fifo_segment_header_t * fsh, + fifo_segment_slice_t * fss, u32 data_bytes) +{ + u32 fl_index, fl_size, n_alloc = 0, req_bytes = data_bytes; + svm_fifo_chunk_t *c, *first = 0, *next; + + fl_index = fs_freelist_for_size (req_bytes); + if (fl_index > 0) + fl_index -= 1; + + fl_size = fs_freelist_index_to_size (fl_index); + + while (req_bytes) + { + c = fss->free_chunks[fl_index]; + if (c) + { + fss->free_chunks[fl_index] = c->next; + c->next = first; + first = c; + n_alloc += fl_size; + req_bytes -= clib_min (fl_size, req_bytes); + } + else + { + /* Failed to allocate with smaller chunks */ + if (fl_index == 0) + { + /* free all chunks if any allocated */ + c = first; + while (c) + { + fl_index = fs_freelist_for_size (c->length); + fl_size = fs_freelist_index_to_size (fl_index); + next = c->next; + c->next = fss->free_chunks[fl_index]; + fss->free_chunks[fl_index] = c; + fss->n_fl_chunk_bytes += fl_size; + c = next; + } + n_alloc = 0; + first = 0; + fl_index = fs_freelist_for_size (data_bytes); + if (fss->free_chunks[fl_index + 1]) + { + fl_index += 1; + fl_size = fs_freelist_index_to_size (fl_index); + continue; + } + + return 0; + } + fl_index -= 1; + fl_size = fl_size >> 1; + } + } + + fss->n_fl_chunk_bytes -= n_alloc; + fsh_cached_bytes_sub (fsh, n_alloc); + return first; +} + static svm_fifo_t * fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss, @@ -349,6 +438,7 @@ fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh, c->next = fss->free_chunks[fl_index]; fss->free_chunks[fl_index] = c; fss->n_fl_chunk_bytes += fl_size; + n_alloc -= fl_size; data_bytes += fl_size; } first = last = 0; @@ -372,9 +462,55 @@ fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh, f->start_chunk = first; f->end_chunk = last; fss->n_fl_chunk_bytes -= n_alloc; + fsh_cached_bytes_sub (fsh, n_alloc); return f; } +static int +fsh_try_alloc_chunk_batch (fifo_segment_header_t * fsh, + fifo_segment_slice_t * fss, + u32 fl_index, u32 batch_size) +{ + u32 rounded_data_size; + svm_fifo_chunk_t *c; + void *oldheap; + uword size; + u8 *cmem; + int i; + + rounded_data_size = fs_freelist_index_to_size (fl_index); + size = (uword) (sizeof (*c) + rounded_data_size) * batch_size; + + oldheap = ssvm_push_heap (fsh->ssvm_sh); + cmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES, + 0 /* align_offset */ , + 0 /* os_out_of_memory */ ); + ssvm_pop_heap (oldheap); + + /* Out of space.. */ + if (cmem == 0) + return -1; + + /* Carve fifo + chunk space */ + for (i = 0; i < batch_size; i++) + { + c = (svm_fifo_chunk_t *) cmem; + c->start_byte = 0; + c->length = rounded_data_size; + c->enq_rb_index = RBTREE_TNIL_INDEX; + c->deq_rb_index = RBTREE_TNIL_INDEX; + c->next = fss->free_chunks[fl_index]; + fss->free_chunks[fl_index] = c; + cmem += sizeof (*c) + rounded_data_size; + } + + fss->n_fl_chunk_bytes += batch_size * rounded_data_size; + fsh_cached_bytes_add (fsh, batch_size * rounded_data_size); + fsh_free_bytes_sub (fsh, size); + + return 0; +} + static int fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss, @@ -420,6 +556,7 @@ fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh, } fss->n_fl_chunk_bytes += batch_size * rounded_data_size; + fsh_cached_bytes_add (fsh, batch_size * rounded_data_size); fsh_free_bytes_sub (fsh, size); return 0; @@ -441,16 +578,21 @@ fs_try_alloc_fifo (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss, u32 fifo_sz, fl_index; svm_fifo_t *f = 0; uword n_free_bytes; + u32 min_size; - fl_index = fs_freelist_for_size (data_bytes); + min_size = clib_max ((fsh->pct_first_alloc * data_bytes) / 100, 4096); + fl_index = fs_freelist_for_size (min_size); fifo_sz = sizeof (svm_fifo_t) + sizeof (svm_fifo_chunk_t); - fifo_sz += 1 << max_log2 (data_bytes); + fifo_sz += 1 << max_log2 (min_size); if (fss->free_fifos && fss->free_chunks[fl_index]) { - f = fs_try_alloc_fifo_freelist (fss, fl_index, data_bytes); + f = fs_try_alloc_fifo_freelist (fss, fl_index); if (f) - goto done; + { + fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index)); + goto done; + } } fsh_check_mem (fsh); @@ -461,13 +603,15 @@ fs_try_alloc_fifo (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss, FIFO_SEGMENT_ALLOC_BATCH_SIZE)) goto done; - f = fs_try_alloc_fifo_freelist (fss, fl_index, data_bytes); + f = fs_try_alloc_fifo_freelist (fss, fl_index); + if (f) + fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index)); goto done; } if (fifo_sz <= n_free_bytes) { void *oldheap = ssvm_push_heap (fsh->ssvm_sh); - f = svm_fifo_alloc (data_bytes); + f = svm_fifo_alloc (min_size); ssvm_pop_heap (oldheap); if (f) { @@ -492,18 +636,28 @@ fsh_alloc_chunk (fifo_segment_header_t * fsh, u32 slice_index, u32 chunk_size) svm_fifo_chunk_t *c; void *oldheap; int fl_index; + uword n_free; fl_index = fs_freelist_for_size (chunk_size); fss = fsh_slice_get (fsh, slice_index); clib_spinlock_lock (&fss->chunk_lock); + c = fss->free_chunks[fl_index]; - if (!c) + if (c) + { + fss->free_chunks[fl_index] = c->next; + c->next = 0; + fss->n_fl_chunk_bytes -= fs_freelist_index_to_size (fl_index); + fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index)); + } + else if (chunk_size <= (n_free = fsh_n_free_bytes (fsh))) { fsh_check_mem (fsh); + chunk_size = fs_freelist_index_to_size (fl_index); - if (fsh_n_free_bytes (fsh) < chunk_size) + if (n_free < chunk_size) goto done; oldheap = ssvm_push_heap (fsh->ssvm_sh); @@ -515,11 +669,20 @@ fsh_alloc_chunk (fifo_segment_header_t * fsh, u32 slice_index, u32 chunk_size) fsh_free_bytes_sub (fsh, chunk_size + sizeof (*c)); } - else + else if (chunk_size <= fss->n_fl_chunk_bytes) { - fss->free_chunks[fl_index] = c->next; - c->next = 0; - fss->n_fl_chunk_bytes -= fs_freelist_index_to_size (fl_index); + c = fs_try_alloc_multi_chunk (fsh, fss, chunk_size); + } + else if (chunk_size <= fss->n_fl_chunk_bytes + n_free) + { + u32 min_size = FIFO_SEGMENT_MIN_FIFO_SIZE; + u32 batch; + + fsh_check_mem (fsh); + batch = (chunk_size - fss->n_fl_chunk_bytes) / min_size; + batch = clib_min (batch + 1, n_free / min_size); + if (!fsh_try_alloc_chunk_batch (fsh, fss, 0, batch)) + c = fs_try_alloc_multi_chunk (fsh, fss, chunk_size); } done: @@ -530,35 +693,40 @@ done: } static void -fsh_slice_collect_chunks (fifo_segment_slice_t * fss, svm_fifo_chunk_t * cur) +fsh_slice_collect_chunks (fifo_segment_header_t * fsh, + fifo_segment_slice_t * fss, svm_fifo_chunk_t * c) { svm_fifo_chunk_t *next; int fl_index; + u32 n_collect = 0; clib_spinlock_lock (&fss->chunk_lock); - while (cur) + while (c) { - next = cur->next; - fl_index = fs_freelist_for_size (cur->length); - cur->next = fss->free_chunks[fl_index]; - cur->enq_rb_index = RBTREE_TNIL_INDEX; - cur->deq_rb_index = RBTREE_TNIL_INDEX; - fss->free_chunks[fl_index] = cur; - fss->n_fl_chunk_bytes += fs_freelist_index_to_size (fl_index); - cur = next; + next = c->next; + fl_index = fs_freelist_for_size (c->length); + c->next = fss->free_chunks[fl_index]; + c->enq_rb_index = RBTREE_TNIL_INDEX; + c->deq_rb_index = RBTREE_TNIL_INDEX; + fss->free_chunks[fl_index] = c; + n_collect += fs_freelist_index_to_size (fl_index); + c = next; } + fss->n_fl_chunk_bytes += n_collect; + fsh_cached_bytes_add (fsh, n_collect); + clib_spinlock_unlock (&fss->chunk_lock); } void fsh_collect_chunks (fifo_segment_header_t * fsh, u32 slice_index, - svm_fifo_chunk_t * cur) + svm_fifo_chunk_t * c) { fifo_segment_slice_t *fss; fss = fsh_slice_get (fsh, slice_index); - fsh_slice_collect_chunks (fss, cur); + fsh_slice_collect_chunks (fsh, fss, c); } /** @@ -644,7 +812,7 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f) fss->free_fifos = f; /* Free fifo chunks */ - fsh_slice_collect_chunks (fss, f->start_chunk); + fsh_slice_collect_chunks (fsh, fss, f->start_chunk); f->start_chunk = f->end_chunk = 0; f->head_chunk = f->tail_chunk = f->ooo_enq = f->ooo_deq = 0; @@ -746,6 +914,7 @@ fifo_segment_prealloc_fifo_chunks (fifo_segment_t * fs, u32 slice_index, c->next = fss->free_chunks[fl_index]; fss->free_chunks[fl_index] = c; cmem += sizeof (*c) + rounded_data_size; + fsh_cached_bytes_add (fsh, rounded_data_size); } fss->n_fl_chunk_bytes += batch_size * rounded_data_size; @@ -925,12 +1094,36 @@ fifo_segment_update_free_bytes (fifo_segment_t * fs) fsh_update_free_bytes (fs->h); } +uword +fifo_segment_size (fifo_segment_t * fs) +{ + return fs->ssvm.ssvm_size; +} + +u8 +fsh_has_reached_mem_limit (fifo_segment_header_t * fsh) +{ + return (fsh->flags & FIFO_SEGMENT_F_MEM_LIMIT) ? 1 : 0; +} + +void +fsh_reset_mem_limit (fifo_segment_header_t * fsh) +{ + fsh->flags &= ~FIFO_SEGMENT_F_MEM_LIMIT; +} + uword fifo_segment_free_bytes (fifo_segment_t * fs) { return fsh_n_free_bytes (fs->h); } +uword +fifo_segment_cached_bytes (fifo_segment_t * fs) +{ + return fsh_n_cached_bytes (fs->h); +} + uword fifo_segment_fl_chunk_bytes (fifo_segment_t * fs) { @@ -974,6 +1167,52 @@ fifo_segment_get_slice_fifo_list (fifo_segment_t * fs, u32 slice_index) return fss->fifos; } +u8 +fifo_segment_get_mem_usage (fifo_segment_t * fs) +{ + uword size, in_use; + + size = fifo_segment_size (fs); + in_use = + size - fifo_segment_free_bytes (fs) - fifo_segment_cached_bytes (fs); + return (in_use * 100) / size; +} + +fifo_segment_mem_status_t +fifo_segment_determine_status (fifo_segment_header_t * fsh, u8 usage) +{ + if (!fsh->high_watermark || !fsh->low_watermark) + return MEMORY_PRESSURE_NO_PRESSURE; + + /* once the no-memory is detected, the status continues + * until memory usage gets below the high watermark + */ + if (fsh_has_reached_mem_limit (fsh)) + { + if (usage >= fsh->high_watermark) + return MEMORY_PRESSURE_NO_MEMORY; + else + fsh_reset_mem_limit (fsh); + } + + if (usage >= fsh->high_watermark) + return MEMORY_PRESSURE_HIGH_PRESSURE; + + else if (usage >= fsh->low_watermark) + return MEMORY_PRESSURE_LOW_PRESSURE; + + return MEMORY_PRESSURE_NO_PRESSURE; +} + +fifo_segment_mem_status_t +fifo_segment_get_mem_status (fifo_segment_t * fs) +{ + fifo_segment_header_t *fsh = fs->h; + u8 usage = fifo_segment_get_mem_usage (fs); + + return fifo_segment_determine_status (fsh, usage); +} + u8 * format_fifo_segment_type (u8 * s, va_list * args) { @@ -1003,6 +1242,7 @@ format_fifo_segment (u8 * s, va_list * args) int verbose __attribute__ ((unused)) = va_arg (*args, int); uword est_chunk_bytes, est_free_seg_bytes, free_chunks; uword chunk_bytes = 0, free_seg_bytes, chunk_size; + uword tracked_cached_bytes; fifo_segment_header_t *fsh; fifo_segment_slice_t *fss; svm_fifo_chunk_t *c; @@ -1010,6 +1250,9 @@ format_fifo_segment (u8 * s, va_list * args) char *address; size_t size; int i; + uword allocated, in_use; + f64 usage; + fifo_segment_mem_status_t mem_st; indent = format_get_indent (s) + 2; @@ -1068,19 +1311,31 @@ format_fifo_segment (u8 * s, va_list * args) est_free_seg_bytes = fifo_segment_free_bytes (fs); fifo_segment_update_free_bytes (fs); free_seg_bytes = fifo_segment_free_bytes (fs); + tracked_cached_bytes = fifo_segment_cached_bytes (fs); + allocated = fifo_segment_size (fs); + in_use = fifo_segment_size (fs) - est_free_seg_bytes - tracked_cached_bytes; + usage = (100.0 * in_use) / allocated; + mem_st = fifo_segment_get_mem_status (fs); s = format (s, "\n%Useg free bytes: %U (%lu) estimated: %U (%lu)\n", format_white_space, indent + 2, format_memory_size, free_seg_bytes, free_seg_bytes, format_memory_size, est_free_seg_bytes, est_free_seg_bytes); - s = format (s, "%Uchunk free bytes: %U (%lu) estimated: %U (%lu)\n", - format_white_space, indent + 2, format_memory_size, chunk_bytes, - chunk_bytes, format_memory_size, est_chunk_bytes, - est_chunk_bytes); - s = format (s, "%Ufifo hdr free bytes: %U (%u) reserved %U (%lu)\n", - format_white_space, indent + 2, format_memory_size, fifo_hdr, - fifo_hdr, format_memory_size, fsh->n_reserved_bytes, - fsh->n_reserved_bytes); + s = + format (s, + "%Uchunk free bytes: %U (%lu) estimated: %U (%lu) tracked: %U (%lu)\n", + format_white_space, indent + 2, format_memory_size, chunk_bytes, + chunk_bytes, format_memory_size, est_chunk_bytes, est_chunk_bytes, + format_memory_size, tracked_cached_bytes, tracked_cached_bytes); + s = + format (s, "%Ufifo hdr free bytes: %U (%u) reserved %U (%lu)\n", + format_white_space, indent + 2, format_memory_size, fifo_hdr, + fifo_hdr, format_memory_size, fsh->n_reserved_bytes, + fsh->n_reserved_bytes); + s = + format (s, "%Usegment usage: %.2f%% (%U / %U) %s\n", format_white_space, + indent + 2, usage, format_memory_size, in_use, format_memory_size, + allocated, fifo_segment_mem_status_strings[mem_st]); s = format (s, "\n"); return s;