X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fsvm_fifo_segment.c;h=a42225c8345876a174b561f04e70d9e44bf7eabc;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=459b1d1d8e527771057469613e527892c5712c1d;hpb=a332c46a51f9b4e13963340dfee1318e7513c124;p=vpp.git

diff --git a/src/svm/svm_fifo_segment.c b/src/svm/svm_fifo_segment.c
index 459b1d1d8e5..a42225c8345 100644
--- a/src/svm/svm_fifo_segment.c
+++ b/src/svm/svm_fifo_segment.c
@@ -107,7 +107,12 @@ svm_fifo_segment_preallocate_fifo_pairs (svm_fifo_segment_private_t * s,
 
   /* Calculate space requirements */
   pair_size = 2 * sizeof (*f) + rx_rounded_data_size + tx_rounded_data_size;
+#if USE_DLMALLOC == 0
   space_available = s->ssvm.ssvm_size - mheap_bytes (sh->heap);
+#else
+  space_available = s->ssvm.ssvm_size - mspace_usable_size (sh->heap);
+#endif
+
   pairs_to_allocate = clib_min (space_available / pair_size, *n_fifo_pairs);
   rx_fifos_size = (sizeof (*f) + rx_rounded_data_size) * pairs_to_allocate;
   tx_fifos_size = (sizeof (*f) + tx_rounded_data_size) * pairs_to_allocate;
@@ -185,7 +190,7 @@ svm_fifo_segment_init (svm_fifo_segment_private_t * s)
   oldheap = ssvm_push_heap (sh);
 
   fsh = clib_mem_alloc (sizeof (*fsh));
-  memset (fsh, 0, sizeof (*fsh));
+  clib_memset (fsh, 0, sizeof (*fsh));
   s->h = sh->opaque[0] = fsh;
 
   ssvm_pop_heap (oldheap);
@@ -206,7 +211,7 @@ svm_fifo_segment_create (svm_fifo_segment_create_args_t * a)
 
   /* Allocate a fresh segment */
   pool_get (sm->segments, s);
-  memset (s, 0, sizeof (*s));
+  clib_memset (s, 0, sizeof (*s));
 
   s->ssvm.ssvm_size = a->segment_size;
   s->ssvm.i_am_master = 1;
@@ -237,16 +242,16 @@ svm_fifo_segment_create_process_private (svm_fifo_segment_create_args_t * a)
   svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
   svm_fifo_segment_private_t *s;
   ssvm_shared_header_t *sh;
-  mheap_t *heap_header;
   u32 rnd_size = 0;
   u8 *heap;
   u32 pagesize = clib_mem_get_page_size ();
 
   pool_get (sm->segments, s);
-  memset (s, 0, sizeof (*s));
+  clib_memset (s, 0, sizeof (*s));
 
   rnd_size = (a->segment_size + (pagesize - 1)) & ~pagesize;
 
+#if USE_DLMALLOC == 0
   heap = mheap_alloc (0, rnd_size);
   if (heap == 0)
     {
@@ -254,8 +259,14 @@ svm_fifo_segment_create_process_private (svm_fifo_segment_create_args_t * a)
       pool_put (sm->segments, s);
       return -1;
     }
-  heap_header = mheap_header (heap);
-  heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+  {
+    mheap_t *heap_header;
+    heap_header = mheap_header (heap);
+    heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+  }
+#else
+  heap = create_mspace (rnd_size, 1 /* locked */ );
+#endif
 
   s->ssvm.ssvm_size = rnd_size;
   s->ssvm.i_am_master = 1;
@@ -267,7 +278,7 @@ svm_fifo_segment_create_process_private (svm_fifo_segment_create_args_t * a)
   sh = clib_mem_alloc_aligned (sizeof (*sh), CLIB_CACHE_LINE_BYTES);
   s->ssvm.sh = sh;
 
-  memset (sh, 0, sizeof (*sh));
+  clib_memset (sh, 0, sizeof (*sh));
   sh->heap = heap;
 
   svm_fifo_segment_init (s);
@@ -288,7 +299,7 @@ svm_fifo_segment_attach (svm_fifo_segment_create_args_t * a)
 
   /* Allocate a fresh segment */
   pool_get (sm->segments, s);
-  memset (s, 0, sizeof (*s));
+  clib_memset (s, 0, sizeof (*s));
 
   s->ssvm.ssvm_size = a->segment_size;
   s->ssvm.my_pid = getpid ();
@@ -318,7 +329,7 @@ svm_fifo_segment_delete (svm_fifo_segment_private_t * s)
   svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
 
   ssvm_delete (&s->ssvm);
-  memset (s, 0xfe, sizeof (*s));
+  clib_memset (s, 0xfe, sizeof (*s));
   pool_put (sm->segments, s);
 }
 
@@ -332,7 +343,7 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
 {
   ssvm_shared_header_t *sh;
   svm_fifo_segment_header_t *fsh;
-  svm_fifo_t *f;
+  svm_fifo_t *f = 0;
   void *oldheap;
   int freelist_index;
 
@@ -351,9 +362,7 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
     - max_log2 (FIFO_SEGMENT_MIN_FIFO_SIZE);
 
   sh = s->ssvm.sh;
-
   ssvm_lock_non_recursive (sh, 1);
-  oldheap = ssvm_push_heap (sh);
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
 
   switch (list_index)
@@ -361,26 +370,32 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
     case FIFO_SEGMENT_RX_FREELIST:
     case FIFO_SEGMENT_TX_FREELIST:
       vec_validate_init_empty (fsh->free_fifos, freelist_index, 0);
-
       f = fsh->free_fifos[freelist_index];
-      if (PREDICT_FALSE (f == 0))
+      if (PREDICT_FALSE (!f))
 	{
+	  /* Preallocated and no fifo left. Don't even try */
+	  if (fsh->flags & FIFO_SEGMENT_F_IS_PREALLOCATED)
+	    goto done;
+
+	  oldheap = ssvm_push_heap (sh);
 	  allocate_new_fifo_chunk (fsh, data_size_in_bytes,
 				   FIFO_SEGMENT_ALLOC_CHUNK_SIZE);
+	  ssvm_pop_heap (oldheap);
 	  f = fsh->free_fifos[freelist_index];
 	}
       if (PREDICT_TRUE (f != 0))
 	{
 	  fsh->free_fifos[freelist_index] = f->next;
 	  /* (re)initialize the fifo, as in svm_fifo_create */
-	  memset (f, 0, sizeof (*f));
+	  clib_memset (f, 0, sizeof (*f));
 	  f->nitems = data_size_in_bytes;
 	  f->ooos_list_head = OOO_SEGMENT_INVALID_INDEX;
+	  f->ct_session_index = SVM_FIFO_INVALID_SESSION_INDEX;
 	  f->refcnt = 1;
 	  f->freelist_index = freelist_index;
 	  goto found;
 	}
-      /* FALLTHROUGH */
+      break;
     case FIFO_SEGMENT_FREELIST_NONE:
       break;
 
@@ -389,14 +404,13 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
       break;
     }
 
-  /* Note: this can fail, in which case: create another segment */
+  /* Catch all that allocates just one fifo. Note: this can fail,
+   * in which case: create another segment */
+  oldheap = ssvm_push_heap (sh);
   f = svm_fifo_create (data_size_in_bytes);
+  ssvm_pop_heap (oldheap);
   if (PREDICT_FALSE (f == 0))
-    {
-      ssvm_pop_heap (oldheap);
-      ssvm_unlock_non_recursive (sh);
-      return (0);
-    }
+    goto done;
   f->freelist_index = freelist_index;
 
 found:
@@ -415,7 +429,7 @@ found:
     }
   fsh->n_active_fifos++;
 
-  ssvm_pop_heap (oldheap);
+done:
   ssvm_unlock_non_recursive (sh);
   return (f);
 }
@@ -549,7 +563,7 @@ svm_fifo_segment_num_free_fifos (svm_fifo_segment_private_t * fifo_segment,
   freelist_index = max_log2 (rounded_data_size)
     - max_log2 (FIFO_SEGMENT_MIN_FIFO_SIZE);
 
-  if (freelist_index > vec_len (fsh->free_fifos))
+  if (freelist_index >= vec_len (fsh->free_fifos))
     return 0;
 
   f = fsh->free_fifos[freelist_index];
@@ -570,11 +584,17 @@ svm_fifo_segment_info (svm_fifo_segment_private_t * seg, uword * address,
 {
   if (ssvm_type (&seg->ssvm) == SSVM_SEGMENT_PRIVATE)
     {
+#if USE_DLMALLOC == 0
       mheap_t *heap_header;
 
       *address = pointer_to_uword (seg->ssvm.sh->heap);
       heap_header = mheap_header (seg->ssvm.sh->heap);
       *size = heap_header->max_size;
+#else
+      mspace_get_address_and_size (seg->ssvm.sh->heap,
+				   (unsigned long long *) address,
+				   (unsigned long long *) size);
+#endif
     }
   else
     {
@@ -583,7 +603,7 @@ svm_fifo_segment_info (svm_fifo_segment_private_t * seg, uword * address,
     }
 }
 
-mheap_t *
+void *
 svm_fifo_segment_heap (svm_fifo_segment_private_t * seg)
 {
   return seg->ssvm.sh->heap;
@@ -615,17 +635,19 @@ 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);
+  int verbose __attribute__ ((unused)) = va_arg (*args, int);
   svm_fifo_segment_header_t *fsh = sp->h;
   u32 count, indent;
   svm_fifo_t *f;
   int i;
 
   indent = format_get_indent (s) + 2;
+#if USE_DLMALLOC == 0
   s = format (s, "%U segment heap: %U\n", format_white_space, indent,
 	      format_mheap, svm_fifo_segment_heap (sp), verbose);
   s = format (s, "%U segment has %u active fifos\n",
 	      format_white_space, indent, svm_fifo_segment_num_fifos (sp));
+#endif
 
   for (i = 0; i < vec_len (fsh->free_fifos); i++)
     {