#include <svm/fifo_segment.h>
+static inline fifo_segment_slice_t *
+fsh_slice_get (fifo_segment_header_t * fsh, u32 slice_index)
+{
+ return &fsh->slices[slice_index];
+}
+
static char *fifo_segment_mem_status_strings[] = {
#define _(sym,str) str,
foreach_segment_mem_status
static uword
fsh_free_space (fifo_segment_header_t * fsh)
{
- struct dlmallinfo dlminfo;
-
- dlminfo = mspace_mallinfo (fsh->ssvm_sh->heap);
- return dlminfo.fordblks;
+ return clib_mem_get_heap_free_space (fsh->ssvm_sh->heap);
}
static inline void
}
static inline void
-fsh_cached_bytes_add (fifo_segment_header_t * fsh, int size)
+fsh_cached_bytes_add (fifo_segment_header_t * fsh, uword 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)
+fsh_cached_bytes_sub (fifo_segment_header_t * fsh, uword size)
{
clib_atomic_fetch_sub_rel (&fsh->n_cached_bytes, size);
}
return n_cached;
}
+static inline void
+fsh_active_fifos_update (fifo_segment_header_t * fsh, int inc)
+{
+ clib_atomic_fetch_add_rel (&fsh->n_active_fifos, inc);
+}
+
+static inline u32
+fsh_n_active_fifos (fifo_segment_header_t * fsh)
+{
+ return clib_atomic_load_relax_n (&fsh->n_active_fifos);
+}
+
+static inline uword
+fsh_virtual_mem (fifo_segment_header_t * fsh)
+{
+ fifo_segment_slice_t *fss;
+ uword total_vm = 0;
+ int i;
+
+ for (i = 0; i < fsh->n_slices; i++)
+ {
+ fss = fsh_slice_get (fsh, i);
+ total_vm += clib_atomic_load_relax_n (&fss->virtual_mem);
+ }
+ return total_vm;
+}
+
+void
+fsh_virtual_mem_update (fifo_segment_header_t * fsh, u32 slice_index,
+ int n_bytes)
+{
+ fifo_segment_slice_t *fss = fsh_slice_get (fsh, slice_index);
+ fss->virtual_mem += n_bytes;
+}
+
static void
fsh_check_mem (fifo_segment_header_t * fsh)
{
fsh_update_free_bytes (fsh);
}
-static inline fifo_segment_slice_t *
-fsh_slice_get (fifo_segment_header_t * fsh, u32 slice_index)
+static inline int
+fss_chunk_fl_index_is_valid (fifo_segment_slice_t * fss, u32 fl_index)
{
- return &fsh->slices[slice_index];
+ return (fl_index < vec_len (fss->free_chunks));
+}
+
+static void
+fss_chunk_free_list_push (fifo_segment_slice_t * fss, u32 fl_index,
+ svm_fifo_chunk_t * c)
+{
+ clib_spinlock_lock (&fss->chunk_lock);
+ c->next = fss->free_chunks[fl_index];
+ fss->free_chunks[fl_index] = c;
+ clib_spinlock_unlock (&fss->chunk_lock);
+}
+
+static void
+fss_chunk_free_list_push_list (fifo_segment_slice_t * fss, u32 fl_index,
+ svm_fifo_chunk_t * head,
+ svm_fifo_chunk_t * tail)
+{
+ clib_spinlock_lock (&fss->chunk_lock);
+ tail->next = fss->free_chunks[fl_index];
+ fss->free_chunks[fl_index] = head;
+ clib_spinlock_unlock (&fss->chunk_lock);
+}
+
+static svm_fifo_chunk_t *
+fss_chunk_free_list_pop (fifo_segment_slice_t * fss, u32 fl_index)
+{
+ svm_fifo_chunk_t *c;
+
+ ASSERT (fss_chunk_fl_index_is_valid (fss, fl_index));
+
+ clib_spinlock_lock (&fss->chunk_lock);
+
+ if (!fss->free_chunks[fl_index])
+ {
+ clib_spinlock_unlock (&fss->chunk_lock);
+ return 0;
+ }
+
+ c = fss->free_chunks[fl_index];
+ fss->free_chunks[fl_index] = c->next;
+
+ clib_spinlock_unlock (&fss->chunk_lock);
+
+ return c;
}
static inline void
-fsh_active_fifos_update (fifo_segment_header_t * fsh, int inc)
+fss_fifo_add_active_list (fifo_segment_slice_t * fss, svm_fifo_t * f)
{
- clib_atomic_fetch_add_rel (&fsh->n_active_fifos, inc);
+ if (fss->fifos)
+ {
+ fss->fifos->prev = f;
+ f->next = fss->fifos;
+ }
+ fss->fifos = f;
+}
+
+static inline void
+fss_fifo_del_active_list (fifo_segment_slice_t * fss, svm_fifo_t * f)
+{
+ if (f->flags & SVM_FIFO_F_LL_TRACKED)
+ {
+ if (f->prev)
+ f->prev->next = f->next;
+ else
+ fss->fifos = f->next;
+ if (f->next)
+ f->next->prev = f->prev;
+ }
+}
+
+static inline uword
+fss_fl_chunk_bytes (fifo_segment_slice_t * fss)
+{
+ return clib_atomic_load_relax_n (&fss->n_fl_chunk_bytes);
+}
+
+static inline void
+fss_fl_chunk_bytes_add (fifo_segment_slice_t * fss, uword size)
+{
+ clib_atomic_fetch_add_relax (&fss->n_fl_chunk_bytes, size);
+}
+
+static inline void
+fss_fl_chunk_bytes_sub (fifo_segment_slice_t * fss, uword size)
+{
+ clib_atomic_fetch_sub_relax (&fss->n_fl_chunk_bytes, size);
}
/**
fifo_segment_header_t *fsh;
fifo_segment_slice_t *fss;
ssvm_shared_header_t *sh;
- u32 max_chunk_sz, max_chunks;
+ u32 max_chunk_sz;
uword max_fifo;
void *oldheap;
int i;
{
fss = fsh_slice_get (fsh, i);
vec_validate_init_empty (fss->free_chunks, max_chunk_sz, 0);
+ vec_validate_init_empty (fss->num_chunks, max_chunk_sz, 0);
clib_spinlock_init (&fss->chunk_lock);
}
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);
+ fsh->n_reserved_bytes = clib_min (0.01 * fsh->n_free_bytes, 256 << 10);
sh->ready = 1;
return (0);
}
baseva = a->segment_type == SSVM_SEGMENT_PRIVATE ? ~0ULL : sm->next_baseva;
fs->ssvm.ssvm_size = a->segment_size;
- fs->ssvm.i_am_master = 1;
+ fs->ssvm.is_server = 1;
fs->ssvm.my_pid = getpid ();
fs->ssvm.name = format (0, "%s%c", a->segment_name, 0);
fs->ssvm.requested_va = baseva;
- if ((rv = ssvm_master_init (&fs->ssvm, a->segment_type)))
+ if ((rv = ssvm_server_init (&fs->ssvm, a->segment_type)))
{
pool_put (sm->segments, fs);
return (rv);
else
fs->ssvm.attach_timeout = sm->timeout_in_seconds;
- if ((rv = ssvm_slave_init (&fs->ssvm, a->segment_type)))
+ if ((rv = ssvm_client_init (&fs->ssvm, a->segment_type)))
{
_vec_len (fs) = vec_len (fs) - 1;
return (rv);
* with a smaller FIFO.
*/
return size >= FIFO_SEGMENT_MIN_FIFO_SIZE
- && size <= (1 << fsh->max_log2_chunk_size);
-}
-
-static svm_fifo_t *
-fs_try_alloc_fifo_freelist (fifo_segment_slice_t * fss, u32 fl_index)
-{
- svm_fifo_chunk_t *c;
- svm_fifo_t *f;
-
- f = fss->free_fifos;
- c = fss->free_chunks[fl_index];
-
- if (!f || !c)
- return 0;
-
- fss->free_fifos = f->next;
- fss->free_chunks[fl_index] = c->next;
- c->next = 0;
- c->start_byte = 0;
- memset (f, 0, sizeof (*f));
- f->start_chunk = c;
- f->end_chunk = c;
-
- fss->n_fl_chunk_bytes -= fs_freelist_index_to_size (fl_index);
- return f;
+ && size <= (1ULL << fsh->max_log2_chunk_size);
}
svm_fifo_chunk_t *
while (req_bytes)
{
- c = fss->free_chunks[fl_index];
+ c = fss_chunk_free_list_pop (fss, fl_index);
if (c)
{
- fss->free_chunks[fl_index] = c->next;
c->next = first;
first = c;
n_alloc += fl_size;
/* Failed to allocate with smaller chunks */
if (fl_index == 0)
{
- /* free all chunks if any allocated */
+ /* 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;
+ fss_chunk_free_list_push (fss, fl_index, c);
c = next;
}
n_alloc = 0;
first = 0;
- fl_index = fs_freelist_for_size (data_bytes);
- if (fss->free_chunks[fl_index + 1])
+ /* As last attempt, try allocating a chunk larger than
+ * the requested size, if possible */
+ fl_index = fs_freelist_for_size (data_bytes) + 1;
+ if (!fss_chunk_fl_index_is_valid (fss, fl_index))
+ return 0;
+ first = fss_chunk_free_list_pop (fss, fl_index);
+ if (first)
{
- fl_index += 1;
- fl_size = fs_freelist_index_to_size (fl_index);
- continue;
+ first->next = 0;
+ n_alloc = fs_freelist_index_to_size (fl_index);
+ goto done;
}
-
return 0;
}
fl_index -= 1;
}
}
- fss->n_fl_chunk_bytes -= n_alloc;
+done:
+ fss_fl_chunk_bytes_sub (fss, 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,
- u32 data_bytes)
+static int
+fsh_try_alloc_fifo_hdr_batch (fifo_segment_header_t * fsh,
+ fifo_segment_slice_t * fss, u32 batch_size)
{
- svm_fifo_chunk_t *c, *first = 0, *last = 0, *next;
- u32 fl_index, fl_size, n_alloc = 0;
svm_fifo_t *f;
+ void *oldheap;
+ uword size;
+ u8 *fmem;
+ int i;
- f = fss->free_fifos;
- if (!f)
- {
- void *oldheap = ssvm_push_heap (fsh->ssvm_sh);
- f = clib_mem_alloc_aligned (sizeof (*f), CLIB_CACHE_LINE_BYTES);
- ssvm_pop_heap (oldheap);
- if (!f)
- return 0;
- memset (f, 0, sizeof (*f));
- fsh_free_bytes_sub (fsh, sizeof (*f));
- }
- else
- {
- fss->free_fifos = f->next;
- }
+ size = (uword) sizeof (*f) * batch_size;
- fl_index = fs_freelist_for_size (data_bytes);
- if (fl_index > 0)
- fl_index -= 1;
+ oldheap = ssvm_push_heap (fsh->ssvm_sh);
+ fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
+ 0 /* align_offset */ ,
+ 0 /* os_out_of_memory */ );
+ ssvm_pop_heap (oldheap);
- fl_size = fs_freelist_index_to_size (fl_index);
+ /* Out of space.. */
+ if (fmem == 0)
+ return -1;
- while (data_bytes)
+ /* Carve fifo hdr space */
+ for (i = 0; i < batch_size; i++)
{
- c = fss->free_chunks[fl_index];
- if (c)
- {
- fss->free_chunks[fl_index] = c->next;
- if (!last)
- last = c;
- c->next = first;
- first = c;
- n_alloc += fl_size;
- data_bytes -= clib_min (fl_size, data_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;
- n_alloc -= fl_size;
- data_bytes += fl_size;
- c = next;
- }
- first = last = 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;
- }
-
- f->next = fss->free_fifos;
- fss->free_fifos = f;
- return 0;
- }
- fl_index -= 1;
- fl_size = fl_size >> 1;
- }
+ f = (svm_fifo_t *) fmem;
+ memset (f, 0, sizeof (*f));
+ f->next = fss->free_fifos;
+ fss->free_fifos = f;
+ fmem += sizeof (*f);
}
- f->start_chunk = first;
- f->end_chunk = last;
- fss->n_fl_chunk_bytes -= n_alloc;
- fsh_cached_bytes_sub (fsh, n_alloc);
- return f;
+ return 0;
}
static int
fifo_segment_slice_t * fss,
u32 fl_index, u32 batch_size)
{
+ svm_fifo_chunk_t *c, *head = 0, *tail;
+ uword size, total_chunk_bytes;
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);
+ total_chunk_bytes = (uword) batch_size *rounded_data_size;
size = (uword) (sizeof (*c) + rounded_data_size) * batch_size;
oldheap = ssvm_push_heap (fsh->ssvm_sh);
return -1;
/* Carve fifo + chunk space */
+ tail = c = (svm_fifo_chunk_t *) cmem;
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;
+ c->next = head;
+ head = c;
cmem += sizeof (*c) + rounded_data_size;
+ c = (svm_fifo_chunk_t *) cmem;
}
- fss->n_fl_chunk_bytes += batch_size * rounded_data_size;
- fsh_cached_bytes_add (fsh, batch_size * rounded_data_size);
+ fss_chunk_free_list_push_list (fss, fl_index, head, tail);
+ fss->num_chunks[fl_index] += batch_size;
+ fss_fl_chunk_bytes_add (fss, total_chunk_bytes);
+ fsh_cached_bytes_add (fsh, total_chunk_bytes);
fsh_free_bytes_sub (fsh, size);
return 0;
fifo_segment_slice_t * fss,
u32 fl_index, u32 batch_size)
{
- u32 hdrs, rounded_data_size;
- svm_fifo_chunk_t *c;
+ if (fsh_try_alloc_fifo_hdr_batch (fsh, fss, batch_size))
+ return 0;
+ return fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch_size);
+}
+
+static svm_fifo_t *
+fsh_try_alloc_fifo_hdr (fifo_segment_header_t * fsh,
+ fifo_segment_slice_t * fss)
+{
svm_fifo_t *f;
- void *oldheap;
- uword size;
- u8 *fmem;
- int i;
- rounded_data_size = fs_freelist_index_to_size (fl_index);
- hdrs = sizeof (*f) + sizeof (*c);
- size = (uword) (hdrs + rounded_data_size) * batch_size;
+ if (!fss->free_fifos)
+ {
+ if (fsh_try_alloc_fifo_hdr_batch (fsh, fss,
+ FIFO_SEGMENT_ALLOC_BATCH_SIZE))
+ return 0;
+ }
- oldheap = ssvm_push_heap (fsh->ssvm_sh);
- fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
- 0 /* align_offset */ ,
- 0 /* os_out_of_memory */ );
- ssvm_pop_heap (oldheap);
+ f = fss->free_fifos;
+ fss->free_fifos = f->next;
+ memset (f, 0, sizeof (*f));
+ return f;
+}
- /* Out of space.. */
- if (fmem == 0)
- return -1;
+static svm_fifo_chunk_t *
+fsh_try_alloc_chunk (fifo_segment_header_t * fsh,
+ fifo_segment_slice_t * fss, u32 data_bytes)
+{
+ svm_fifo_chunk_t *c;
+ u32 fl_index;
- /* Carve fifo + chunk space */
- for (i = 0; i < batch_size; i++)
+ fl_index = fs_freelist_for_size (data_bytes);
+
+free_list:
+ c = fss_chunk_free_list_pop (fss, fl_index);
+ if (c)
{
- f = (svm_fifo_t *) fmem;
- memset (f, 0, sizeof (*f));
- f->next = fss->free_fifos;
- fss->free_fifos = f;
- c = (svm_fifo_chunk_t *) (fmem + sizeof (*f));
- 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;
- fmem += hdrs + rounded_data_size;
+ c->next = 0;
+ fss_fl_chunk_bytes_sub (fss, fs_freelist_index_to_size (fl_index));
+ fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index));
+ }
+ else
+ {
+ u32 chunk_size, batch = FIFO_SEGMENT_ALLOC_BATCH_SIZE;
+ uword n_free;
+
+ chunk_size = fs_freelist_index_to_size (fl_index);
+ n_free = fsh_n_free_bytes (fsh);
+
+ if (chunk_size <= n_free)
+ {
+ batch = chunk_size * batch <= n_free ? batch : 1;
+ if (!fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch))
+ goto free_list;
+ }
+ /* Failed to allocate larger chunk, try to allocate multi-chunk
+ * that is close to what was actually requested */
+ if (data_bytes <= fss_fl_chunk_bytes (fss))
+ {
+ c = fs_try_alloc_multi_chunk (fsh, fss, data_bytes);
+ if (c)
+ goto done;
+ batch = n_free / FIFO_SEGMENT_MIN_FIFO_SIZE;
+ if (!batch || fsh_try_alloc_chunk_batch (fsh, fss, 0, batch))
+ {
+ fsh_check_mem (fsh);
+ goto done;
+ }
+ }
+ if (data_bytes <= fss_fl_chunk_bytes (fss) + n_free)
+ {
+ u32 min_size = FIFO_SEGMENT_MIN_FIFO_SIZE;
+
+ batch = (data_bytes - fss_fl_chunk_bytes (fss)) / min_size;
+ batch = clib_min (batch + 1, n_free / min_size);
+ if (fsh_try_alloc_chunk_batch (fsh, fss, 0, batch))
+ {
+ fsh_check_mem (fsh);
+ goto done;
+ }
+ c = fs_try_alloc_multi_chunk (fsh, fss, data_bytes);
+ }
}
- 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);
+done:
- return 0;
+ return c;
}
/**
fs_try_alloc_fifo (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss,
u32 data_bytes)
{
- u32 fifo_sz, fl_index;
+ u32 fl_index, min_size;
+ svm_fifo_chunk_t *c;
svm_fifo_t *f = 0;
- uword n_free_bytes;
- u32 min_size;
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 (min_size);
- clib_spinlock_lock (&fss->chunk_lock);
+ if (!fss_chunk_fl_index_is_valid (fss, fl_index))
+ return 0;
- if (fss->free_fifos && fss->free_chunks[fl_index])
- {
- 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;
- }
- }
+ f = fsh_try_alloc_fifo_hdr (fsh, fss);
+ if (!f)
+ return 0;
- fsh_check_mem (fsh);
- n_free_bytes = fsh_n_free_bytes (fsh);
- if (fifo_sz * FIFO_SEGMENT_ALLOC_BATCH_SIZE < n_free_bytes)
+ c = fsh_try_alloc_chunk (fsh, fss, min_size);
+ if (!c)
{
- if (fs_try_alloc_fifo_batch (fsh, fss, fl_index,
- FIFO_SEGMENT_ALLOC_BATCH_SIZE))
- goto done;
-
- 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 (min_size);
- ssvm_pop_heap (oldheap);
- if (f)
- {
- fsh_free_bytes_sub (fsh, fifo_sz);
- goto done;
- }
+ f->next = fss->free_fifos;
+ fss->free_fifos = f;
+ return 0;
}
- /* All failed, try to allocate min of data bytes and fifo sz */
- fifo_sz = clib_min (fifo_sz, data_bytes);
- if (fifo_sz <= fss->n_fl_chunk_bytes)
- f = fs_try_alloc_fifo_freelist_multi_chunk (fsh, fss, fifo_sz);
-done:
- clib_spinlock_unlock (&fss->chunk_lock);
+ f->start_chunk = c;
+ while (c->next)
+ c = c->next;
+ f->end_chunk = c;
+ f->size = data_bytes;
+ f->fs_hdr = fsh;
- if (f)
- {
- f->size = data_bytes;
- f->fs_hdr = fsh;
- }
return f;
}
{
fifo_segment_slice_t *fss;
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)
- {
- 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 (n_free < chunk_size)
- goto done;
-
- oldheap = ssvm_push_heap (fsh->ssvm_sh);
- c = svm_fifo_chunk_alloc (chunk_size);
- ssvm_pop_heap (oldheap);
-
- if (!c)
- goto done;
-
- fsh_free_bytes_sub (fsh, chunk_size + sizeof (*c));
- }
- else if (chunk_size <= fss->n_fl_chunk_bytes)
- {
- 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:
-
- clib_spinlock_unlock (&fss->chunk_lock);
+ c = fsh_try_alloc_chunk (fsh, fss, chunk_size);
return c;
}
fsh_slice_collect_chunks (fifo_segment_header_t * fsh,
fifo_segment_slice_t * fss, svm_fifo_chunk_t * c)
{
+ u32 n_collect = 0, fl_index;
svm_fifo_chunk_t *next;
- int fl_index;
- u32 n_collect = 0;
-
- clib_spinlock_lock (&fss->chunk_lock);
while (c)
{
+ CLIB_MEM_UNPOISON (c, sizeof (*c));
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;
+ fss_chunk_free_list_push (fss, fl_index, c);
n_collect += fs_freelist_index_to_size (fl_index);
c = next;
}
- fss->n_fl_chunk_bytes += n_collect;
+ fss_fl_chunk_bytes_add (fss, n_collect);
fsh_cached_bytes_add (fsh, n_collect);
-
- clib_spinlock_unlock (&fss->chunk_lock);
}
void
ASSERT (slice_index < fs->n_slices);
+ if (PREDICT_FALSE (data_bytes > 1 << fsh->max_log2_chunk_size))
+ return 0;
+
fss = fsh_slice_get (fsh, slice_index);
f = fs_try_alloc_fifo (fsh, fss, data_bytes);
if (!f)
* only one. */
if (ftype == FIFO_SEGMENT_RX_FIFO)
{
- if (fss->fifos)
- {
- fss->fifos->prev = f;
- f->next = fss->fifos;
- }
- fss->fifos = f;
+ fss_fifo_add_active_list (fss, f);
f->flags |= SVM_FIFO_F_LL_TRACKED;
-
- svm_fifo_init_ooo_lookup (f, 0 /* ooo enq */ );
- }
- else
- {
- svm_fifo_init_ooo_lookup (f, 1 /* ooo deq */ );
}
fsh_active_fifos_update (fsh, 1);
+ fss->virtual_mem += svm_fifo_size (f);
done:
return (f);
/* Remove from active list. Only rx fifos are tracked */
if (f->flags & SVM_FIFO_F_LL_TRACKED)
{
- if (f->prev)
- f->prev->next = f->next;
- else
- fss->fifos = f->next;
- if (f->next)
- f->next->prev = f->prev;
+ fss_fifo_del_active_list (fss, f);
f->flags &= ~SVM_FIFO_F_LL_TRACKED;
}
- /* Add to free list */
- f->next = fss->free_fifos;
- f->prev = 0;
- fss->free_fifos = f;
-
/* Free fifo chunks */
fsh_slice_collect_chunks (fsh, fss, f->start_chunk);
f->master_thread_index = ~0;
}
+ fss->virtual_mem -= svm_fifo_size (f);
+
+ /* Add to free list */
+ f->next = fss->free_fifos;
+ f->prev = 0;
+ fss->free_fifos = f;
+
fsh_active_fifos_update (fsh, -1);
}
+void
+fifo_segment_detach_fifo (fifo_segment_t * fs, svm_fifo_t * f)
+{
+ fifo_segment_slice_t *fss;
+ svm_fifo_chunk_t *c;
+ u32 fl_index;
+
+ ASSERT (f->refcnt == 1);
+
+ fss = fsh_slice_get (fs->h, f->slice_index);
+ fss->virtual_mem -= svm_fifo_size (f);
+ if (f->flags & SVM_FIFO_F_LL_TRACKED)
+ fss_fifo_del_active_list (fss, f);
+
+ c = f->start_chunk;
+ while (c)
+ {
+ fl_index = fs_freelist_for_size (c->length);
+ clib_atomic_fetch_sub_rel (&fss->num_chunks[fl_index], 1);
+ c = c->next;
+ }
+}
+
+void
+fifo_segment_attach_fifo (fifo_segment_t * fs, svm_fifo_t * f,
+ u32 slice_index)
+{
+ fifo_segment_slice_t *fss;
+ svm_fifo_chunk_t *c;
+ u32 fl_index;
+
+ f->slice_index = slice_index;
+ fss = fsh_slice_get (fs->h, f->slice_index);
+ fss->virtual_mem += svm_fifo_size (f);
+ if (f->flags & SVM_FIFO_F_LL_TRACKED)
+ fss_fifo_add_active_list (fss, f);
+
+ c = f->start_chunk;
+ while (c)
+ {
+ fl_index = fs_freelist_for_size (c->length);
+ clib_atomic_fetch_add_rel (&fss->num_chunks[fl_index], 1);
+ c = c->next;
+ }
+}
+
int
fifo_segment_prealloc_fifo_hdrs (fifo_segment_t * fs, u32 slice_index,
u32 batch_size)
u32 chunk_size, u32 batch_size)
{
fifo_segment_header_t *fsh = fs->h;
- u32 rounded_data_size, fl_index;
fifo_segment_slice_t *fss;
- svm_fifo_chunk_t *c;
- void *oldheap;
- uword size;
- u8 *cmem;
- int i;
+ u32 fl_index;
if (!fs_chunk_size_is_valid (fsh, chunk_size))
{
}
fl_index = fs_freelist_for_size (chunk_size);
- 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;
-
fss = fsh_slice_get (fsh, slice_index);
- /* 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->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;
- fsh_free_bytes_sub (fsh, size);
-
- return 0;
+ return fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch_size);
}
/**
u32
fifo_segment_num_fifos (fifo_segment_t * fs)
{
- return clib_atomic_load_relax_n (&fs->h->n_active_fifos);
+ return fsh_n_active_fifos (fs->h);
}
static u32
return fsh_n_cached_bytes (fs->h);
}
+uword
+fifo_segment_available_bytes (fifo_segment_t * fs)
+{
+ return fsh_n_free_bytes (fs->h) + fsh_n_cached_bytes (fs->h);
+}
+
uword
fifo_segment_fl_chunk_bytes (fifo_segment_t * fs)
{
for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
{
fss = fsh_slice_get (fsh, slice_index);
- n_bytes += fss->n_fl_chunk_bytes;
+ n_bytes += fss_fl_chunk_bytes (fss);
}
return n_bytes;
u8
fifo_segment_has_fifos (fifo_segment_t * fs)
{
- fifo_segment_header_t *fsh = fs->h;
- fifo_segment_slice_t *fss;
- int slice_index;
-
- for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
- {
- fss = fsh_slice_get (fsh, slice_index);
- if (fss->fifos)
- return 1;
- }
- return 0;
+ return (fsh_n_active_fifos (fs->h) != 0);
}
svm_fifo_t *
ssvm_segment_type_t st = ssvm_type (&sp->ssvm);
if (st == SSVM_SEGMENT_PRIVATE)
- s = format (s, "%s", "private-heap");
+ s = format (s, "%s", "private");
else if (st == SSVM_SEGMENT_MEMFD)
s = format (s, "%s", "memfd");
else if (st == SSVM_SEGMENT_SHM)
u8 *
format_fifo_segment (u8 * s, va_list * args)
{
- u32 count, indent, active_fifos, free_fifos, fifo_hdr = 0;
+ u32 count, indent, active_fifos, free_fifos;
fifo_segment_t *fs = va_arg (*args, fifo_segment_t *);
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;
+ uword fifo_hdr = 0, reserved;
fifo_segment_header_t *fsh;
fifo_segment_slice_t *fss;
svm_fifo_chunk_t *c;
char *address;
size_t size;
int i;
- uword allocated, in_use;
+ uword allocated, in_use, virt;
f64 usage;
fifo_segment_mem_status_t mem_st;
if (fs == 0)
{
- s = format (s, "%-15s%15s%15s%15s%15s%15s", "Name", "Type",
+ s = format (s, "%-20s%10s%15s%15s%15s%15s", "Name", "Type",
"HeapSize (M)", "ActiveFifos", "FreeFifos", "Address");
return s;
}
active_fifos = fifo_segment_num_fifos (fs);
free_fifos = fifo_segment_num_free_fifos (fs);
- s = format (s, "%-15v%15U%15llu%15u%15u%15llx", ssvm_name (&fs->ssvm),
+ s = format (s, "%-20v%10U%15llu%15u%15u%15llx", ssvm_name (&fs->ssvm),
format_fifo_segment_type, fs, size >> 20ULL, active_fifos,
free_fifos, address);
free_chunks = fifo_segment_num_free_chunks (fs, ~0);
if (free_chunks)
- s = format (s, "\n\n%UFree chunks by size:\n", format_white_space,
- indent + 2);
+ s =
+ format (s, "\n\n%UFree/Allocated chunks by size:\n", format_white_space,
+ indent + 2);
else
s = format (s, "\n");
for (i = 0; i < vec_len (fss->free_chunks); i++)
{
c = fss->free_chunks[i];
- if (c == 0)
+ if (c == 0 && fss->num_chunks[i] == 0)
continue;
count = 0;
while (c)
}
chunk_size = fs_freelist_index_to_size (i);
- s = format (s, "%U%-5u kB: %u\n", format_white_space, indent + 2,
- chunk_size >> 10, count);
+ s = format (s, "%U%-5u kB: %u/%u\n", format_white_space, indent + 2,
+ chunk_size >> 10, count, fss->num_chunks[i]);
chunk_bytes += count * chunk_size;
}
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) 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]);
+ virt = fsh_virtual_mem (fsh);
+ reserved = fsh->n_reserved_bytes;
+
+ s = format (s, "\n%Useg free bytes: %U (%lu) estimated: %U (%lu) reserved:"
+ " %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,
+ format_memory_size, reserved, reserved);
+ 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 active: %u hdr free bytes: %U (%u) \n",
+ format_white_space, indent + 2, fsh->n_active_fifos,
+ format_memory_size, fifo_hdr, fifo_hdr);
+ s = format (s, "%Usegment usage: %.2f%% (%U / %U) virt: %U status: %s\n",
+ format_white_space, indent + 2, usage, format_memory_size,
+ in_use, format_memory_size, allocated, format_memory_size, virt,
+ fifo_segment_mem_status_strings[mem_st]);
s = format (s, "\n");
return s;
Code Review / vpp.git / blobdiff