vlib:init free list buffers vec

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

diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index 22cf799..3c117c1 100644 (file)
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -55,6 +55,9 @@ static u32 vlib_buffer_physmem_sz = 14 << 20;
 
 vlib_buffer_main_t buffer_main;
 
+/* logging */
+static vlib_log_class_t buffer_log_default;
+
 uword
 vlib_buffer_length_in_chain_slow_path (vlib_main_t * vm,
                                       vlib_buffer_t * b_first)
@@ -383,6 +386,8 @@ vlib_buffer_create_free_list_helper (vlib_main_t * vm,
 
   clib_memset (f, 0, sizeof (f[0]));
   f->index = f - vm->buffer_free_list_pool;
+  vec_validate (f->buffers, 0);
+  vec_reset_length (f->buffers);
   f->n_data_bytes = vlib_buffer_round_size (n_data_bytes);
   f->min_n_buffers_each_alloc = VLIB_FRAME_SIZE;
   f->buffer_pool_index = 0;
@@ -409,6 +414,8 @@ vlib_buffer_create_free_list_helper (vlib_main_t * vm,
              wf - wvm->buffer_free_list_pool);
       wf[0] = f[0];
       wf->buffers = 0;
+      vec_validate (wf->buffers, 0);
+      vec_reset_length (wf->buffers);
       wf->n_alloc = 0;
     }
 
@@ -669,8 +676,8 @@ vlib_packet_template_buffer_init (vlib_main_t * vm,
     {
       vlib_buffer_t *b = vlib_get_buffer (vm, buffers[i]);
       ASSERT (b->current_length == vec_len (t->packet_data));
-      clib_memcpy (vlib_buffer_get_current (b), t->packet_data,
-                  b->current_length);
+      clib_memcpy_fast (vlib_buffer_get_current (b), t->packet_data,
+                       b->current_length);
     }
 }
 
@@ -735,8 +742,8 @@ vlib_packet_template_get_packet (vlib_main_t * vm,
   *bi_result = bi;
 
   b = vlib_get_buffer (vm, bi);
-  clib_memcpy (vlib_buffer_get_current (b),
-              t->packet_data, vec_len (t->packet_data));
+  clib_memcpy_fast (vlib_buffer_get_current (b),
+                   t->packet_data, vec_len (t->packet_data));
   b->current_length = vec_len (t->packet_data);
 
   return b->data;
@@ -793,7 +800,8 @@ vlib_buffer_add_data (vlib_main_t * vm,
       n_left_this_buffer =
        n_buffer_bytes - (b->current_data + b->current_length);
       n = clib_min (n_left_this_buffer, n_left);
-      clib_memcpy (vlib_buffer_get_current (b) + b->current_length, d, n);
+      clib_memcpy_fast (vlib_buffer_get_current (b) + b->current_length, d,
+                       n);
       b->current_length += n;
       n_left -= n;
       if (n_left == 0)
@@ -839,13 +847,13 @@ vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
              vlib_buffer_alloc_from_free_list (vm, &l->next_buffer, 1,
                                                free_list_index))
            return copied;
-         *last = l = vlib_buffer_chain_buffer (vm, first, l, l->next_buffer);
+         *last = l = vlib_buffer_chain_buffer (vm, l, l->next_buffer);
          max = n_buffer_bytes - l->current_length - l->current_data;
        }
 
       u16 len = (data_len > max) ? max : data_len;
-      clib_memcpy (vlib_buffer_get_current (l) + l->current_length,
-                  data + copied, len);
+      clib_memcpy_fast (vlib_buffer_get_current (l) + l->current_length,
+                       data + copied, len);
       vlib_buffer_chain_increase_length (first, l, len);
       data_len -= len;
       copied += len;
@@ -963,13 +971,16 @@ vlib_buffer_main_init (struct vlib_main_t * vm)
   clib_error_t *error;
   u32 physmem_map_index;
   u8 pool_index;
+  int log2_page_size = 0;
+
+  buffer_log_default = vlib_log_register_class ("buffer", 0);
 
   if (vlib_buffer_callbacks)
     {
       /* external plugin has registered own buffer callbacks
          so we just copy them  and quit */
-      clib_memcpy (&bm->cb, vlib_buffer_callbacks,
-                  sizeof (vlib_buffer_callbacks_t));
+      clib_memcpy_fast (&bm->cb, vlib_buffer_callbacks,
+                       sizeof (vlib_buffer_callbacks_t));
       bm->callbacks_registered = 1;
       return 0;
     }
@@ -981,10 +992,24 @@ vlib_buffer_main_init (struct vlib_main_t * vm)
     &vlib_buffer_delete_free_list_internal;
   clib_spinlock_init (&bm->buffer_known_hash_lockp);
 
-  if ((error = vlib_physmem_shared_map_create (vm, "buffers",
-                                              vlib_buffer_physmem_sz,
-                                              CLIB_PMALLOC_NUMA_LOCAL,
-                                              &physmem_map_index)))
+retry:
+  error = vlib_physmem_shared_map_create (vm, "buffers",
+                                         vlib_buffer_physmem_sz,
+                                         log2_page_size,
+                                         CLIB_PMALLOC_NUMA_LOCAL,
+                                         &physmem_map_index);
+
+  if (error && log2_page_size == 0)
+    {
+      vlib_log_warn (buffer_log_default, "%U", format_clib_error, error);
+      clib_error_free (error);
+      vlib_log_warn (buffer_log_default, "falling back to non-hugepage "
+                    "backed buffer pool");
+      log2_page_size = min_log2 (clib_mem_get_page_size ());
+      goto retry;
+    }
+
+  if (error)
     return error;
 
   pool_index = vlib_buffer_register_physmem_map (vm, physmem_map_index);