vlib: fix trace number accounting

[vpp.git] / src / vnet / devices / af_packet / node.c

diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 556d748..61d4ce2 100644 (file)
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -29,7 +29,8 @@
 
 #include <vnet/devices/af_packet/af_packet.h>
 
-#define foreach_af_packet_input_error
+#define foreach_af_packet_input_error \
+  _(PARTIAL_PKT, "partial packet")
 
 typedef enum
 {
@@ -115,8 +116,7 @@ mark_tcp_udp_cksum_calc (vlib_buffer_t * b)
     {
       ip4_header_t *ip4 =
        (vlib_buffer_get_current (b) + sizeof (ethernet_header_t));
-      b->flags |= VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
-      ip4->checksum = 0;
+      b->flags |= VNET_BUFFER_F_IS_IP4;
       if (ip4->protocol == IP_PROTOCOL_TCP)
        {
          b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
@@ -191,14 +191,10 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   u32 frame_num = apif->rx_req->tp_frame_nr;
   u8 *block_start = apif->rx_ring + block * block_size;
   uword n_trace = vlib_get_trace_count (vm, node);
-  u32 thread_index = vlib_get_thread_index ();
-  u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
-                                                         VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+  u32 thread_index = vm->thread_index;
+  u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
   u32 min_bufs = apif->rx_req->tp_frame_size / n_buffer_bytes;
 
-  if (apif->per_interface_next_index != ~0)
-    next_index = apif->per_interface_next_index;
-
   n_free_bufs = vec_len (apm->rx_buffers[thread_index]);
   if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
     {
@@ -248,9 +244,9 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
                {
                  if (PREDICT_TRUE (offset == 0))
                    {
-                     clib_memcpy (vlib_buffer_get_current (b0),
-                                  (u8 *) tph + tph->tp_mac,
-                                  sizeof (ethernet_header_t));
+                     clib_memcpy_fast (vlib_buffer_get_current (b0),
+                                       (u8 *) tph + tph->tp_mac,
+                                       sizeof (ethernet_header_t));
                      ethernet_header_t *eth = vlib_buffer_get_current (b0);
                      ethernet_vlan_header_t *vlan =
                        (ethernet_vlan_header_t *) (eth + 1);
@@ -262,10 +258,10 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
                      bytes_copied = sizeof (ethernet_header_t);
                    }
                }
-             clib_memcpy (((u8 *) vlib_buffer_get_current (b0)) +
-                          bytes_copied + vlan_len,
-                          (u8 *) tph + tph->tp_mac + offset + bytes_copied,
-                          (bytes_to_copy - bytes_copied));
+             clib_memcpy_fast (((u8 *) vlib_buffer_get_current (b0)) +
+                               bytes_copied + vlan_len,
+                               (u8 *) tph + tph->tp_mac + offset +
+                               bytes_copied, (bytes_to_copy - bytes_copied));
 
              /* fill buffer header */
              b0->current_length = bytes_to_copy + vlan_len;
@@ -293,23 +289,39 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          to_next += 1;
          n_left_to_next--;
 
+         /* drop partial packets */
+         if (PREDICT_FALSE (tph->tp_len != tph->tp_snaplen))
+           {
+             next0 = VNET_DEVICE_INPUT_NEXT_DROP;
+             first_b0->error =
+               node->errors[AF_PACKET_INPUT_ERROR_PARTIAL_PKT];
+           }
+         else
+           {
+             next0 = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+
+             if (PREDICT_FALSE (apif->per_interface_next_index != ~0))
+               next0 = apif->per_interface_next_index;
+
+             /* redirect if feature path enabled */
+             vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0,
+                                                 first_b0);
+           }
+
          /* trace */
          VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
-         if (PREDICT_FALSE (n_trace > 0))
+         if (PREDICT_FALSE
+             (n_trace > 0 && vlib_trace_buffer (vm, node, next0, first_b0,
+                                                /* follow_chain */ 0)))
            {
              af_packet_input_trace_t *tr;
-             vlib_trace_buffer (vm, node, next0, first_b0,     /* follow_chain */
-                                0);
              vlib_set_trace_count (vm, node, --n_trace);
              tr = vlib_add_trace (vm, node, first_b0, sizeof (*tr));
              tr->next_index = next0;
              tr->hw_if_index = apif->hw_if_index;
-             clib_memcpy (&tr->tph, tph, sizeof (struct tpacket2_hdr));
+             clib_memcpy_fast (&tr->tph, tph, sizeof (struct tpacket2_hdr));
            }
 
-         /* redirect if feature path enabled */
-         vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0, b0);
-
          /* enque and take next packet */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                           n_left_to_next, first_bi0, next0);
@@ -334,9 +346,9 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   return n_rx_packets;
 }
 
-static uword
-af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
+VLIB_NODE_FN (af_packet_input_node) (vlib_main_t * vm,
+                                    vlib_node_runtime_t * node,
+                                    vlib_frame_t * frame)
 {
   u32 n_rx_packets = 0;
   af_packet_main_t *apm = &af_packet_main;
@@ -356,8 +368,8 @@ af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (af_packet_input_node) = {
-  .function = af_packet_input_fn,
   .name = "af-packet-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .sibling_of = "device-input",
   .format_trace = format_af_packet_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,
@@ -365,8 +377,6 @@ VLIB_REGISTER_NODE (af_packet_input_node) = {
   .n_errors = AF_PACKET_INPUT_N_ERROR,
   .error_strings = af_packet_input_error_strings,
 };
-
-VLIB_NODE_FUNCTION_MULTIARCH (af_packet_input_node, af_packet_input_fn)
 /* *INDENT-ON* */