X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Ffifo_segment.c;h=e25967ee81a14997b8c59989aa79915b5a603a19;hb=5c1e48c01b50ddbd7623228e3dbc94d835d23813;hp=1d8d073a65b32c7d50f724fb2064978145b7e54c;hpb=8d0149d74c198f57dc795eb9e99cdb46112bd737;p=vpp.git

diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index 1d8d073a65b..e25967ee81a 100644
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -15,6 +15,18 @@
 
 #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
+#undef _
+};
+
 /**
  * Fifo segment free space
  *
@@ -28,10 +40,7 @@
 static uword
 fsh_free_space (fifo_segment_header_t * fsh)
 {
-  struct dlmallinfo dlminfo;
-
-  dlminfo = mspace_mallinfo (fsh->ssvm_sh->heap);
-  return dlminfo.fordblks;
+  return clib_mem_get_heap_free_space (fsh->ssvm_sh->heap);
 }
 
 static inline void
@@ -53,6 +62,60 @@ fsh_update_free_bytes (fifo_segment_header_t * fsh)
   clib_atomic_store_rel_n (&fsh->n_free_bytes, fsh_free_space (fsh));
 }
 
+static inline void
+fsh_cached_bytes_add (fifo_segment_header_t * fsh, uword size)
+{
+  clib_atomic_fetch_add_rel (&fsh->n_cached_bytes, size);
+}
+
+static inline void
+fsh_cached_bytes_sub (fifo_segment_header_t * fsh, uword size)
+{
+  clib_atomic_fetch_sub_rel (&fsh->n_cached_bytes, size);
+}
+
+static inline uword
+fsh_n_cached_bytes (fifo_segment_header_t * fsh)
+{
+  uword n_cached = clib_atomic_load_relax_n (&fsh->n_cached_bytes);
+  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 u32
+fsh_n_active_fifos (fifo_segment_header_t * fsh)
+{
+  return clib_atomic_load_relax_n (&fsh->n_active_fifos);
+}
+
+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)
 {
@@ -70,16 +133,97 @@ 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)
+static inline int
+fss_chunk_fl_index_is_valid (fifo_segment_slice_t * fss, u32 fl_index)
 {
-  return &fsh->slices[slice_index];
+  return (fl_index < vec_len (fss->free_chunks));
+}
+
+static void
+fss_chunk_free_list_push (fifo_segment_slice_t * fss, u32 fl_index,
+			  svm_fifo_chunk_t * c)
+{
+  clib_spinlock_lock (&fss->chunk_lock);
+  c->next = fss->free_chunks[fl_index];
+  fss->free_chunks[fl_index] = c;
+  clib_spinlock_unlock (&fss->chunk_lock);
+}
+
+static void
+fss_chunk_free_list_push_list (fifo_segment_slice_t * fss, u32 fl_index,
+			       svm_fifo_chunk_t * head,
+			       svm_fifo_chunk_t * tail)
+{
+  clib_spinlock_lock (&fss->chunk_lock);
+  tail->next = fss->free_chunks[fl_index];
+  fss->free_chunks[fl_index] = head;
+  clib_spinlock_unlock (&fss->chunk_lock);
+}
+
+static svm_fifo_chunk_t *
+fss_chunk_free_list_pop (fifo_segment_slice_t * fss, u32 fl_index)
+{
+  svm_fifo_chunk_t *c;
+
+  ASSERT (fss_chunk_fl_index_is_valid (fss, fl_index));
+
+  clib_spinlock_lock (&fss->chunk_lock);
+
+  if (!fss->free_chunks[fl_index])
+    {
+      clib_spinlock_unlock (&fss->chunk_lock);
+      return 0;
+    }
+
+  c = fss->free_chunks[fl_index];
+  fss->free_chunks[fl_index] = c->next;
+
+  clib_spinlock_unlock (&fss->chunk_lock);
+
+  return c;
 }
 
 static inline void
-fsh_active_fifos_update (fifo_segment_header_t * fsh, int inc)
+fss_fifo_add_active_list (fifo_segment_slice_t * fss, svm_fifo_t * f)
 {
-  clib_atomic_fetch_add_rel (&fsh->n_active_fifos, inc);
+  if (fss->fifos)
+    {
+      fss->fifos->prev = f;
+      f->next = fss->fifos;
+    }
+  fss->fifos = f;
+}
+
+static inline void
+fss_fifo_del_active_list (fifo_segment_slice_t * fss, svm_fifo_t * f)
+{
+  if (f->flags & SVM_FIFO_F_LL_TRACKED)
+    {
+      if (f->prev)
+	f->prev->next = f->next;
+      else
+	fss->fifos = f->next;
+      if (f->next)
+	f->next->prev = f->prev;
+    }
+}
+
+static inline uword
+fss_fl_chunk_bytes (fifo_segment_slice_t * fss)
+{
+  return clib_atomic_load_relax_n (&fss->n_fl_chunk_bytes);
+}
+
+static inline void
+fss_fl_chunk_bytes_add (fifo_segment_slice_t * fss, uword size)
+{
+  clib_atomic_fetch_add_relax (&fss->n_fl_chunk_bytes, size);
+}
+
+static inline void
+fss_fl_chunk_bytes_sub (fifo_segment_slice_t * fss, uword size)
+{
+  clib_atomic_fetch_sub_relax (&fss->n_fl_chunk_bytes, size);
 }
 
 /**
@@ -91,7 +235,7 @@ fifo_segment_init (fifo_segment_t * fs)
   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;
@@ -127,13 +271,15 @@ fifo_segment_init (fifo_segment_t * fs)
     {
       fss = fsh_slice_get (fsh, i);
       vec_validate_init_empty (fss->free_chunks, max_chunk_sz, 0);
+      vec_validate_init_empty (fss->num_chunks, max_chunk_sz, 0);
+      clib_spinlock_init (&fss->chunk_lock);
     }
 
   ssvm_pop_heap (oldheap);
 
   fsh->n_free_bytes = fsh_free_space (fsh);
-  max_chunks = fsh->n_free_bytes / FIFO_SEGMENT_MIN_FIFO_SIZE;
-  fsh->n_reserved_bytes = (max_chunks / 4) * sizeof (rb_node_t);
+  fsh->n_cached_bytes = 0;
+  fsh->n_reserved_bytes = clib_min (0.01 * fsh->n_free_bytes, 256 << 10);
   sh->ready = 1;
   return (0);
 }
@@ -153,12 +299,12 @@ fifo_segment_create (fifo_segment_main_t * sm, fifo_segment_create_args_t * a)
 
   baseva = a->segment_type == SSVM_SEGMENT_PRIVATE ? ~0ULL : sm->next_baseva;
   fs->ssvm.ssvm_size = a->segment_size;
-  fs->ssvm.i_am_master = 1;
+  fs->ssvm.is_server = 1;
   fs->ssvm.my_pid = getpid ();
   fs->ssvm.name = format (0, "%s%c", a->segment_name, 0);
   fs->ssvm.requested_va = baseva;
 
-  if ((rv = ssvm_master_init (&fs->ssvm, a->segment_type)))
+  if ((rv = ssvm_server_init (&fs->ssvm, a->segment_type)))
     {
       pool_put (sm->segments, fs);
       return (rv);
@@ -192,7 +338,7 @@ fifo_segment_attach (fifo_segment_main_t * sm, fifo_segment_create_args_t * a)
   else
     fs->ssvm.attach_timeout = sm->timeout_in_seconds;
 
-  if ((rv = ssvm_slave_init (&fs->ssvm, a->segment_type)))
+  if ((rv = ssvm_client_init (&fs->ssvm, a->segment_type)))
     {
       _vec_len (fs) = vec_len (fs) - 1;
       return (rv);
@@ -243,6 +389,8 @@ fifo_segment_main_init (fifo_segment_main_t * sm, u64 baseva,
 static inline u32
 fs_freelist_for_size (u32 size)
 {
+  if (PREDICT_FALSE (size < FIFO_SEGMENT_MIN_FIFO_SIZE))
+    return 0;
   return max_log2 (size) - FIFO_SEGMENT_MIN_LOG2_FIFO_SIZE;
 }
 
@@ -260,107 +408,60 @@ fs_chunk_size_is_valid (fifo_segment_header_t * fsh, u32 size)
    * with a smaller FIFO.
    */
   return size >= FIFO_SEGMENT_MIN_FIFO_SIZE
-    && size <= (1 << fsh->max_log2_chunk_size);
-}
-
-static svm_fifo_t *
-fs_try_alloc_fifo_freelist (fifo_segment_slice_t * fss,
-			    u32 fl_index, u32 data_bytes)
-{
-  svm_fifo_chunk_t *c;
-  svm_fifo_t *f;
-
-  f = fss->free_fifos;
-  c = fss->free_chunks[fl_index];
-
-  if (!f || !c)
-    return 0;
-
-  fss->free_fifos = f->next;
-  fss->free_chunks[fl_index] = c->next;
-  c->next = c;
-  c->start_byte = 0;
-  c->length = data_bytes;
-  memset (f, 0, sizeof (*f));
-  f->start_chunk = c;
-  f->end_chunk = c;
-
-  fss->n_fl_chunk_bytes -= fs_freelist_index_to_size (fl_index);
-  return f;
+    && size <= (1ULL << fsh->max_log2_chunk_size);
 }
 
-static svm_fifo_t *
-fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh,
-					fifo_segment_slice_t * fss,
-					u32 data_bytes)
+svm_fifo_chunk_t *
+fs_try_alloc_multi_chunk (fifo_segment_header_t * fsh,
+			  fifo_segment_slice_t * fss, u32 data_bytes)
 {
-  svm_fifo_chunk_t *c, *first = 0, *last = 0;
-  u32 fl_index, fl_size, n_alloc = 0;
-  svm_fifo_t *f;
+  u32 fl_index, fl_size, n_alloc = 0, req_bytes = data_bytes;
+  svm_fifo_chunk_t *c, *first = 0, *next;
 
-  f = fss->free_fifos;
-  if (!f)
-    {
-      void *oldheap = ssvm_push_heap (fsh->ssvm_sh);
-      f = clib_mem_alloc_aligned (sizeof (*f), CLIB_CACHE_LINE_BYTES);
-      ssvm_pop_heap (oldheap);
-      if (!f)
-	return 0;
-      memset (f, 0, sizeof (*f));
-      fsh_free_bytes_sub (fsh, sizeof (*f));
-    }
-  else
-    {
-      fss->free_fifos = f->next;
-    }
-
-  fl_index = fs_freelist_for_size (data_bytes);
+  fl_index = fs_freelist_for_size (req_bytes);
   if (fl_index > 0)
     fl_index -= 1;
 
   fl_size = fs_freelist_index_to_size (fl_index);
 
-  while (data_bytes)
+  while (req_bytes)
     {
-      c = fss->free_chunks[fl_index];
+      c = fss_chunk_free_list_pop (fss, fl_index);
       if (c)
 	{
-	  fss->free_chunks[fl_index] = c->next;
-	  if (!last)
-	    last = c;
 	  c->next = first;
 	  first = c;
 	  n_alloc += fl_size;
-	  c->length = clib_min (fl_size, data_bytes);
-	  data_bytes -= c->length;
+	  req_bytes -= clib_min (fl_size, req_bytes);
 	}
       else
 	{
 	  /* Failed to allocate with smaller chunks */
 	  if (fl_index == 0)
 	    {
-	      /* free all chunks if any allocated */
+	      /* Free all chunks if any allocated */
 	      c = first;
 	      while (c)
 		{
 		  fl_index = fs_freelist_for_size (c->length);
-		  fl_size = fs_freelist_index_to_size (fl_index);
-		  c->next = fss->free_chunks[fl_index];
-		  fss->free_chunks[fl_index] = c;
-		  fss->n_fl_chunk_bytes += fl_size;
-		  data_bytes += fl_size;
+		  next = c->next;
+		  fss_chunk_free_list_push (fss, fl_index, c);
+		  c = next;
 		}
-	      first = last = 0;
-	      fl_index = fs_freelist_for_size (data_bytes);
-	      if (fss->free_chunks[fl_index + 1])
+	      n_alloc = 0;
+	      first = 0;
+	      /* As last attempt, try allocating a chunk larger than
+	       * the requested size, if possible */
+	      fl_index = fs_freelist_for_size (data_bytes) + 1;
+	      if (!fss_chunk_fl_index_is_valid (fss, fl_index))
+		return 0;
+	      first = fss_chunk_free_list_pop (fss, fl_index);
+	      if (first)
 		{
-		  fl_index += 1;
-		  fl_size = fs_freelist_index_to_size (fl_index);
-		  continue;
+		  first->next = 0;
+		  n_alloc = fs_freelist_index_to_size (fl_index);
+		  goto done;
 		}
-
-	      f->next = fss->free_fifos;
-	      fss->free_fifos = f;
 	      return 0;
 	    }
 	  fl_index -= 1;
@@ -368,28 +469,25 @@ fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh,
 	}
     }
 
-  f->start_chunk = first;
-  f->end_chunk = last;
-  last->next = first;
-  fss->n_fl_chunk_bytes -= n_alloc;
-  return f;
+done:
+  fss_fl_chunk_bytes_sub (fss, n_alloc);
+  fsh_cached_bytes_sub (fsh, n_alloc);
+  return first;
 }
 
 static int
-fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh,
-			 fifo_segment_slice_t * fss,
-			 u32 fl_index, u32 batch_size)
+fsh_try_alloc_fifo_hdr_batch (fifo_segment_header_t * fsh,
+			      fifo_segment_slice_t * fss, u32 batch_size)
 {
-  u32 size, hdrs, rounded_data_size;
-  svm_fifo_chunk_t *c;
   svm_fifo_t *f;
   void *oldheap;
+  uword size;
   u8 *fmem;
   int i;
 
-  rounded_data_size = fs_freelist_index_to_size (fl_index);
-  hdrs = sizeof (*f) + sizeof (*c);
-  size = (hdrs + rounded_data_size) * batch_size;
+  ASSERT (batch_size != 0);
+
+  size = (uword) sizeof (*f) * batch_size;
 
   oldheap = ssvm_push_heap (fsh->ssvm_sh);
   fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
@@ -401,27 +499,164 @@ fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh,
   if (fmem == 0)
     return -1;
 
-  /* Carve fifo + chunk space */
+  /* Carve fifo hdr space */
   for (i = 0; i < batch_size; i++)
     {
       f = (svm_fifo_t *) fmem;
       memset (f, 0, sizeof (*f));
       f->next = fss->free_fifos;
       fss->free_fifos = f;
-      c = (svm_fifo_chunk_t *) (fmem + sizeof (*f));
+      fmem += sizeof (*f);
+    }
+
+  fsh_free_bytes_sub (fsh, size);
+
+  return 0;
+}
+
+static int
+fsh_try_alloc_chunk_batch (fifo_segment_header_t * fsh,
+			   fifo_segment_slice_t * fss,
+			   u32 fl_index, u32 batch_size)
+{
+  svm_fifo_chunk_t *c, *head = 0, *tail;
+  uword size, total_chunk_bytes;
+  u32 rounded_data_size;
+  void *oldheap;
+  u8 *cmem;
+  int i;
+
+  ASSERT (batch_size != 0);
+
+  rounded_data_size = fs_freelist_index_to_size (fl_index);
+  total_chunk_bytes = (uword) batch_size *rounded_data_size;
+  size = (uword) (sizeof (*c) + rounded_data_size) * batch_size;
+
+  oldheap = ssvm_push_heap (fsh->ssvm_sh);
+  cmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
+					   0 /* align_offset */ ,
+					   0 /* os_out_of_memory */ );
+  ssvm_pop_heap (oldheap);
+
+  /* Out of space.. */
+  if (cmem == 0)
+    return -1;
+
+  /* Carve fifo + chunk space */
+  tail = c = (svm_fifo_chunk_t *) cmem;
+  for (i = 0; i < batch_size; i++)
+    {
       c->start_byte = 0;
       c->length = rounded_data_size;
-      c->next = fss->free_chunks[fl_index];
-      fss->free_chunks[fl_index] = c;
-      fmem += hdrs + rounded_data_size;
+      c->next = head;
+      head = c;
+      cmem += sizeof (*c) + rounded_data_size;
+      c = (svm_fifo_chunk_t *) cmem;
     }
 
-  fss->n_fl_chunk_bytes += batch_size * rounded_data_size;
+  fss_chunk_free_list_push_list (fss, fl_index, head, tail);
+  fss->num_chunks[fl_index] += batch_size;
+  fss_fl_chunk_bytes_add (fss, total_chunk_bytes);
+  fsh_cached_bytes_add (fsh, total_chunk_bytes);
   fsh_free_bytes_sub (fsh, size);
 
   return 0;
 }
 
+static int
+fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh,
+			 fifo_segment_slice_t * fss,
+			 u32 fl_index, u32 batch_size)
+{
+  if (fsh_try_alloc_fifo_hdr_batch (fsh, fss, batch_size))
+    return 0;
+  return fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch_size);
+}
+
+static svm_fifo_t *
+fsh_try_alloc_fifo_hdr (fifo_segment_header_t * fsh,
+			fifo_segment_slice_t * fss)
+{
+  svm_fifo_t *f;
+
+  if (!fss->free_fifos)
+    {
+      if (fsh_try_alloc_fifo_hdr_batch (fsh, fss,
+					FIFO_SEGMENT_ALLOC_BATCH_SIZE))
+	return 0;
+    }
+
+  f = fss->free_fifos;
+  fss->free_fifos = f->next;
+  memset (f, 0, sizeof (*f));
+  return f;
+}
+
+static svm_fifo_chunk_t *
+fsh_try_alloc_chunk (fifo_segment_header_t * fsh,
+		     fifo_segment_slice_t * fss, u32 data_bytes)
+{
+  svm_fifo_chunk_t *c;
+  u32 fl_index;
+
+  fl_index = fs_freelist_for_size (data_bytes);
+
+free_list:
+  c = fss_chunk_free_list_pop (fss, fl_index);
+  if (c)
+    {
+      c->next = 0;
+      fss_fl_chunk_bytes_sub (fss, fs_freelist_index_to_size (fl_index));
+      fsh_cached_bytes_sub (fsh, fs_freelist_index_to_size (fl_index));
+    }
+  else
+    {
+      u32 chunk_size, batch = FIFO_SEGMENT_ALLOC_BATCH_SIZE;
+      uword n_free;
+
+      chunk_size = fs_freelist_index_to_size (fl_index);
+      n_free = fsh_n_free_bytes (fsh);
+
+      if (chunk_size <= n_free)
+	{
+	  batch = chunk_size * batch <= n_free ? batch : 1;
+	  if (!fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch))
+	    goto free_list;
+	}
+      /* Failed to allocate larger chunk, try to allocate multi-chunk
+       * that is close to what was actually requested */
+      if (data_bytes <= fss_fl_chunk_bytes (fss))
+	{
+	  c = fs_try_alloc_multi_chunk (fsh, fss, data_bytes);
+	  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 (data_bytes <= fss_fl_chunk_bytes (fss) + n_free)
+	{
+	  u32 min_size = FIFO_SEGMENT_MIN_FIFO_SIZE;
+
+	  batch = (data_bytes - fss_fl_chunk_bytes (fss)) / 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, data_bytes);
+	}
+    }
+
+done:
+
+  return c;
+}
+
 /**
  * Try to allocate new fifo
  *
@@ -435,49 +670,78 @@ static svm_fifo_t *
 fs_try_alloc_fifo (fifo_segment_header_t * fsh, fifo_segment_slice_t * fss,
 		   u32 data_bytes)
 {
-  u32 fifo_sz, fl_index;
+  u32 fl_index, min_size;
+  svm_fifo_chunk_t *c;
   svm_fifo_t *f = 0;
-  uword n_free_bytes;
 
-  fl_index = fs_freelist_for_size (data_bytes);
-  fifo_sz = sizeof (svm_fifo_t) + sizeof (svm_fifo_chunk_t);
-  fifo_sz += 1 << max_log2 (data_bytes);
+  min_size = clib_max ((fsh->pct_first_alloc * data_bytes) / 100, 4096);
+  fl_index = fs_freelist_for_size (min_size);
+
+  if (!fss_chunk_fl_index_is_valid (fss, fl_index))
+    return 0;
+
+  f = fsh_try_alloc_fifo_hdr (fsh, fss);
+  if (!f)
+    return 0;
 
-  if (fss->free_fifos && fss->free_chunks[fl_index])
+  c = fsh_try_alloc_chunk (fsh, fss, min_size);
+  if (!c)
     {
-      f = fs_try_alloc_fifo_freelist (fss, fl_index, data_bytes);
-      if (f)
-	goto done;
+      f->next = fss->free_fifos;
+      fss->free_fifos = f;
+      return 0;
     }
 
-  fsh_check_mem (fsh);
-  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->start_chunk = c;
+  while (c->next)
+    c = c->next;
+  f->end_chunk = c;
+  f->size = data_bytes;
+  f->fs_hdr = fsh;
 
-      f = fs_try_alloc_fifo_freelist (fss, fl_index, data_bytes);
-      goto done;
-    }
-  if (fifo_sz <= n_free_bytes)
+  return f;
+}
+
+svm_fifo_chunk_t *
+fsh_alloc_chunk (fifo_segment_header_t * fsh, u32 slice_index, u32 chunk_size)
+{
+  fifo_segment_slice_t *fss;
+  svm_fifo_chunk_t *c;
+
+  fss = fsh_slice_get (fsh, slice_index);
+  c = fsh_try_alloc_chunk (fsh, fss, chunk_size);
+
+  return c;
+}
+
+static void
+fsh_slice_collect_chunks (fifo_segment_header_t * fsh,
+			  fifo_segment_slice_t * fss, svm_fifo_chunk_t * c)
+{
+  u32 n_collect = 0, fl_index;
+  svm_fifo_chunk_t *next;
+
+  while (c)
     {
-      void *oldheap = ssvm_push_heap (fsh->ssvm_sh);
-      f = svm_fifo_create (data_bytes);
-      ssvm_pop_heap (oldheap);
-      if (f)
-	{
-	  fsh_free_bytes_sub (fsh, fifo_sz);
-	  goto done;
-	}
+      CLIB_MEM_UNPOISON (c, sizeof (*c));
+      next = c->next;
+      fl_index = fs_freelist_for_size (c->length);
+      fss_chunk_free_list_push (fss, fl_index, c);
+      n_collect += fs_freelist_index_to_size (fl_index);
+      c = next;
     }
-  if (data_bytes <= fss->n_fl_chunk_bytes)
-    f = fs_try_alloc_fifo_freelist_multi_chunk (fsh, fss, data_bytes);
 
-done:
+  fss_fl_chunk_bytes_add (fss, n_collect);
+  fsh_cached_bytes_add (fsh, n_collect);
+}
 
-  return f;
+void
+fsh_collect_chunks (fifo_segment_header_t * fsh, u32 slice_index,
+		    svm_fifo_chunk_t * c)
+{
+  fifo_segment_slice_t *fss;
+  fss = fsh_slice_get (fsh, slice_index);
+  fsh_slice_collect_chunks (fsh, fss, c);
 }
 
 /**
@@ -493,6 +757,9 @@ fifo_segment_alloc_fifo_w_slice (fifo_segment_t * fs, u32 slice_index,
 
   ASSERT (slice_index < fs->n_slices);
 
+  if (PREDICT_FALSE (data_bytes > 1 << fsh->max_log2_chunk_size))
+    return 0;
+
   fss = fsh_slice_get (fsh, slice_index);
   f = fs_try_alloc_fifo (fsh, fss, data_bytes);
   if (!f)
@@ -500,32 +767,20 @@ fifo_segment_alloc_fifo_w_slice (fifo_segment_t * fs, u32 slice_index,
 
   f->slice_index = slice_index;
 
-  /* (re)initialize the fifo, as in svm_fifo_create */
   svm_fifo_init (f, data_bytes);
 
-  /* Initialize chunks and rbtree for multi-chunk fifos */
-  if (f->start_chunk->next != f->start_chunk)
-    {
-      void *oldheap = ssvm_push_heap (fsh->ssvm_sh);
-      svm_fifo_init_chunks (f);
-      ssvm_pop_heap (oldheap);
-    }
-
   /* If rx fifo type add to active fifos list. When cleaning up segment,
    * we need a list of active sessions that should be disconnected. Since
    * both rx and tx fifos keep pointers to the session, it's enough to track
    * only one. */
   if (ftype == FIFO_SEGMENT_RX_FIFO)
     {
-      if (fss->fifos)
-	{
-	  fss->fifos->prev = f;
-	  f->next = fss->fifos;
-	}
-      fss->fifos = f;
+      fss_fifo_add_active_list (fss, f);
       f->flags |= SVM_FIFO_F_LL_TRACKED;
     }
+
   fsh_active_fifos_update (fsh, 1);
+  fss->virtual_mem += svm_fifo_size (f);
 
 done:
   return (f);
@@ -538,10 +793,7 @@ void
 fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f)
 {
   fifo_segment_header_t *fsh = fs->h;
-  svm_fifo_chunk_t *cur, *next;
   fifo_segment_slice_t *fss;
-  void *oldheap;
-  int fl_index;
 
   ASSERT (f->refcnt > 0);
 
@@ -553,42 +805,18 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f)
   /* Remove from active list. Only rx fifos are tracked */
   if (f->flags & SVM_FIFO_F_LL_TRACKED)
     {
-      if (f->prev)
-	f->prev->next = f->next;
-      else
-	fss->fifos = f->next;
-      if (f->next)
-	f->next->prev = f->prev;
+      fss_fifo_del_active_list (fss, 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 */
-  cur = f->start_chunk;
-  do
-    {
-      next = cur->next;
-      fl_index = fs_freelist_for_size (cur->length);
-      ASSERT (fl_index < vec_len (fss->free_chunks));
-      cur->next = fss->free_chunks[fl_index];
-      fss->free_chunks[fl_index] = cur;
-      fss->n_fl_chunk_bytes += fs_freelist_index_to_size (fl_index);
-      cur = next;
-    }
-  while (cur != f->start_chunk);
+  fsh_slice_collect_chunks (fsh, fss, f->start_chunk);
 
-  f->start_chunk = f->end_chunk = f->new_chunks = 0;
+  f->start_chunk = f->end_chunk = 0;
   f->head_chunk = f->tail_chunk = f->ooo_enq = f->ooo_deq = 0;
 
-  oldheap = ssvm_push_heap (fsh->ssvm_sh);
-  svm_fifo_free_chunk_lookup (f);
-  ssvm_pop_heap (oldheap);
-
   /* not allocated on segment heap */
+  svm_fifo_free_chunk_lookup (f);
   svm_fifo_free_ooo_data (f);
 
   if (CLIB_DEBUG)
@@ -597,60 +825,80 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f)
       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);
 }
 
-int
-fifo_segment_prealloc_fifo_hdrs (fifo_segment_t * fs, u32 slice_index,
-				 u32 batch_size)
+void
+fifo_segment_detach_fifo (fifo_segment_t * fs, svm_fifo_t * f)
 {
-  fifo_segment_header_t *fsh = fs->h;
   fifo_segment_slice_t *fss;
-  svm_fifo_t *f;
-  void *oldheap;
-  u32 size;
-  u8 *fmem;
-  int i;
+  svm_fifo_chunk_t *c;
+  u32 fl_index;
 
-  fss = fsh_slice_get (fsh, slice_index);
-  size = (sizeof (*f)) * batch_size;
+  ASSERT (f->refcnt == 1);
 
-  oldheap = ssvm_push_heap (fsh->ssvm_sh);
-  fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
-					   0 /* align_offset */ ,
-					   0 /* os_out_of_memory */ );
-  ssvm_pop_heap (oldheap);
+  fss = fsh_slice_get (fs->h, f->slice_index);
+  fss->virtual_mem -= svm_fifo_size (f);
+  if (f->flags & SVM_FIFO_F_LL_TRACKED)
+    fss_fifo_del_active_list (fss, f);
 
-  /* Out of space.. */
-  if (fmem == 0)
-    return -1;
+  c = f->start_chunk;
+  while (c)
+    {
+      fl_index = fs_freelist_for_size (c->length);
+      clib_atomic_fetch_sub_rel (&fss->num_chunks[fl_index], 1);
+      c = c->next;
+    }
+}
 
-  /* Carve fifo + chunk space */
-  for (i = 0; i < batch_size; i++)
+void
+fifo_segment_attach_fifo (fifo_segment_t * fs, svm_fifo_t * f,
+			  u32 slice_index)
+{
+  fifo_segment_slice_t *fss;
+  svm_fifo_chunk_t *c;
+  u32 fl_index;
+
+  f->slice_index = slice_index;
+  fss = fsh_slice_get (fs->h, f->slice_index);
+  fss->virtual_mem += svm_fifo_size (f);
+  if (f->flags & SVM_FIFO_F_LL_TRACKED)
+    fss_fifo_add_active_list (fss, f);
+
+  c = f->start_chunk;
+  while (c)
     {
-      f = (svm_fifo_t *) fmem;
-      memset (f, 0, sizeof (*f));
-      f->next = fss->free_fifos;
-      fss->free_fifos = f;
-      fmem += sizeof (*f);
+      fl_index = fs_freelist_for_size (c->length);
+      clib_atomic_fetch_add_rel (&fss->num_chunks[fl_index], 1);
+      c = c->next;
     }
+}
 
-  fsh_free_bytes_sub (fsh, size);
+int
+fifo_segment_prealloc_fifo_hdrs (fifo_segment_t * fs, u32 slice_index,
+				 u32 batch_size)
+{
+  fifo_segment_header_t *fsh = fs->h;
+  fifo_segment_slice_t *fss;
 
-  return 0;
+  fss = fsh_slice_get (fsh, slice_index);
+  return fsh_try_alloc_fifo_hdr_batch (fsh, fss, batch_size);
 }
 
 int
 fifo_segment_prealloc_fifo_chunks (fifo_segment_t * fs, u32 slice_index,
 				   u32 chunk_size, u32 batch_size)
 {
-  u32 size, rounded_data_size, fl_index;
   fifo_segment_header_t *fsh = fs->h;
   fifo_segment_slice_t *fss;
-  svm_fifo_chunk_t *c;
-  void *oldheap;
-  u8 *cmem;
-  int i;
+  u32 fl_index;
 
   if (!fs_chunk_size_is_valid (fsh, chunk_size))
     {
@@ -659,36 +907,9 @@ fifo_segment_prealloc_fifo_chunks (fifo_segment_t * fs, u32 slice_index,
     }
 
   fl_index = fs_freelist_for_size (chunk_size);
-  rounded_data_size = fs_freelist_index_to_size (fl_index);
-  size = (sizeof (*c) + rounded_data_size) * batch_size;
-
-  oldheap = ssvm_push_heap (fsh->ssvm_sh);
-  cmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
-					   0 /* align_offset */ ,
-					   0 /* os_out_of_memory */ );
-  ssvm_pop_heap (oldheap);
-
-  /* Out of space.. */
-  if (cmem == 0)
-    return -1;
-
   fss = fsh_slice_get (fsh, slice_index);
 
-  /* Carve fifo + chunk space */
-  for (i = 0; i < batch_size; i++)
-    {
-      c = (svm_fifo_chunk_t *) cmem;
-      c->start_byte = 0;
-      c->length = rounded_data_size;
-      c->next = fss->free_chunks[fl_index];
-      fss->free_chunks[fl_index] = c;
-      cmem += sizeof (*c) + rounded_data_size;
-    }
-
-  fss->n_fl_chunk_bytes += batch_size * rounded_data_size;
-  fsh_free_bytes_sub (fsh, size);
-
-  return 0;
+  return fsh_try_alloc_chunk_batch (fsh, fss, fl_index, batch_size);
 }
 
 /**
@@ -742,8 +963,11 @@ fifo_segment_preallocate_fifo_pairs (fifo_segment_t * fs,
 
   for (i = 0; i < fs->n_slices; i++)
     {
-      fss = fsh_slice_get (fsh, i);
       alloc_now = clib_min (pairs_per_slice, *n_fifo_pairs);
+      if (0 == alloc_now)
+	break;
+
+      fss = fsh_slice_get (fsh, i);
       if (fs_try_alloc_fifo_batch (fsh, fss, rx_fl_index, alloc_now))
 	clib_warning ("rx prealloc failed: pairs %u", alloc_now);
       if (fs_try_alloc_fifo_batch (fsh, fss, tx_fl_index, alloc_now))
@@ -754,87 +978,13 @@ fifo_segment_preallocate_fifo_pairs (fifo_segment_t * fs,
     }
 }
 
-int
-fifo_segment_grow_fifo (fifo_segment_t * fs, svm_fifo_t * f, u32 chunk_size)
-{
-  fifo_segment_header_t *fsh = fs->h;
-  fifo_segment_slice_t *fss;
-  svm_fifo_chunk_t *c;
-  void *oldheap;
-  int fl_index;
-
-  fl_index = fs_freelist_for_size (chunk_size);
-  fss = fsh_slice_get (fsh, f->slice_index);
-
-  oldheap = ssvm_push_heap (fsh->ssvm_sh);
-
-  c = fss->free_chunks[fl_index];
-
-  if (!c)
-    {
-      fsh_check_mem (fsh);
-      if (fsh_n_free_bytes (fsh) < chunk_size)
-	{
-	  ssvm_pop_heap (oldheap);
-	  return -1;
-	}
-
-      c = svm_fifo_chunk_alloc (chunk_size);
-      if (!c)
-	{
-	  ssvm_pop_heap (oldheap);
-	  return -1;
-	}
-      fsh_free_bytes_sub (fsh, chunk_size + sizeof (*c));
-    }
-  else
-    {
-      fss->free_chunks[fl_index] = c->next;
-      c->next = 0;
-      fss->n_fl_chunk_bytes -= fs_freelist_index_to_size (fl_index);
-    }
-
-  svm_fifo_add_chunk (f, c);
-
-  ssvm_pop_heap (oldheap);
-  return 0;
-}
-
-int
-fifo_segment_collect_fifo_chunks (fifo_segment_t * fs, svm_fifo_t * f)
-{
-  fifo_segment_header_t *fsh = fs->h;
-  svm_fifo_chunk_t *cur, *next;
-  fifo_segment_slice_t *fss;
-  void *oldheap;
-  int fl_index;
-
-  oldheap = ssvm_push_heap (fsh->ssvm_sh);
-  cur = svm_fifo_collect_chunks (f);
-
-  fss = fsh_slice_get (fsh, f->slice_index);
-
-  while (cur)
-    {
-      next = cur->next;
-      fl_index = fs_freelist_for_size (cur->length);
-      cur->next = fss->free_chunks[fl_index];
-      fss->free_chunks[fl_index] = cur;
-      cur = next;
-    }
-
-  ssvm_pop_heap (oldheap);
-
-  return 0;
-}
-
 /**
  * Get number of active fifos
  */
 u32
 fifo_segment_num_fifos (fifo_segment_t * fs)
 {
-  return clib_atomic_load_relax_n (&fs->h->n_active_fifos);
+  return fsh_n_active_fifos (fs->h);
 }
 
 static u32
@@ -936,12 +1086,42 @@ fifo_segment_update_free_bytes (fifo_segment_t * fs)
   fsh_update_free_bytes (fs->h);
 }
 
+uword
+fifo_segment_size (fifo_segment_t * fs)
+{
+  return fs->ssvm.ssvm_size;
+}
+
+u8
+fsh_has_reached_mem_limit (fifo_segment_header_t * fsh)
+{
+  return (fsh->flags & FIFO_SEGMENT_F_MEM_LIMIT) ? 1 : 0;
+}
+
+void
+fsh_reset_mem_limit (fifo_segment_header_t * fsh)
+{
+  fsh->flags &= ~FIFO_SEGMENT_F_MEM_LIMIT;
+}
+
 uword
 fifo_segment_free_bytes (fifo_segment_t * fs)
 {
   return fsh_n_free_bytes (fs->h);
 }
 
+uword
+fifo_segment_cached_bytes (fifo_segment_t * fs)
+{
+  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)
 {
@@ -953,7 +1133,7 @@ fifo_segment_fl_chunk_bytes (fifo_segment_t * fs)
   for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
     {
       fss = fsh_slice_get (fsh, slice_index);
-      n_bytes += fss->n_fl_chunk_bytes;
+      n_bytes += fss_fl_chunk_bytes (fss);
     }
 
   return n_bytes;
@@ -962,17 +1142,7 @@ fifo_segment_fl_chunk_bytes (fifo_segment_t * fs)
 u8
 fifo_segment_has_fifos (fifo_segment_t * fs)
 {
-  fifo_segment_header_t *fsh = fs->h;
-  fifo_segment_slice_t *fss;
-  int slice_index;
-
-  for (slice_index = 0; slice_index < fs->n_slices; slice_index++)
-    {
-      fss = fsh_slice_get (fsh, slice_index);
-      if (fss->fifos)
-	return 1;
-    }
-  return 0;
+  return (fsh_n_active_fifos (fs->h) != 0);
 }
 
 svm_fifo_t *
@@ -985,6 +1155,52 @@ fifo_segment_get_slice_fifo_list (fifo_segment_t * fs, u32 slice_index)
   return fss->fifos;
 }
 
+u8
+fifo_segment_get_mem_usage (fifo_segment_t * fs)
+{
+  uword size, in_use;
+
+  size = fifo_segment_size (fs);
+  in_use =
+    size - fifo_segment_free_bytes (fs) - fifo_segment_cached_bytes (fs);
+  return (in_use * 100) / size;
+}
+
+fifo_segment_mem_status_t
+fifo_segment_determine_status (fifo_segment_header_t * fsh, u8 usage)
+{
+  if (!fsh->high_watermark || !fsh->low_watermark)
+    return MEMORY_PRESSURE_NO_PRESSURE;
+
+  /* once the no-memory is detected, the status continues
+   * until memory usage gets below the high watermark
+   */
+  if (fsh_has_reached_mem_limit (fsh))
+    {
+      if (usage >= fsh->high_watermark)
+	return MEMORY_PRESSURE_NO_MEMORY;
+      else
+	fsh_reset_mem_limit (fsh);
+    }
+
+  if (usage >= fsh->high_watermark)
+    return MEMORY_PRESSURE_HIGH_PRESSURE;
+
+  else if (usage >= fsh->low_watermark)
+    return MEMORY_PRESSURE_LOW_PRESSURE;
+
+  return MEMORY_PRESSURE_NO_PRESSURE;
+}
+
+fifo_segment_mem_status_t
+fifo_segment_get_mem_status (fifo_segment_t * fs)
+{
+  fifo_segment_header_t *fsh = fs->h;
+  u8 usage = fifo_segment_get_mem_usage (fs);
+
+  return fifo_segment_determine_status (fsh, usage);
+}
+
 u8 *
 format_fifo_segment_type (u8 * s, va_list * args)
 {
@@ -993,7 +1209,7 @@ format_fifo_segment_type (u8 * s, va_list * args)
   ssvm_segment_type_t st = ssvm_type (&sp->ssvm);
 
   if (st == SSVM_SEGMENT_PRIVATE)
-    s = format (s, "%s", "private-heap");
+    s = format (s, "%s", "private");
   else if (st == SSVM_SEGMENT_MEMFD)
     s = format (s, "%s", "memfd");
   else if (st == SSVM_SEGMENT_SHM)
@@ -1009,11 +1225,13 @@ format_fifo_segment_type (u8 * s, va_list * args)
 u8 *
 format_fifo_segment (u8 * s, va_list * args)
 {
-  u32 count, indent, active_fifos, free_fifos, fifo_hdr = 0;
+  u32 count, indent, active_fifos, free_fifos;
   fifo_segment_t *fs = va_arg (*args, fifo_segment_t *);
   int verbose __attribute__ ((unused)) = va_arg (*args, int);
   uword est_chunk_bytes, est_free_seg_bytes, free_chunks;
   uword chunk_bytes = 0, free_seg_bytes, chunk_size;
+  uword tracked_cached_bytes;
+  uword fifo_hdr = 0, reserved;
   fifo_segment_header_t *fsh;
   fifo_segment_slice_t *fss;
   svm_fifo_chunk_t *c;
@@ -1021,18 +1239,15 @@ format_fifo_segment (u8 * s, va_list * args)
   char *address;
   size_t size;
   int i;
+  uword allocated, in_use, virt;
+  f64 usage;
+  fifo_segment_mem_status_t mem_st;
 
   indent = format_get_indent (s) + 2;
-#if USE_DLMALLOC == 0
-  s = format (s, "%U segment heap: %U\n", format_white_space, indent,
-	      format_mheap, fsh->ssvm_sh->heap, verbose);
-  s = format (s, "%U segment has %u active fifos\n",
-	      format_white_space, indent, fifo_segment_num_fifos (fsh));
-#endif
 
   if (fs == 0)
     {
-      s = format (s, "%-15s%15s%15s%15s%15s%15s", "Name", "Type",
+      s = format (s, "%-20s%10s%15s%15s%15s%15s", "Name", "Type",
 		  "HeapSize (M)", "ActiveFifos", "FreeFifos", "Address");
       return s;
     }
@@ -1041,7 +1256,7 @@ format_fifo_segment (u8 * s, va_list * args)
   active_fifos = fifo_segment_num_fifos (fs);
   free_fifos = fifo_segment_num_free_fifos (fs);
 
-  s = format (s, "%-15v%15U%15llu%15u%15u%15llx", ssvm_name (&fs->ssvm),
+  s = format (s, "%-20v%10U%15llu%15u%15u%15llx", ssvm_name (&fs->ssvm),
 	      format_fifo_segment_type, fs, size >> 20ULL, active_fifos,
 	      free_fifos, address);
 
@@ -1052,8 +1267,9 @@ format_fifo_segment (u8 * s, va_list * args)
 
   free_chunks = fifo_segment_num_free_chunks (fs, ~0);
   if (free_chunks)
-    s = format (s, "\n\n%UFree chunks by size:\n", format_white_space,
-		indent + 2);
+    s =
+      format (s, "\n\n%UFree/Allocated chunks by size:\n", format_white_space,
+	      indent + 2);
   else
     s = format (s, "\n");
 
@@ -1063,7 +1279,7 @@ format_fifo_segment (u8 * s, va_list * args)
       for (i = 0; i < vec_len (fss->free_chunks); i++)
 	{
 	  c = fss->free_chunks[i];
-	  if (c == 0)
+	  if (c == 0 && fss->num_chunks[i] == 0)
 	    continue;
 	  count = 0;
 	  while (c)
@@ -1073,8 +1289,8 @@ format_fifo_segment (u8 * s, va_list * args)
 	    }
 
 	  chunk_size = fs_freelist_index_to_size (i);
-	  s = format (s, "%U%-5u kB: %u\n", format_white_space, indent + 2,
-		      chunk_size >> 10, count);
+	  s = format (s, "%U%-5u kB: %u/%u\n", format_white_space, indent + 2,
+		      chunk_size >> 10, count, fss->num_chunks[i]);
 
 	  chunk_bytes += count * chunk_size;
 	}
@@ -1085,19 +1301,31 @@ format_fifo_segment (u8 * s, va_list * args)
   est_free_seg_bytes = fifo_segment_free_bytes (fs);
   fifo_segment_update_free_bytes (fs);
   free_seg_bytes = fifo_segment_free_bytes (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)\n",
-	      format_white_space, indent + 2, format_memory_size, chunk_bytes,
-	      chunk_bytes, format_memory_size, est_chunk_bytes,
-	      est_chunk_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);
+  tracked_cached_bytes = fifo_segment_cached_bytes (fs);
+  allocated = fifo_segment_size (fs);
+  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);
+  virt = fsh_virtual_mem (fsh);
+  reserved = fsh->n_reserved_bytes;
+
+  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, reserved, reserved);
+  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;