1 files changed, 83 insertions, 31 deletions

diff --git a/src/svm/svm_fifo_segment.c b/src/svm/svm_fifo_segment.c
index c4ac235252c..69d4ecb9387 100644
--- a/src/svm/svm_fifo_segment.c
+++ b/src/svm/svm_fifo_segment.c
@@ -35,6 +35,11 @@ preallocate_fifo_pairs (svm_fifo_segment_header_t * fsh,
   rx_fifo_size = (sizeof (*f) + a->rx_fifo_size) * a->preallocated_fifo_pairs;
   tx_fifo_size = (sizeof (*f) + a->tx_fifo_size) * a->preallocated_fifo_pairs;
 
+  if (0)
+    clib_warning ("rx_fifo_size %u (%d mb), tx_fifo_size %u (%d mb)",
+		  rx_fifo_size, rx_fifo_size >> 20,
+		  tx_fifo_size, tx_fifo_size >> 20);
+
   /* Allocate rx fifo space. May fail. */
   rx_fifo_space = clib_mem_alloc_aligned_at_offset
     (rx_fifo_size, CLIB_CACHE_LINE_BYTES, 0 /* align_offset */ ,
@@ -129,7 +134,7 @@ svm_fifo_segment_create (svm_fifo_segment_create_args_t * a)
   ssvm_pop_heap (oldheap);
 
   sh->ready = 1;
-  a->new_segment_index = s - sm->segments;
+  vec_add1 (a->new_segment_indices, s - sm->segments);
   return (0);
 }
 
@@ -141,35 +146,81 @@ svm_fifo_segment_create_process_private (svm_fifo_segment_create_args_t * a)
   svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
   ssvm_shared_header_t *sh;
   svm_fifo_segment_header_t *fsh;
+  void *oldheap;
+  u8 **heaps = 0;
+  mheap_t *heap_header;
+  int segment_count = 1;
+  int i;
 
-  /* Allocate a fresh segment */
-  pool_get (sm->segments, s);
-  memset (s, 0, sizeof (*s));
-
-  s->ssvm.ssvm_size = ~0;
-  s->ssvm.i_am_master = 1;
-  s->ssvm.my_pid = getpid ();
-  s->ssvm.name = (u8 *) a->segment_name;
-  s->ssvm.requested_va = ~0;
-
-  /* Allocate a [sic] shared memory header, in process memory... */
-  sh = clib_mem_alloc_aligned (sizeof (*sh), CLIB_CACHE_LINE_BYTES);
-  s->ssvm.sh = sh;
+  if (a->private_segment_count && a->private_segment_size)
+    {
+      void *mem;
+      u8 *heap;
+      u32 pagesize = clib_mem_get_page_size ();
+      u32 rnd_size;
 
-  memset (sh, 0, sizeof (*sh));
-  sh->heap = clib_mem_get_heap ();
+      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)
+	    {
+	      clib_unix_warning ("mmap");
+	      return -1;
+	    }
+	  heap = mheap_alloc (mem, rnd_size);
+	  heap_header = mheap_header (heap);
+	  heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+	  vec_add1 (heaps, heap);
+	}
+      segment_count = a->private_segment_count;
+    }
 
-  /* Set up svm_fifo_segment shared header */
-  fsh = clib_mem_alloc (sizeof (*fsh));
-  memset (fsh, 0, sizeof (*fsh));
-  sh->opaque[0] = fsh;
-  s->h = fsh;
-  fsh->segment_name = format (0, "%s%c", a->segment_name, 0);
+  /* Spread preallocated fifo pairs across segments */
+  a->preallocated_fifo_pairs /= segment_count;
 
-  preallocate_fifo_pairs (fsh, a);
+  /* 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.i_am_master = 1;
+      s->ssvm.my_pid = getpid ();
+      s->ssvm.name = (u8 *) a->segment_name;
+      s->ssvm.requested_va = ~0;
+
+      /* Allocate a [sic] shared memory header, in process memory... */
+      sh = clib_mem_alloc_aligned (sizeof (*sh), CLIB_CACHE_LINE_BYTES);
+      s->ssvm.sh = sh;
+
+      memset (sh, 0, sizeof (*sh));
+      sh->heap = a->private_segment_count ? heaps[i] : clib_mem_get_heap ();
+
+      /* Set up svm_fifo_segment shared header */
+      fsh = clib_mem_alloc (sizeof (*fsh));
+      memset (fsh, 0, sizeof (*fsh));
+      sh->opaque[0] = fsh;
+      s->h = fsh;
+      fsh->segment_name = format (0, "%s%c", a->segment_name, 0);
+
+      if (a->private_segment_count)
+	{
+	  oldheap = clib_mem_get_heap ();
+	  clib_mem_set_heap (sh->heap);
+	  preallocate_fifo_pairs (fsh, a);
+	  clib_mem_set_heap (oldheap);
+	}
 
-  sh->ready = 1;
-  a->new_segment_index = s - sm->segments;
+      sh->ready = 1;
+      vec_add1 (a->new_segment_indices, s - sm->segments);
+    }
+  vec_free (heaps);
   return (0);
 }
 
@@ -205,7 +256,7 @@ svm_fifo_segment_attach (svm_fifo_segment_create_args_t * a)
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
   s->h = fsh;
 
-  a->new_segment_index = s - sm->segments;
+  vec_add1 (a->new_segment_indices, s - sm->segments);
   return (0);
 }
 
@@ -230,7 +281,7 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
   sh = s->ssvm.sh;
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
 
-  ssvm_lock (sh, 1, 0);
+  ssvm_lock_non_recursive (sh, 1);
   oldheap = ssvm_push_heap (sh);
 
   switch (list_index)
@@ -261,7 +312,7 @@ svm_fifo_segment_alloc_fifo (svm_fifo_segment_private_t * s,
   if (PREDICT_FALSE (f == 0))
     {
       ssvm_pop_heap (oldheap);
-      ssvm_unlock (sh);
+      ssvm_unlock_non_recursive (sh);
       return (0);
     }
 
@@ -281,7 +332,7 @@ found:
     }
 
   ssvm_pop_heap (oldheap);
-  ssvm_unlock (sh);
+  ssvm_unlock_non_recursive (sh);
   return (f);
 }
 
@@ -293,10 +344,11 @@ svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s, svm_fifo_t * f,
   svm_fifo_segment_header_t *fsh;
   void *oldheap;
 
+
   sh = s->ssvm.sh;
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
 
-  ssvm_lock (sh, 1, 0);
+  ssvm_lock_non_recursive (sh, 2);
   oldheap = ssvm_push_heap (sh);
 
   switch (list_index)
@@ -325,7 +377,7 @@ svm_fifo_segment_free_fifo (svm_fifo_segment_private_t * s, svm_fifo_t * f,
     }
 
   ssvm_pop_heap (oldheap);
-  ssvm_unlock (sh);
+  ssvm_unlock_non_recursive (sh);
 }
 
 void