aarch64 compatibility

[vpp.git] / vlib / vlib / node.c

diff --git a/vlib/vlib/node.c b/vlib/vlib/node.c
index 3d26559..c419a13 100644 (file)
--- a/vlib/vlib/node.c
+++ b/vlib/vlib/node.c
@@ -375,7 +375,8 @@ register_node (vlib_main_t * vm, vlib_node_registration_t * r)
 
        p = clib_mem_alloc_aligned_at_offset
          (sizeof (p[0]) + (1 << log2_n_stack_bytes),
-          STACK_ALIGN, STRUCT_OFFSET_OF (vlib_process_t, stack));
+          STACK_ALIGN, STRUCT_OFFSET_OF (vlib_process_t, stack),
+          0 /* no, don't call os_out_of_memory */ );
        if (p == 0)
          clib_panic ("failed to allocate process stack (%d bytes)",
                      1 << log2_n_stack_bytes);
@@ -432,7 +433,11 @@ register_node (vlib_main_t * vm, vlib_node_registration_t * r)
     for (i = 0; i < vec_len (rt->errors); i++)
       rt->errors[i] = vlib_error_set (n->index, i);
 
-    ASSERT (vec_len (n->runtime_data) <= sizeof (rt->runtime_data));
+    STATIC_ASSERT_SIZEOF (vlib_node_runtime_t, 128);
+    ASSERT (vec_len (n->runtime_data) <=
+           sizeof (vlib_node_runtime_t) -
+           STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data));
+
     if (vec_len (n->runtime_data) > 0)
       clib_memcpy (rt->runtime_data, n->runtime_data,
                   vec_len (n->runtime_data));
@@ -449,11 +454,40 @@ vlib_register_node (vlib_main_t * vm, vlib_node_registration_t * r)
   return r->index;
 }
 
+static uword
+null_node_fn (vlib_main_t * vm,
+             vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  u16 n_vectors = frame->n_vectors;
+
+  vlib_node_increment_counter (vm, node->node_index, 0, n_vectors);
+  vlib_buffer_free (vm, vlib_frame_args (frame), n_vectors);
+  vlib_frame_free (vm, node, frame);
+
+  return n_vectors;
+}
+
 void
 vlib_register_all_static_nodes (vlib_main_t * vm)
 {
   vlib_node_registration_t *r;
 
+  static char *null_node_error_strings[] = {
+    "blackholed packets",
+  };
+
+  static vlib_node_registration_t null_node_reg = {
+    .function = null_node_fn,
+    .vector_size = sizeof (u32),
+    .name = "null-node",
+    .n_errors = 1,
+    .error_strings = null_node_error_strings,
+  };
+
+  /* make sure that node index 0 is not used by
+     real node */
+  register_node (vm, &null_node_reg);
+
   r = vm->node_main.node_registrations;
   while (r)
     {
@@ -486,11 +520,11 @@ vlib_node_main_init (vlib_main_t * vm)
 
        sib = vlib_get_node_by_name (vm, (u8 *) n->sibling_of);
        if (!sib)
-          {
-            error = clib_error_create ("sibling `%s' not found for node `%v'", 
-                                       n->sibling_of, n->name);
-            goto done;
-          }
+         {
+           error = clib_error_create ("sibling `%s' not found for node `%v'",
+                                      n->sibling_of, n->name);
+           goto done;
+         }
 
         /* *INDENT-OFF* */
        clib_bitmap_foreach (si, sib->sibling_bitmap, ({