X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fbuffer.c;h=ee76290e25a67cc7abd2edabbaccfe8da19c2bf0;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=be3b41efd4c58ae173587f96cb42e3dfbde3154a;hpb=586afd762bfa149f5ca167bd5fd5a0cd59ce94fe;p=vpp.git diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c index be3b41efd4c..ee76290e25a 100644 --- a/src/vlib/buffer.c +++ b/src/vlib/buffer.c @@ -46,6 +46,11 @@ #include #include +vlib_buffer_callbacks_t *vlib_buffer_callbacks = 0; +static u32 vlib_buffer_physmem_sz = 32 << 20; + +vlib_buffer_main_t buffer_main; + uword vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm, vlib_buffer_t * b_first) @@ -67,11 +72,17 @@ u8 * format_vlib_buffer (u8 * s, va_list * args) { vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); + u8 *a = 0; - s = format (s, "current data %d, length %d, free-list %d, clone-count %u", - b->current_data, b->current_length, b->free_list_index, - b->n_add_refs); +#define _(bit, name, v) \ + if (v && (b->flags & VLIB_BUFFER_##name)) \ + a = format (a, "%s ", v); + foreach_vlib_buffer_flag +#undef _ + s = format (s, "current data %d, length %d, free-list %d, clone-count %u", + b->current_data, b->current_length, + vlib_buffer_get_free_list_index (b), b->n_add_refs); if (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID) s = format (s, ", totlen-nifb %d", @@ -80,6 +91,10 @@ format_vlib_buffer (u8 * s, va_list * args) if (b->flags & VLIB_BUFFER_IS_TRACED) s = format (s, ", trace 0x%x", b->trace_index); + if (a) + s = format (s, "\n%U%v", format_white_space, indent, a); + vec_free (a); + while (b->flags & VLIB_BUFFER_NEXT_PRESENT) { vlib_main_t *vm = vlib_get_main (); @@ -158,13 +173,16 @@ vlib_validate_buffer_helper (vlib_main_t * vm, uword follow_buffer_next, uword ** unique_hash) { vlib_buffer_t *b = vlib_get_buffer (vm, bi); - vlib_buffer_main_t *bm = vm->buffer_main; vlib_buffer_free_list_t *fl; - if (pool_is_free_index (bm->buffer_free_list_pool, b->free_list_index)) - return format (0, "unknown free list 0x%x", b->free_list_index); + if (pool_is_free_index + (vm->buffer_free_list_pool, vlib_buffer_get_free_list_index (b))) + return format (0, "unknown free list 0x%x", + vlib_buffer_get_free_list_index (b)); - fl = pool_elt_at_index (bm->buffer_free_list_pool, b->free_list_index); + fl = + pool_elt_at_index (vm->buffer_free_list_pool, + vlib_buffer_get_free_list_index (b)); if ((signed) b->current_data < (signed) -VLIB_BUFFER_PRE_DATA_SIZE) return format (0, "current data %d before pre-data", b->current_data); @@ -178,7 +196,7 @@ vlib_validate_buffer_helper (vlib_main_t * vm, vlib_buffer_known_state_t k; u8 *msg, *result; - k = vlib_buffer_is_known (vm, b->next_buffer); + k = vlib_buffer_is_known (b->next_buffer); if (k != VLIB_BUFFER_KNOWN_ALLOCATED) return format (0, "next 0x%x: %U", b->next_buffer, format_vlib_buffer_known_state, k); @@ -236,7 +254,7 @@ vlib_validate_buffers (vlib_main_t * vm, goto done; } - k = vlib_buffer_is_known (vm, bi); + k = vlib_buffer_is_known (bi); if (k != known_state) { msg = format (0, "is %U; expected %U", @@ -287,7 +305,7 @@ vlib_main_t **vlib_mains = &__bootstrap_vlib_main_vector.vm; /* When dubugging validate that given buffers are either known allocated or known free. */ -static void +void vlib_buffer_validate_alloc_free (vlib_main_t * vm, u32 * buffers, uword n_buffers, @@ -299,11 +317,8 @@ vlib_buffer_validate_alloc_free (vlib_main_t * vm, if (CLIB_DEBUG == 0) return; - ASSERT (vlib_get_thread_index () == 0); - - /* smp disaster check */ - if (vec_len (vlib_mains) > 1) - ASSERT (vm == vlib_mains[0]); + if (vlib_buffer_callbacks) + return; is_free = expected_state == VLIB_BUFFER_KNOWN_ALLOCATED; b = buffers; @@ -313,7 +328,7 @@ vlib_buffer_validate_alloc_free (vlib_main_t * vm, bi = b[0]; b += 1; - known = vlib_buffer_is_known (vm, bi); + known = vlib_buffer_is_known (bi); if (known != expected_state) { ASSERT (0); @@ -324,42 +339,25 @@ vlib_buffer_validate_alloc_free (vlib_main_t * vm, } vlib_buffer_set_known_state - (vm, bi, - is_free ? VLIB_BUFFER_KNOWN_FREE : VLIB_BUFFER_KNOWN_ALLOCATED); - } -} - -void -vlib_buffer_merge_free_lists (vlib_buffer_free_list_t * dst, - vlib_buffer_free_list_t * src) -{ - uword l; - u32 *d; - - l = vec_len (src->buffers); - if (l > 0) - { - vec_add2_aligned (dst->buffers, d, l, CLIB_CACHE_LINE_BYTES); - clib_memcpy (d, src->buffers, l * sizeof (d[0])); - vec_free (src->buffers); + (bi, is_free ? VLIB_BUFFER_KNOWN_FREE : VLIB_BUFFER_KNOWN_ALLOCATED); } } /* Add buffer free list. */ -static u32 +static vlib_buffer_free_list_index_t vlib_buffer_create_free_list_helper (vlib_main_t * vm, u32 n_data_bytes, u32 is_public, u32 is_default, u8 * name) { - vlib_buffer_main_t *bm = vm->buffer_main; + vlib_buffer_main_t *bm = &buffer_main; vlib_buffer_free_list_t *f; int i; ASSERT (vlib_get_thread_index () == 0); - if (!is_default && pool_elts (bm->buffer_free_list_pool) == 0) + if (!is_default && pool_elts (vm->buffer_free_list_pool) == 0) { - u32 default_free_free_list_index; + vlib_buffer_free_list_index_t default_free_free_list_index; /* *INDENT-OFF* */ default_free_free_list_index = @@ -377,16 +375,17 @@ vlib_buffer_create_free_list_helper (vlib_main_t * vm, return default_free_free_list_index; } - pool_get_aligned (bm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES); + pool_get_aligned (vm->buffer_free_list_pool, f, CLIB_CACHE_LINE_BYTES); - memset (f, 0, sizeof (f[0])); - f->index = f - bm->buffer_free_list_pool; + clib_memset (f, 0, sizeof (f[0])); + f->index = f - vm->buffer_free_list_pool; f->n_data_bytes = vlib_buffer_round_size (n_data_bytes); - f->min_n_buffers_each_physmem_alloc = VLIB_FRAME_SIZE; - f->name = clib_mem_is_heap_object (name) ? name : format (0, "%s", name); + f->min_n_buffers_each_alloc = VLIB_FRAME_SIZE; + f->buffer_pool_index = 0; + f->name = clib_mem_is_vec (name) ? name : format (0, "%s", name); /* Setup free buffer template. */ - f->buffer_init_template.free_list_index = f->index; + vlib_buffer_set_free_list_index (&f->buffer_init_template, f->index); f->buffer_init_template.n_add_refs = 0; if (is_public) @@ -398,12 +397,12 @@ vlib_buffer_create_free_list_helper (vlib_main_t * vm, for (i = 1; i < vec_len (vlib_mains); i++) { - vlib_buffer_main_t *wbm = vlib_mains[i]->buffer_main; + vlib_main_t *wvm = vlib_mains[i]; vlib_buffer_free_list_t *wf; - pool_get_aligned (wbm->buffer_free_list_pool, + pool_get_aligned (wvm->buffer_free_list_pool, wf, CLIB_CACHE_LINE_BYTES); - ASSERT (f - bm->buffer_free_list_pool == - wf - wbm->buffer_free_list_pool); + ASSERT (f - vm->buffer_free_list_pool == + wf - wvm->buffer_free_list_pool); wf[0] = f[0]; wf->buffers = 0; wf->n_alloc = 0; @@ -412,7 +411,7 @@ vlib_buffer_create_free_list_helper (vlib_main_t * vm, return f->index; } -u32 +vlib_buffer_free_list_index_t vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes, char *fmt, ...) { @@ -429,230 +428,180 @@ vlib_buffer_create_free_list (vlib_main_t * vm, u32 n_data_bytes, name); } -u32 -vlib_buffer_get_or_create_free_list (vlib_main_t * vm, u32 n_data_bytes, - char *fmt, ...) -{ - u32 i = vlib_buffer_get_free_list_with_size (vm, n_data_bytes); - - if (i == ~0) - { - va_list va; - u8 *name; - - va_start (va, fmt); - name = va_format (0, fmt, &va); - va_end (va); - - i = vlib_buffer_create_free_list_helper (vm, n_data_bytes, - /* is_public */ 1, - /* is_default */ 0, - name); - } - - return i; -} - static void del_free_list (vlib_main_t * vm, vlib_buffer_free_list_t * f) { - u32 i; + vlib_buffer_pool_t *bp = vlib_buffer_pool_get (f->buffer_pool_index); - for (i = 0; i < vec_len (f->buffer_memory_allocated); i++) - vm->os_physmem_free (f->buffer_memory_allocated[i]); + vec_add_aligned (bp->buffers, f->buffers, vec_len (f->buffers), + CLIB_CACHE_LINE_BYTES); vec_free (f->name); - vec_free (f->buffer_memory_allocated); vec_free (f->buffers); + + /* Poison it. */ + clib_memset (f, 0xab, sizeof (f[0])); } /* Add buffer free list. */ void -vlib_buffer_delete_free_list_internal (vlib_main_t * vm, u32 free_list_index) +vlib_buffer_delete_free_list_internal (vlib_main_t * vm, + vlib_buffer_free_list_index_t index) { - vlib_buffer_main_t *bm = vm->buffer_main; vlib_buffer_free_list_t *f; - u32 merge_index; int i; ASSERT (vlib_get_thread_index () == 0); - f = vlib_buffer_get_free_list (vm, free_list_index); + f = vlib_buffer_get_free_list (vm, index); ASSERT (vec_len (f->buffers) == f->n_alloc); - merge_index = vlib_buffer_get_free_list_with_size (vm, f->n_data_bytes); - if (merge_index != ~0 && merge_index != free_list_index) - { - vlib_buffer_merge_free_lists (pool_elt_at_index - (bm->buffer_free_list_pool, merge_index), - f); - } del_free_list (vm, f); - /* Poison it. */ - memset (f, 0xab, sizeof (f[0])); - - pool_put (bm->buffer_free_list_pool, f); + pool_put (vm->buffer_free_list_pool, f); for (i = 1; i < vec_len (vlib_mains); i++) { - bm = vlib_mains[i]->buffer_main; - f = vlib_buffer_get_free_list (vlib_mains[i], free_list_index);; - memset (f, 0xab, sizeof (f[0])); - pool_put (bm->buffer_free_list_pool, f); + vlib_main_t *wvm = vlib_mains[i]; + f = vlib_buffer_get_free_list (vlib_mains[i], index); + del_free_list (wvm, f); + pool_put (wvm->buffer_free_list_pool, f); } } +static_always_inline void * +vlib_buffer_pool_get_buffer (vlib_buffer_pool_t * bp) +{ + uword slot, page, addr; + + if (PREDICT_FALSE (bp->n_elts == bp->n_used)) + { + clib_spinlock_unlock (&bp->lock); + return 0; + } + slot = bp->next_clear; + bp->bitmap = clib_bitmap_set (bp->bitmap, slot, 1); + bp->next_clear = clib_bitmap_next_clear (bp->bitmap, slot + 1); + bp->n_used++; + + page = slot / bp->buffers_per_page; + slot -= page * bp->buffers_per_page; + + addr = bp->start + (page << bp->log2_page_size) + slot * bp->buffer_size; + + return uword_to_pointer (addr, void *); +} + /* Make sure free list has at least given number of free buffers. */ static uword -fill_free_list (vlib_main_t * vm, - vlib_buffer_free_list_t * fl, uword min_free_buffers) +vlib_buffer_fill_free_list_internal (vlib_main_t * vm, + vlib_buffer_free_list_t * fl, + uword min_free_buffers) { - vlib_buffer_t *buffers, *b; - int n, n_bytes, i; + vlib_buffer_t *b; + vlib_buffer_pool_t *bp = vlib_buffer_pool_get (fl->buffer_pool_index); + int n; u32 *bi; - u32 n_remaining, n_alloc, n_this_chunk; + u32 n_alloc = 0; /* Already have enough free buffers on free list? */ n = min_free_buffers - vec_len (fl->buffers); if (n <= 0) return min_free_buffers; + if (vec_len (bp->buffers) > 0) + { + int n_copy, n_left; + clib_spinlock_lock (&bp->lock); + n_copy = clib_min (vec_len (bp->buffers), n); + n_left = vec_len (bp->buffers) - n_copy; + vec_add_aligned (fl->buffers, bp->buffers + n_left, n_copy, + CLIB_CACHE_LINE_BYTES); + _vec_len (bp->buffers) = n_left; + clib_spinlock_unlock (&bp->lock); + n = min_free_buffers - vec_len (fl->buffers); + if (n <= 0) + return min_free_buffers; + } + /* Always allocate round number of buffers. */ n = round_pow2 (n, CLIB_CACHE_LINE_BYTES / sizeof (u32)); /* Always allocate new buffers in reasonably large sized chunks. */ - n = clib_max (n, fl->min_n_buffers_each_physmem_alloc); + n = clib_max (n, fl->min_n_buffers_each_alloc); - n_remaining = n; - n_alloc = 0; - while (n_remaining > 0) + clib_spinlock_lock (&bp->lock); + while (n_alloc < n) { - n_this_chunk = clib_min (n_remaining, 16); + if ((b = vlib_buffer_pool_get_buffer (bp)) == 0) + goto done; - n_bytes = n_this_chunk * (sizeof (b[0]) + fl->n_data_bytes); + n_alloc += 1; - /* drb: removed power-of-2 ASSERT */ - buffers = vm->os_physmem_alloc_aligned (&vm->physmem_main, - n_bytes, - sizeof (vlib_buffer_t)); - if (!buffers) - return n_alloc; + vec_add2_aligned (fl->buffers, bi, 1, CLIB_CACHE_LINE_BYTES); + bi[0] = vlib_get_buffer_index (vm, b); - /* Record chunk as being allocated so we can free it later. */ - vec_add1 (fl->buffer_memory_allocated, buffers); + if (CLIB_DEBUG > 0) + vlib_buffer_set_known_state (bi[0], VLIB_BUFFER_KNOWN_FREE); - fl->n_alloc += n_this_chunk; - n_alloc += n_this_chunk; - n_remaining -= n_this_chunk; - - b = buffers; - vec_add2_aligned (fl->buffers, bi, n_this_chunk, CLIB_CACHE_LINE_BYTES); - for (i = 0; i < n_this_chunk; i++) - { - bi[i] = vlib_get_buffer_index (vm, b); - - if (CLIB_DEBUG > 0) - vlib_buffer_set_known_state (vm, bi[i], VLIB_BUFFER_KNOWN_FREE); - b = vlib_buffer_next_contiguous (b, fl->n_data_bytes); - } - - memset (buffers, 0, n_bytes); - - /* Initialize all new buffers. */ - b = buffers; - for (i = 0; i < n_this_chunk; i++) - { - vlib_buffer_init_for_free_list (b, fl); - b = vlib_buffer_next_contiguous (b, fl->n_data_bytes); - } + clib_memset (b, 0, sizeof (vlib_buffer_t)); + vlib_buffer_init_for_free_list (b, fl); if (fl->buffer_init_function) - fl->buffer_init_function (vm, fl, bi, n_this_chunk); + fl->buffer_init_function (vm, fl, bi, 1); } - return n_alloc; -} - -static u32 -alloc_from_free_list (vlib_main_t * vm, - vlib_buffer_free_list_t * free_list, - u32 * alloc_buffers, u32 n_alloc_buffers) -{ - u32 *dst, *src; - uword len; - uword n_filled; - - dst = alloc_buffers; - - /* wait with buffer memory allocation as long as possible - in case external buffer manager takes over */ - if (PREDICT_FALSE (vm->os_physmem_alloc_aligned == 0)) - unix_physmem_init (vm, 0 /* fail_if_physical_memory_not_present */ ); - - n_filled = fill_free_list (vm, free_list, n_alloc_buffers); - if (n_filled == 0) - return 0; - len = vec_len (free_list->buffers); - ASSERT (len >= n_alloc_buffers); - - src = free_list->buffers + len - n_alloc_buffers; - clib_memcpy (dst, src, n_alloc_buffers * sizeof (u32)); - - _vec_len (free_list->buffers) -= n_alloc_buffers; - - /* Verify that buffers are known free. */ - vlib_buffer_validate_alloc_free (vm, alloc_buffers, - n_alloc_buffers, VLIB_BUFFER_KNOWN_FREE); - - return n_alloc_buffers; -} - - -/* Allocate a given number of buffers into given array. - Returns number actually allocated which will be either zero or - number requested. */ -static u32 -vlib_buffer_alloc_internal (vlib_main_t * vm, u32 * buffers, u32 n_buffers) -{ - vlib_buffer_main_t *bm = vm->buffer_main; - - return alloc_from_free_list - (vm, - pool_elt_at_index (bm->buffer_free_list_pool, - VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX), - buffers, n_buffers); -} - -static u32 -vlib_buffer_alloc_from_free_list_internal (vlib_main_t * vm, - u32 * buffers, - u32 n_buffers, u32 free_list_index) -{ - vlib_buffer_main_t *bm = vm->buffer_main; - vlib_buffer_free_list_t *f; - f = pool_elt_at_index (bm->buffer_free_list_pool, free_list_index); - return alloc_from_free_list (vm, f, buffers, n_buffers); +done: + clib_spinlock_unlock (&bp->lock); + fl->n_alloc += n_alloc; + return n_alloc; } void * vlib_set_buffer_free_callback (vlib_main_t * vm, void *fp) { - vlib_buffer_main_t *bm = vm->buffer_main; + vlib_buffer_main_t *bm = &buffer_main; void *rv = bm->buffer_free_callback; bm->buffer_free_callback = fp; return rv; } +static_always_inline void +recycle_or_free (vlib_main_t * vm, vlib_buffer_main_t * bm, u32 bi, + vlib_buffer_t * b, u32 follow_buffer_next) +{ + vlib_buffer_free_list_t *fl; + vlib_buffer_free_list_index_t fi; + u32 flags, next; + + fl = vlib_buffer_get_buffer_free_list (vm, b, &fi); + + do + { + vlib_buffer_t *nb = vlib_get_buffer (vm, bi); + flags = nb->flags; + next = nb->next_buffer; + if (nb->n_add_refs) + nb->n_add_refs--; + else + { + vlib_buffer_validate_alloc_free (vm, &bi, 1, + VLIB_BUFFER_KNOWN_ALLOCATED); + vlib_buffer_add_to_free_list (vm, fl, bi, 1); + } + bi = next; + } + while (follow_buffer_next && (flags & VLIB_BUFFER_NEXT_PRESENT)); +} + static_always_inline void vlib_buffer_free_inline (vlib_main_t * vm, u32 * buffers, u32 n_buffers, u32 follow_buffer_next) { - vlib_buffer_main_t *bm = vm->buffer_main; - vlib_buffer_free_list_t *fl; - u32 fi; - int i; + vlib_buffer_main_t *bm = &buffer_main; + vlib_buffer_t *p, *b0, *b1, *b2, *b3; + int i = 0; u32 (*cb) (vlib_main_t * vm, u32 * buffers, u32 n_buffers, u32 follow_buffer_next); @@ -664,68 +613,41 @@ vlib_buffer_free_inline (vlib_main_t * vm, if (!n_buffers) return; - for (i = 0; i < n_buffers; i++) + while (i + 11 < n_buffers) { - vlib_buffer_t *b; - u32 bi = buffers[i]; - - b = vlib_get_buffer (vm, bi); - - fl = vlib_buffer_get_buffer_free_list (vm, b, &fi); - - /* The only current use of this callback: multicast recycle */ - if (PREDICT_FALSE (fl->buffers_added_to_freelist_function != 0)) - { - int j; - - vlib_buffer_add_to_free_list - (vm, fl, buffers[i], (b->flags & VLIB_BUFFER_RECYCLE) == 0); - - for (j = 0; j < vec_len (bm->announce_list); j++) - { - if (fl == bm->announce_list[j]) - goto already_announced; - } - vec_add1 (bm->announce_list, fl); - already_announced: - ; - } - else - { - if (PREDICT_TRUE ((b->flags & VLIB_BUFFER_RECYCLE) == 0)) - { - u32 flags, next; - - do - { - vlib_buffer_t *nb = vlib_get_buffer (vm, bi); - flags = nb->flags; - next = nb->next_buffer; - if (nb->n_add_refs) - nb->n_add_refs--; - else - { - vlib_buffer_validate_alloc_free (vm, &bi, 1, - VLIB_BUFFER_KNOWN_ALLOCATED); - vlib_buffer_add_to_free_list (vm, fl, bi, 1); - } - bi = next; - } - while (follow_buffer_next - && (flags & VLIB_BUFFER_NEXT_PRESENT)); - - } - } + p = vlib_get_buffer (vm, buffers[i + 8]); + vlib_prefetch_buffer_header (p, LOAD); + p = vlib_get_buffer (vm, buffers[i + 9]); + vlib_prefetch_buffer_header (p, LOAD); + p = vlib_get_buffer (vm, buffers[i + 10]); + vlib_prefetch_buffer_header (p, LOAD); + p = vlib_get_buffer (vm, buffers[i + 11]); + vlib_prefetch_buffer_header (p, LOAD); + + b0 = vlib_get_buffer (vm, buffers[i]); + b1 = vlib_get_buffer (vm, buffers[i + 1]); + b2 = vlib_get_buffer (vm, buffers[i + 2]); + b3 = vlib_get_buffer (vm, buffers[i + 3]); + + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3); + + recycle_or_free (vm, bm, buffers[i], b0, follow_buffer_next); + recycle_or_free (vm, bm, buffers[i + 1], b1, follow_buffer_next); + recycle_or_free (vm, bm, buffers[i + 2], b2, follow_buffer_next); + recycle_or_free (vm, bm, buffers[i + 3], b3, follow_buffer_next); + + i += 4; } - if (vec_len (bm->announce_list)) + + while (i < n_buffers) { - vlib_buffer_free_list_t *fl; - for (i = 0; i < vec_len (bm->announce_list); i++) - { - fl = bm->announce_list[i]; - fl->buffers_added_to_freelist_function (vm, fl); - } - _vec_len (bm->announce_list) = 0; + b0 = vlib_get_buffer (vm, buffers[i]); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + recycle_or_free (vm, bm, buffers[i], b0, follow_buffer_next); + i++; } } @@ -769,12 +691,11 @@ vlib_packet_template_init (vlib_main_t * vm, vlib_packet_template_t * t, void *packet_data, uword n_packet_data_bytes, - uword min_n_buffers_each_physmem_alloc, - char *fmt, ...) + uword min_n_buffers_each_alloc, char *fmt, ...) { - vlib_buffer_main_t *bm = vm->buffer_main; + vlib_buffer_main_t *bm = &buffer_main; va_list va; - __attribute__ ((unused)) u8 *name; + u8 *name; vlib_buffer_free_list_t *fl; va_start (va, fmt); @@ -784,15 +705,14 @@ vlib_packet_template_init (vlib_main_t * vm, if (bm->cb.vlib_packet_template_init_cb) bm->cb.vlib_packet_template_init_cb (vm, (void *) t, packet_data, n_packet_data_bytes, - min_n_buffers_each_physmem_alloc, - name); + min_n_buffers_each_alloc, name); vlib_worker_thread_barrier_sync (vm); - memset (t, 0, sizeof (t[0])); + clib_memset (t, 0, sizeof (t[0])); vec_add (t->packet_data, packet_data, n_packet_data_bytes); - t->min_n_buffers_each_physmem_alloc = min_n_buffers_each_physmem_alloc; + t->min_n_buffers_each_alloc = min_n_buffers_each_alloc; t->free_list_index = vlib_buffer_create_free_list_helper (vm, n_packet_data_bytes, @@ -802,7 +722,7 @@ vlib_packet_template_init (vlib_main_t * vm, ASSERT (t->free_list_index != 0); fl = vlib_buffer_get_free_list (vm, t->free_list_index); - fl->min_n_buffers_each_physmem_alloc = t->min_n_buffers_each_physmem_alloc; + fl->min_n_buffers_each_alloc = t->min_n_buffers_each_alloc; fl->buffer_init_function = vlib_packet_template_buffer_init; fl->buffer_init_function_opaque = pointer_to_uword (t); @@ -838,7 +758,7 @@ void vlib_packet_template_get_packet_helper (vlib_main_t * vm, vlib_packet_template_t * t) { - word n = t->min_n_buffers_each_physmem_alloc; + word n = t->min_n_buffers_each_alloc; word l = vec_len (t->packet_data); word n_alloc; @@ -854,7 +774,7 @@ vlib_packet_template_get_packet_helper (vlib_main_t * vm, /* Append given data to end of buffer, possibly allocating new buffers. */ u32 vlib_buffer_add_data (vlib_main_t * vm, - u32 free_list_index, + vlib_buffer_free_list_index_t free_list_index, u32 buffer_index, void *data, u32 n_data_bytes) { u32 n_buffer_bytes, n_left, n_left_this_buffer, bi; @@ -862,7 +782,7 @@ vlib_buffer_add_data (vlib_main_t * vm, void *d; bi = buffer_index; - if (bi == 0 + if (bi == ~0 && 1 != vlib_buffer_alloc_from_free_list (vm, &bi, 1, free_list_index)) goto out_of_buffers; @@ -911,10 +831,11 @@ out_of_buffers: u16 vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm, - u32 free_list_index, + vlib_buffer_free_list_index_t + free_list_index, vlib_buffer_t * first, - vlib_buffer_t ** last, - void *data, u16 data_len) + vlib_buffer_t ** last, void *data, + u16 data_len) { vlib_buffer_t *l = *last; u32 n_buffer_bytes = @@ -944,6 +865,59 @@ vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm, return copied; } +u8 +vlib_buffer_pool_create (vlib_main_t * vm, vlib_physmem_region_index_t pri, + u16 buffer_size) +{ + vlib_buffer_main_t *bm = &buffer_main; + vlib_physmem_region_t *pr = vlib_physmem_get_region (vm, pri); + vlib_buffer_pool_t *p; + uword start = pointer_to_uword (pr->mem); + uword size = pr->size; + + if (bm->buffer_mem_size == 0) + { + bm->buffer_mem_start = start; + bm->buffer_mem_size = size; + } + else if (start < bm->buffer_mem_start) + { + bm->buffer_mem_size += bm->buffer_mem_start - start; + bm->buffer_mem_start = start; + if (size > bm->buffer_mem_size) + bm->buffer_mem_size = size; + } + else if (start > bm->buffer_mem_start) + { + uword new_size = start - bm->buffer_mem_start + size; + if (new_size > bm->buffer_mem_size) + bm->buffer_mem_size = new_size; + } + + if ((u64) bm->buffer_mem_size > + ((u64) 1 << (32 + CLIB_LOG2_CACHE_LINE_BYTES))) + { + clib_panic ("buffer memory size out of range!"); + } + + vec_add2 (bm->buffer_pools, p, 1); + p->start = start; + p->size = size; + p->physmem_region = pri; + + if (buffer_size == 0) + goto done; + + p->log2_page_size = pr->log2_page_size; + p->buffer_size = buffer_size; + p->buffers_per_page = (1ull << pr->log2_page_size) / p->buffer_size; + p->n_elts = p->buffers_per_page * pr->n_pages; + p->n_used = 0; + clib_spinlock_init (&p->lock); +done: + ASSERT (p - bm->buffer_pools < 256); + return p - bm->buffer_pools; +} static u8 * format_vlib_buffer_free_list (u8 * s, va_list * va) @@ -962,7 +936,7 @@ format_vlib_buffer_free_list (u8 * s, va_list * va) bytes_alloc = size * f->n_alloc; bytes_free = size * n_free; - s = format (s, "%7d%30s%12d%12d%=12U%=12U%=12d%=12d", threadnum, + s = format (s, "%7d%30v%12d%12d%=12U%=12U%=12d%=12d", threadnum, f->name, f->index, f->n_data_bytes, format_memory_size, bytes_alloc, format_memory_size, bytes_free, f->n_alloc, n_free); @@ -974,7 +948,6 @@ static clib_error_t * show_buffers (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - vlib_buffer_main_t *bm; vlib_buffer_free_list_t *f; vlib_main_t *curr_vm; u32 vm_index = 0; @@ -984,10 +957,9 @@ show_buffers (vlib_main_t * vm, do { curr_vm = vlib_mains[vm_index]; - bm = curr_vm->buffer_main; /* *INDENT-OFF* */ - pool_foreach (f, bm->buffer_free_list_pool, ({ + pool_foreach (f, curr_vm->buffer_free_list_pool, ({ vlib_cli_output (vm, "%U", format_vlib_buffer_free_list, f, vm_index); })); /* *INDENT-ON* */ @@ -1007,38 +979,71 @@ VLIB_CLI_COMMAND (show_buffers_command, static) = { }; /* *INDENT-ON* */ -void -vlib_buffer_cb_init (struct vlib_main_t *vm) +clib_error_t * +vlib_buffer_main_init (struct vlib_main_t * vm) { - vlib_buffer_main_t *bm = vm->buffer_main; - bm->cb.vlib_buffer_alloc_cb = &vlib_buffer_alloc_internal; - bm->cb.vlib_buffer_alloc_from_free_list_cb = - &vlib_buffer_alloc_from_free_list_internal; + vlib_buffer_main_t *bm = &buffer_main; + vlib_physmem_region_index_t pri; + clib_error_t *error; + + if (vlib_buffer_callbacks) + { + /* external plugin has registered own buffer callbacks + so we just copy them and quit */ + clib_memcpy (&bm->cb, vlib_buffer_callbacks, + sizeof (vlib_buffer_callbacks_t)); + bm->callbacks_registered = 1; + return 0; + } + + bm->cb.vlib_buffer_fill_free_list_cb = &vlib_buffer_fill_free_list_internal; bm->cb.vlib_buffer_free_cb = &vlib_buffer_free_internal; bm->cb.vlib_buffer_free_no_next_cb = &vlib_buffer_free_no_next_internal; bm->cb.vlib_buffer_delete_free_list_cb = &vlib_buffer_delete_free_list_internal; - bm->extern_buffer_mgmt = 0; + clib_spinlock_init (&bm->buffer_known_hash_lockp); + + /* allocate default region */ + error = vlib_physmem_region_alloc (vm, "buffers", + vlib_buffer_physmem_sz, 0, + VLIB_PHYSMEM_F_SHARED | + VLIB_PHYSMEM_F_HUGETLB, &pri); + + if (error == 0) + goto done; + + clib_error_free (error); + + error = vlib_physmem_region_alloc (vm, "buffers", + vlib_buffer_physmem_sz, 0, + VLIB_PHYSMEM_F_SHARED, &pri); +done: + if (error == 0) + vlib_buffer_pool_create (vm, pri, sizeof (vlib_buffer_t) + + VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES); + return error; } -int -vlib_buffer_cb_register (struct vlib_main_t *vm, vlib_buffer_callbacks_t * cb) +static clib_error_t * +vlib_buffers_configure (vlib_main_t * vm, unformat_input_t * input) { - vlib_buffer_main_t *bm = vm->buffer_main; - if (bm->extern_buffer_mgmt) - return -1; - -#define _(x) bm->cb.x = cb->x - _(vlib_buffer_alloc_cb); - _(vlib_buffer_alloc_from_free_list_cb); - _(vlib_buffer_free_cb); - _(vlib_buffer_free_no_next_cb); - _(vlib_buffer_delete_free_list_cb); -#undef _ - bm->extern_buffer_mgmt = 1; + u32 size_in_mb; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "memory-size-in-mb %d", &size_in_mb)) + vlib_buffer_physmem_sz = size_in_mb << 20; + else + return unformat_parse_error (input); + } + + unformat_free (input); return 0; } +VLIB_EARLY_CONFIG_FUNCTION (vlib_buffers_configure, "buffers"); + + /** @endcond */ /* * fd.io coding-style-patch-verification: ON