X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Ffifo_segment.c;h=ec6f082398e824549e90772c80005b5cca188157;hb=8e755a16a71c55555f12381c8a12e22ae7138536;hp=88600b84e3609d05b51c0d37e53d9bf5e77ab15a;hpb=234fe894d80a6ebc7e457bc86f2eea80d5ef01ea;p=vpp.git diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index 88600b84e36..ec6f082398e 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -294,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; @@ -318,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, @@ -404,6 +466,51 @@ fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh, 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, @@ -471,14 +578,16 @@ 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) { fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index)); @@ -494,7 +603,7 @@ 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; @@ -502,7 +611,7 @@ fs_try_alloc_fifo (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss, 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) { @@ -527,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); @@ -550,12 +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); - fsh_cached_bytes_sub (fsh, 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: @@ -567,7 +694,7 @@ done: static void fsh_slice_collect_chunks (fifo_segment_header_t * fsh, - fifo_segment_slice_t * fss, svm_fifo_chunk_t * cur) + fifo_segment_slice_t * fss, svm_fifo_chunk_t * c) { svm_fifo_chunk_t *next; int fl_index; @@ -575,16 +702,16 @@ fsh_slice_collect_chunks (fifo_segment_header_t * fsh, 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; + 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); - cur = next; + c = next; } fss->n_fl_chunk_bytes += n_collect; @@ -595,11 +722,11 @@ fsh_slice_collect_chunks (fifo_segment_header_t * fsh, 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 (fsh, fss, cur); + fsh_slice_collect_chunks (fsh, fss, c); } /**