#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
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 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 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)
-{
- return &fsh->slices[slice_index];
-}
-
-static inline void
-fsh_active_fifos_update (fifo_segment_header_t * fsh, int inc)
-{
- clib_atomic_fetch_add_rel (&fsh->n_active_fifos, inc);
-}
-
/**
* Initialize fifo segment shared header
*/
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;
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);
}
fifo_segment_slice_t * fss,
u32 data_bytes)
{
- svm_fifo_chunk_t *c, *first = 0, *last = 0;
+ svm_fifo_chunk_t *c, *first = 0, *last = 0, *next;
u32 fl_index, fl_size, n_alloc = 0;
svm_fifo_t *f;
c->next = first;
first = c;
n_alloc += fl_size;
- data_bytes -= c->length;
+ data_bytes -= clib_min (fl_size, data_bytes);
}
else
{
{
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);
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->free_fifos && fss->free_chunks[fl_index])
{
}
}
- fsh_check_mem (fsh);
+ fifo_sz = sizeof (svm_fifo_t) + sizeof (svm_fifo_chunk_t);
+ fifo_sz += 1 << max_log2 (min_size);
n_free_bytes = fsh_n_free_bytes (fsh);
+
if (fifo_sz * FIFO_SEGMENT_ALLOC_BATCH_SIZE < n_free_bytes)
{
- 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 (!fs_try_alloc_fifo_batch (fsh, fss, fl_index,
+ FIFO_SEGMENT_ALLOC_BATCH_SIZE))
+ {
+ 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;
+ }
+ }
+ else
+ {
+ fsh_check_mem (fsh);
+ n_free_bytes = fsh_n_free_bytes (fsh);
+ }
}
if (fifo_sz <= n_free_bytes)
{
fsh_free_bytes_sub (fsh, fifo_sz);
goto done;
}
+ fsh_check_mem (fsh);
}
- if (data_bytes <= fss->n_fl_chunk_bytes)
- f = fs_try_alloc_fifo_freelist_multi_chunk (fsh, fss, data_bytes);
+ /* 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);
if (f)
- f->fs_hdr = fsh;
+ {
+ 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);
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)))
+ else
{
- fsh_check_mem (fsh);
+ void *oldheap;
+ uword n_free;
+ u32 batch;
chunk_size = fs_freelist_index_to_size (fl_index);
- if (n_free < chunk_size)
- goto done;
+ n_free = fsh_n_free_bytes (fsh);
- oldheap = ssvm_push_heap (fsh->ssvm_sh);
- c = svm_fifo_chunk_alloc (chunk_size);
- ssvm_pop_heap (oldheap);
+ if (chunk_size <= n_free)
+ {
+ oldheap = ssvm_push_heap (fsh->ssvm_sh);
+ c = svm_fifo_chunk_alloc (chunk_size);
+ ssvm_pop_heap (oldheap);
- if (!c)
- goto done;
+ if (c)
+ {
+ fsh_free_bytes_sub (fsh, chunk_size + sizeof (*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);
+ n_free = fsh_n_free_bytes (fsh);
+ }
+ if (chunk_size <= fss->n_fl_chunk_bytes)
+ {
+ c = fs_try_alloc_multi_chunk (fsh, fss, chunk_size);
+ 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 (chunk_size <= fss->n_fl_chunk_bytes + n_free)
+ {
+ u32 min_size = FIFO_SEGMENT_MIN_FIFO_SIZE;
- 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);
+ 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))
+ {
+ fsh_check_mem (fsh);
+ goto done;
+ }
+ c = fs_try_alloc_multi_chunk (fsh, fss, chunk_size);
+ }
}
done:
}
fsh_active_fifos_update (fsh, 1);
+ fss->virtual_mem += svm_fifo_size (f);
done:
return (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);
}
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)
{
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;
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);
+
+ 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, 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 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