return (rv);
}
- /* Note; requested_va updated due to seg base addr randomization */
+ /* Note: requested_va updated due to seg base addr randomization */
sm->next_baseva = s->ssvm.requested_va + a->segment_size;
sh = s->ssvm.sh;
sh->opaque[0] = fsh;
s->h = fsh;
fsh->segment_name = format (0, "%s%c", a->segment_name, 0);
-
preallocate_fifo_pairs (fsh, a);
ssvm_pop_heap (oldheap);
u8 **heaps = 0;
mheap_t *heap_header;
int segment_count = 1;
+ u32 rnd_size = 0;
int i;
if (a->private_segment_count && a->private_segment_size)
{
- void *mem;
u8 *heap;
u32 pagesize = clib_mem_get_page_size ();
- u32 rnd_size;
+ rnd_size = (a->private_segment_size + (pagesize - 1)) & ~pagesize;
for (i = 0; i < a->private_segment_count; i++)
{
- rnd_size = (a->private_segment_size + (pagesize - 1)) & ~pagesize;
-
- mem = mmap (0, rnd_size, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS,
- -1 /* fd */ , 0 /* offset */ );
-
- if (mem == MAP_FAILED)
+ heap = mheap_alloc (0, rnd_size);
+ if (heap == 0)
{
- clib_unix_warning ("mmap");
+ clib_unix_warning ("mheap alloc");
return -1;
}
- heap = mheap_alloc (mem, rnd_size);
heap_header = mheap_header (heap);
heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
vec_add1 (heaps, heap);
}
/* Spread preallocated fifo pairs across segments */
- a->preallocated_fifo_pairs /= segment_count;
+ a->preallocated_fifo_pairs =
+ (a->preallocated_fifo_pairs + segment_count - 1) / segment_count;
/* Allocate segments */
for (i = 0; i < segment_count; i++)
pool_get (sm->segments, s);
memset (s, 0, sizeof (*s));
- s->ssvm.ssvm_size = ~0;
+ s->ssvm.ssvm_size = rnd_size;
s->ssvm.i_am_master = 1;
s->ssvm.my_pid = getpid ();
s->ssvm.name = format (0, "%s%c", a->segment_name, 0);
memset (fsh, 0, sizeof (*fsh));
sh->opaque[0] = fsh;
s->h = fsh;
+ fsh->flags = FIFO_SEGMENT_F_IS_PRIVATE;
+ if (!a->private_segment_count)
+ fsh->flags |= FIFO_SEGMENT_F_IS_MAIN_HEAP;
fsh->segment_name = format (0, "%s%c", a->segment_name, 0);
if (a->private_segment_count)
preallocate_fifo_pairs (fsh, a);
clib_mem_set_heap (oldheap);
}
-
sh->ready = 1;
vec_add1 (a->new_segment_indices, s - sm->segments);
}
svm_fifo_segment_delete (svm_fifo_segment_private_t * s)
{
svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
- ssvm_delete (&s->ssvm);
- pool_put (sm->segments, s);
+ if (s->h->flags & FIFO_SEGMENT_F_IS_PRIVATE)
+ {
+ /* Don't try to free vpp's heap! */
+ if (!(s->h->flags & FIFO_SEGMENT_F_IS_MAIN_HEAP))
+ mheap_free (s->ssvm.sh->heap);
+ clib_mem_free (s->ssvm.sh);
+ clib_mem_free (s->h);
+ pool_put (sm->segments, s);
+ }
+ else
+ {
+ ssvm_delete (&s->ssvm);
+ pool_put (sm->segments, s);
+ }
}
svm_fifo_t *
int freelist_index;
/*
- * 2K minimum. It's not likely that anything good will happen
- * with a 1K FIFO.
+ * 4K minimum. It's not likely that anything good will happen
+ * with a smaller FIFO.
*/
if (data_size_in_bytes < FIFO_SEGMENT_MIN_FIFO_SIZE ||
data_size_in_bytes > FIFO_SEGMENT_MAX_FIFO_SIZE)
}
fsh->fifos = f;
}
+ fsh->n_active_fifos++;
ssvm_pop_heap (oldheap);
ssvm_unlock_non_recursive (sh);
freelist_index = f->freelist_index;
- ASSERT (freelist_index > 0 && freelist_index < vec_len (fsh->free_fifos));
+ ASSERT (freelist_index < vec_len (fsh->free_fifos));
ssvm_lock_non_recursive (sh, 2);
oldheap = ssvm_push_heap (sh);
f->master_thread_index = ~0;
}
+ fsh->n_active_fifos--;
ssvm_pop_heap (oldheap);
ssvm_unlock_non_recursive (sh);
}
return s - svm_fifo_segment_main.segments;
}
+/**
+ * Retrieve svm segments pool. Used only for debug purposes.
+ */
+svm_fifo_segment_private_t *
+svm_fifo_segment_segments_pool (void)
+{
+ svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
+ return sm->segments;
+}
+
+/**
+ * Get number of active fifos
+ */
+u32
+svm_fifo_segment_num_fifos (svm_fifo_segment_private_t * fifo_segment)
+{
+ return fifo_segment->h->n_active_fifos;
+}
+
+u32
+svm_fifo_segment_num_free_fifos (svm_fifo_segment_private_t * fifo_segment,
+ u32 fifo_size_in_bytes)
+{
+ ssvm_shared_header_t *sh;
+ svm_fifo_segment_header_t *fsh;
+ svm_fifo_t *f;
+ int i;
+ u32 count = 0, rounded_data_size, freelist_index;
+
+ sh = fifo_segment->ssvm.sh;
+ fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
+
+ /* Count all free fifos? */
+ if (fifo_size_in_bytes == ~0)
+ {
+ for (i = 0; i < vec_len (fsh->free_fifos); i++)
+ {
+ f = fsh->free_fifos[i];
+ if (f == 0)
+ continue;
+
+ while (f)
+ {
+ f = f->next;
+ count++;
+ }
+ }
+ return count;
+ }
+
+ rounded_data_size = (1 << (max_log2 (fifo_size_in_bytes)));
+ freelist_index = max_log2 (rounded_data_size)
+ - max_log2 (FIFO_SEGMENT_MIN_FIFO_SIZE);
+
+ if (freelist_index > vec_len (fsh->free_fifos))
+ return 0;
+
+ f = fsh->free_fifos[freelist_index];
+ if (f == 0)
+ return 0;
+
+ while (f)
+ {
+ f = f->next;
+ count++;
+ }
+ return count;
+}
+
+/**
+ * Segment format function
+ */
+u8 *
+format_svm_fifo_segment (u8 * s, va_list * args)
+{
+ svm_fifo_segment_private_t *sp
+ = va_arg (*args, svm_fifo_segment_private_t *);
+ int verbose = va_arg (*args, int);
+ ssvm_shared_header_t *sh;
+ svm_fifo_segment_header_t *fsh;
+ svm_fifo_t *f;
+ int i;
+ u32 count;
+ uword indent = format_get_indent (s) + 2;
+
+ sh = sp->ssvm.sh;
+ fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
+
+ s = format (s, "%USegment Heap: %U\n", format_white_space, indent,
+ format_mheap, sh->heap, verbose);
+ s = format (s, "%U segment has %u active fifos\n",
+ format_white_space, indent, svm_fifo_segment_num_fifos (sp));
+
+ for (i = 0; i < vec_len (fsh->free_fifos); i++)
+ {
+ f = fsh->free_fifos[i];
+ if (f == 0)
+ continue;
+ count = 0;
+ while (f)
+ {
+ f = f->next;
+ count++;
+ }
+
+ s = format (s, "%U%-5u Kb: %u free",
+ format_white_space, indent + 2,
+ 1 << (i + max_log2 (FIFO_SEGMENT_MIN_FIFO_SIZE) - 10),
+ count);
+ }
+ return s;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*
Code Review / vpp.git / blobdiff