dpdk: change mlx5 pmd name in foreach_dpdk_pmd

[vpp.git] / src / vlib / buffer.c

diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index 43b1dd6..17e7d24 100644 (file)
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -504,6 +504,19 @@ vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
   return copied;
 }
 
+static uword
+vlib_buffer_alloc_size (uword ext_hdr_size, uword data_size)
+{
+  uword alloc_size = ext_hdr_size + sizeof (vlib_buffer_t) + data_size;
+  alloc_size = CLIB_CACHE_LINE_ROUND (alloc_size);
+
+  /* in case when we have even number of cachelines, we add one more for
+   * better cache occupancy */
+  alloc_size |= CLIB_CACHE_LINE_BYTES;
+
+  return alloc_size;
+}
+
 u8
 vlib_buffer_pool_create (vlib_main_t * vm, char *name, u32 data_size,
                         u32 physmem_map_index)
@@ -559,7 +572,7 @@ vlib_buffer_pool_create (vlib_main_t * vm, char *name, u32 data_size,
   vec_validate_aligned (bp->threads, vec_len (vlib_mains) - 1,
                        CLIB_CACHE_LINE_BYTES);
 
-  alloc_size = data_size + sizeof (vlib_buffer_t) + bm->ext_hdr_size;
+  alloc_size = vlib_buffer_alloc_size (bm->ext_hdr_size, data_size);
   n_alloc_per_page = (1ULL << m->log2_page_size) / alloc_size;
 
   /* preallocate buffer indices memory */
@@ -578,6 +591,14 @@ vlib_buffer_pool_create (vlib_main_t * vm, char *name, u32 data_size,
        p = m->base + (j << m->log2_page_size) + i * alloc_size;
        p += bm->ext_hdr_size;
 
+       /*
+        * Waste 1 buffer (maximum) so that 0 is never a valid buffer index.
+        * Allows various places to ASSERT (bi != 0). Much easier
+        * than debugging downstream crashes in successor nodes.
+        */
+       if (p == m->base)
+         continue;
+
        vlib_buffer_copy_template ((vlib_buffer_t *) p, &bp->buffer_template);
 
        bi = vlib_get_buffer_index (vm, (vlib_buffer_t *) p);
@@ -672,10 +693,9 @@ vlib_buffer_main_init_numa_node (struct vlib_main_t *vm, u32 numa_node,
   u32 physmem_map_index;
   uword n_pages, pagesize;
   u32 buffers_per_numa;
-  u32 buffer_size = CLIB_CACHE_LINE_ROUND (bm->ext_hdr_size +
-                                          sizeof (vlib_buffer_t) +
-                                          vlib_buffer_get_default_data_size
-                                          (vm));
+  u32 buffer_size = vlib_buffer_alloc_size (bm->ext_hdr_size,
+                                           vlib_buffer_get_default_data_size
+                                           (vm));
   u8 *name;
 
   pagesize = clib_mem_get_default_hugepage_size ();
@@ -685,6 +705,16 @@ vlib_buffer_main_init_numa_node (struct vlib_main_t *vm, u32 numa_node,
     VLIB_BUFFER_DEFAULT_BUFFERS_PER_NUMA;
 
 retry:
+
+  if (buffer_size > pagesize)
+    {
+      error =
+       clib_error_return (0,
+                          "buffer size (%llu) is greater than page size (%llu)",
+                          buffer_size, pagesize);
+      goto done;
+    }
+
   n_pages = (buffers_per_numa - 1) / (pagesize / buffer_size) + 1;
   error = vlib_physmem_shared_map_create (vm, (char *) name,
                                          n_pages * pagesize,
@@ -923,6 +953,24 @@ vlib_buffers_configure (vlib_main_t * vm, unformat_input_t * input)
 
 VLIB_EARLY_CONFIG_FUNCTION (vlib_buffers_configure, "buffers");
 
+#if VLIB_BUFFER_ALLOC_FAULT_INJECTOR > 0
+u32
+vlib_buffer_alloc_may_fail (vlib_main_t * vm, u32 n_buffers)
+{
+  f64 r;
+
+  r = random_f64 (&vm->buffer_alloc_success_seed);
+
+  /* Fail this request? */
+  if (r > vm->buffer_alloc_success_rate)
+    n_buffers--;
+  /* 5% chance of returning nothing at all */
+  if (r > vm->buffer_alloc_success_rate && r > 0.95)
+    n_buffers = 0;
+
+  return n_buffers;
+}
+#endif
 
 /** @endcond */
 /*