ethernet: add sanity checks to p2p_ethernet_add/del

[vpp.git] / src / vnet / ethernet / p2p_ethernet_input.c

diff --git a/src/vnet/ethernet/p2p_ethernet_input.c b/src/vnet/ethernet/p2p_ethernet_input.c
index a58b832..7e5f7ca 100644 (file)
--- a/src/vnet/ethernet/p2p_ethernet_input.c
+++ b/src/vnet/ethernet/p2p_ethernet_input.c
@@ -24,10 +24,10 @@
 #include <vppinfra/error.h>
 #include <vppinfra/elog.h>
 
-vlib_node_registration_t p2p_ethernet_input_node;
+extern vlib_node_registration_t p2p_ethernet_input_node;
 
 /* packet trace format function */
-u8 *
+static u8 *
 format_p2p_ethernet_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
@@ -59,14 +59,17 @@ static char *p2p_ethernet_error_strings[] = {
 #undef _
 };
 
-static uword
-p2p_ethernet_input_node_fn (vlib_main_t * vm,
-                           vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm,
+                                       vlib_node_runtime_t * node,
+                                       vlib_frame_t * frame)
 {
+  u32 thread_index = vm->thread_index;
   u32 n_trace = vlib_get_trace_count (vm, node);
   u32 n_left_from, *from, *to_next;
   u32 next_index;
   u32 n_p2p_ethernet_packets = 0;
+  vlib_combined_counter_main_t *cm =
+    vnet_get_main ()->interface_main.combined_sw_if_counters;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -104,8 +107,8 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
          en1 = vlib_buffer_get_current (b1);
          sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
 
-         vnet_feature_next (sw_if_index0, &next0, b0);
-         vnet_feature_next (sw_if_index1, &next1, b1);
+         vnet_feature_next (&next0, b0);
+         vnet_feature_next (&next1, b1);
 
          rx0 = p2p_ethernet_lookup (sw_if_index0, en0->src_address);
          rx1 = p2p_ethernet_lookup (sw_if_index1, en1->src_address);
@@ -126,6 +129,10 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
                  t0->sw_if_index = sw_if_index0;
                  t0->p2pe_sw_if_index = rx0;
                }
+
+             vlib_increment_combined_counter (cm, thread_index, rx0, 1,
+                                              vlib_buffer_length_in_chain
+                                              (vm, b0));
            }
          if (rx1 != ~0)
            {
@@ -143,6 +150,10 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
                  t1->sw_if_index = sw_if_index1;
                  t1->p2pe_sw_if_index = rx1;
                }
+
+             vlib_increment_combined_counter (cm, thread_index, rx1, 1,
+                                              vlib_buffer_length_in_chain
+                                              (vm, b1));
            }
 
          /* verify speculative enqueue, maybe switch current next frame */
@@ -175,7 +186,7 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
          en0 = vlib_buffer_get_current (b0);
          sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
 
-         vnet_feature_next (sw_if_index0, &next0, b0);
+         vnet_feature_next (&next0, b0);
 
          rx0 = p2p_ethernet_lookup (sw_if_index0, en0->src_address);
          if (rx0 != ~0)
@@ -194,6 +205,10 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
                  t0->sw_if_index = sw_if_index0;
                  t0->p2pe_sw_if_index = rx0;
                }
+
+             vlib_increment_combined_counter (cm, thread_index, rx0, 1,
+                                              vlib_buffer_length_in_chain
+                                              (vm, b0));
            }
          else
            {
@@ -218,11 +233,11 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (p2p_ethernet_input_node) = {
-  .function = p2p_ethernet_input_node_fn,
   .name = "p2p-ethernet-input",
   .vector_size = sizeof (u32),
   .format_trace = format_p2p_ethernet_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
 
   .n_errors = ARRAY_LEN(p2p_ethernet_error_strings),
   .error_strings = p2p_ethernet_error_strings,
@@ -236,8 +251,6 @@ VLIB_REGISTER_NODE (p2p_ethernet_input_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (p2p_ethernet_input_node,
-                             p2p_ethernet_input_node_fn)
 /*
  * fd.io coding-style-patch-verification: ON
  *