marvell: fix implicit declaration of function

[vpp.git] / src / svm / fifo_segment.c

diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index 76cc046..986778d 100644 (file)
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -292,6 +292,7 @@ fifo_segment_init (fifo_segment_t * fs)
 
   seg_start = round_pow2_u64 (pointer_to_uword (seg_data), align);
   fsh = uword_to_pointer (seg_start, void *);
+  CLIB_MEM_UNPOISON (fsh, seg_sz);
   memset (fsh, 0, sizeof (*fsh) + slices_sz);
 
   fsh->byte_index = sizeof (*fsh) + slices_sz;
@@ -417,6 +418,14 @@ fifo_segment_get_segment (fifo_segment_main_t * sm, u32 segment_index)
   return pool_elt_at_index (sm->segments, segment_index);
 }
 
+fifo_segment_t *
+fifo_segment_get_segment_if_valid (fifo_segment_main_t *sm, u32 segment_index)
+{
+  if (pool_is_free_index (sm->segments, segment_index))
+    return 0;
+  return pool_elt_at_index (sm->segments, segment_index);
+}
+
 void
 fifo_segment_info (fifo_segment_t * seg, char **address, size_t * size)
 {
@@ -782,11 +791,13 @@ fs_fifo_alloc (fifo_segment_t *fs, u32 slice_index)
 }
 
 void
-fs_fifo_free (fifo_segment_t *fs, svm_fifo_t *f)
+fs_fifo_free (fifo_segment_t *fs, svm_fifo_t *f, u32 slice_index)
 {
-  u32 slice_index = f->shr->slice_index;
   fifo_slice_private_t *pfss;
 
+  if (CLIB_DEBUG)
+    clib_memset (f, 0xfc, sizeof (*f));
+
   pfss = &fs->slices[slice_index];
   clib_mem_bulk_free (pfss->fifos, f);
 }
@@ -800,6 +811,8 @@ fifo_segment_cleanup (fifo_segment_t *fs)
   for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
     clib_mem_bulk_destroy (fs->slices[slice_index].fifos);
 
+  vec_free (fs->slices);
+
   vec_foreach (fs->mqs, mq)
     vec_free (mq->rings);
 
@@ -928,19 +941,24 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f)
   f->ooo_enq = f->ooo_deq = 0;
   f->prev = 0;
 
-  fs_fifo_free (fs, f);
+  fs_fifo_free (fs, f, f->shr->slice_index);
 
   fsh_active_fifos_update (fsh, -1);
 }
 
+void
+fifo_segment_free_client_fifo (fifo_segment_t *fs, svm_fifo_t *f)
+{
+  fs_fifo_free (fs, f, 0 /* clients attach fifos in slice 0 */);
+}
+
 void
 fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f)
 {
   fifo_slice_private_t *pfss;
   fifo_segment_slice_t *fss;
-  u32 fl_index, slice_index;
-  svm_fifo_chunk_t **c;
   svm_fifo_t *of = *f;
+  u32 slice_index;
 
   slice_index = of->master_thread_index;
   fss = fsh_slice_get (fs->h, slice_index);
@@ -949,13 +967,13 @@ fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f)
   if (of->flags & SVM_FIFO_F_LL_TRACKED)
     pfss_fifo_del_active_list (pfss, of);
 
-  /* Update slice counts for chunks that were detached */
-  vec_foreach (c, of->chunks_at_attach)
-    {
-      fl_index = fs_freelist_for_size ((*c)->length);
-      clib_atomic_fetch_sub_rel (&fss->num_chunks[fl_index], 1);
-    }
-  vec_free (of->chunks_at_attach);
+  /* Collect chunks that were provided in return for those detached */
+  fsh_slice_collect_chunks (fs->h, fss, of->chunks_at_attach);
+  of->chunks_at_attach = 0;
+
+  /* Collect hdr that was provided in return for the detached */
+  fss_fifo_free_list_push (fs->h, fss, of->hdr_at_attach);
+  of->hdr_at_attach = 0;
 
   clib_mem_bulk_free (pfss->fifos, *f);
   *f = 0;
@@ -964,11 +982,10 @@ fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f)
 void
 fifo_segment_attach_fifo (fifo_segment_t *fs, svm_fifo_t **f, u32 slice_index)
 {
+  svm_fifo_chunk_t *c, *nc, *pc = 0;
   fifo_slice_private_t *pfss;
   fifo_segment_slice_t *fss;
-  svm_fifo_chunk_t *c;
   svm_fifo_t *nf, *of;
-  u32 fl_index;
 
   nf = fs_fifo_alloc (fs, slice_index);
   clib_memcpy_fast (nf, *f, sizeof (*nf));
@@ -976,21 +993,23 @@ fifo_segment_attach_fifo (fifo_segment_t *fs, svm_fifo_t **f, u32 slice_index)
   fss = fsh_slice_get (fs->h, slice_index);
   pfss = fs_slice_private_get (fs, slice_index);
   fss->virtual_mem += svm_fifo_size (nf);
+  nf->next = nf->prev = 0;
   if (nf->flags & SVM_FIFO_F_LL_TRACKED)
     pfss_fifo_add_active_list (pfss, nf);
 
-  /* Update allocated chunks for fifo segment and build list
-   * of chunks to be freed at detach */
+  /* Allocate shared hdr and chunks to be collected at detach in return
+   * for those that are being attached now */
   of = *f;
-  of->chunks_at_attach = 0;
+  of->hdr_at_attach = fsh_try_alloc_fifo_hdr (fs->h, fss);
 
   c = fs_chunk_ptr (fs->h, nf->shr->start_chunk);
-  while (c)
+  of->chunks_at_attach = pc = fsh_try_alloc_chunk (fs->h, fss, c->length);
+
+  while ((c = fs_chunk_ptr (fs->h, c->next)))
     {
-      fl_index = fs_freelist_for_size (c->length);
-      clib_atomic_fetch_add_rel (&fss->num_chunks[fl_index], 1);
-      vec_add1 (of->chunks_at_attach, c);
-      c = fs_chunk_ptr (fs->h, c->next);
+      nc = fsh_try_alloc_chunk (fs->h, fss, c->length);
+      pc->next = fs_chunk_sptr (fs->h, nc);
+      pc = nc;
     }
 
   nf->shr->slice_index = slice_index;
@@ -1540,8 +1559,8 @@ format_fifo_segment (u8 * s, va_list * args)
              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,
+  s = format (s, "%Ufifo active: %u hdr free: %u bytes: %U (%u) \n",
+             format_white_space, indent + 2, fsh->n_active_fifos, free_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,