vlib: fix trace number accounting

[vpp.git] / src / plugins / vmxnet3 / input.c

diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c
index 7928bc3..bed4c1e 100644 (file)
--- a/src/plugins/vmxnet3/input.c
+++ b/src/plugins/vmxnet3/input.c
@@ -76,7 +76,7 @@ vmxnet3_rx_comp_ring_advance_next (vmxnet3_rxq_t * rxq)
 
 static_always_inline void
 vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
-                       u16 * next, u16 gso_size)
+                       u16 gso_size)
 {
   u8 l4_hdr_sz = 0;
 
@@ -92,7 +92,6 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
       hb->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L4_HDR_OFFSET_VALID | VNET_BUFFER_F_IS_IP4;
-      next[0] = VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
 
       /* checksum offload */
       if (!(rx_comp->index & VMXNET3_RXCI_CNC))
@@ -141,7 +140,6 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
          vnet_buffer2 (hb)->gso_l4_hdr_sz = l4_hdr_sz;
          hb->flags |= VNET_BUFFER_F_GSO;
        }
-      vlib_buffer_advance (hb, device_input_next_node_advance[next[0]]);
     }
   else if (rx_comp->flags & VMXNET3_RXCF_IP6)
     {
@@ -152,7 +150,6 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
       hb->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L4_HDR_OFFSET_VALID | VNET_BUFFER_F_IS_IP6;
-      next[0] = VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
 
       /* checksum offload */
       if (!(rx_comp->index & VMXNET3_RXCI_CNC))
@@ -196,10 +193,7 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
          vnet_buffer2 (hb)->gso_l4_hdr_sz = l4_hdr_sz;
          hb->flags |= VNET_BUFFER_F_GSO;
        }
-      vlib_buffer_advance (hb, device_input_next_node_advance[next[0]]);
     }
-  else
-    next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
 }
 
 static_always_inline uword
@@ -275,7 +269,6 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       b0->flags = 0;
       b0->error = 0;
       b0->current_config_index = 0;
-      ASSERT (b0->current_length != 0);
 
       if (PREDICT_FALSE ((rx_comp->index & VMXNET3_RXCI_EOP) &&
                         (rx_comp->len & VMXNET3_RXCL_ERROR)))
@@ -296,7 +289,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        {
          ASSERT (!(rxd->flags & VMXNET3_RXF_BTYPE));
          /* start segment */
-         if ((vd->lro_enable) &&
+         if (vd->gso_enable &&
              (rx_comp->flags & VMXNET3_RXCF_CT) == VMXNET3_RXCOMP_TYPE_LRO)
            {
              vmxnet3_rx_comp_ext *lro = (vmxnet3_rx_comp_ext *) rx_comp;
@@ -323,12 +316,19 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       else if (rx_comp->index & VMXNET3_RXCI_EOP)
        {
          /* end of segment */
-         if (prev_b0)
+         if (PREDICT_TRUE (prev_b0 != 0))
            {
-             prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
-             prev_b0->next_buffer = bi0;
-             hb->total_length_not_including_first_buffer +=
-               b0->current_length;
+             if (PREDICT_TRUE (b0->current_length != 0))
+               {
+                 prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+                 prev_b0->next_buffer = bi0;
+                 hb->total_length_not_including_first_buffer +=
+                   b0->current_length;
+               }
+             else
+               {
+                 vlib_buffer_free_one (vm, bi0);
+               }
              prev_b0 = 0;
              got_packet = 1;
            }
@@ -387,17 +387,14 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
            }
 
          if (PREDICT_FALSE (known_next))
-           {
-             next[0] = next_index;
-           }
+           next[0] = next_index;
          else
            {
              ethernet_header_t *e = (ethernet_header_t *) hb->data;
 
-             if (ethernet_frame_is_tagged (e->type))
-               next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-             else
-               vmxnet3_handle_offload (rx_comp, hb, next, gso_size);
+             next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+             if (!ethernet_frame_is_tagged (ntohs (e->type)))
+               vmxnet3_handle_offload (rx_comp, hb, gso_size);
            }
 
          n_rx_packets++;
@@ -421,17 +418,18 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       next = nexts;
       while (n_trace && n_left)
        {
-         vlib_buffer_t *b;
-         vmxnet3_input_trace_t *tr;
-
-         b = vlib_get_buffer (vm, bi[0]);
-         vlib_trace_buffer (vm, node, next[0], b, /* follow_chain */ 0);
-         tr = vlib_add_trace (vm, node, b, sizeof (*tr));
-         tr->next_index = next[0];
-         tr->hw_if_index = vd->hw_if_index;
-         tr->buffer = *b;
-
-         n_trace--;
+         vlib_buffer_t *b = vlib_get_buffer (vm, bi[0]);
+         if (PREDICT_TRUE
+             (vlib_trace_buffer
+              (vm, node, next[0], b, /* follow_chain */ 0)))
+           {
+             vmxnet3_input_trace_t *tr =
+               vlib_add_trace (vm, node, b, sizeof (*tr));
+             tr->next_index = next[0];
+             tr->hw_if_index = vd->hw_if_index;
+             tr->buffer = *b;
+             n_trace--;
+           }
          n_left--;
          bi++;
          next++;
@@ -446,7 +444,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_increment_combined_counter
        (vnm->interface_main.combined_sw_if_counters +
         VNET_INTERFACE_COUNTER_RX, thread_index,
-        vd->hw_if_index, n_rx_packets, n_rx_bytes);
+        vd->sw_if_index, n_rx_packets, n_rx_bytes);
     }
 
   error = vmxnet3_rxq_refill_ring0 (vm, vd, rxq);
@@ -490,6 +488,7 @@ VLIB_NODE_FN (vmxnet3_input_node) (vlib_main_t * vm,
 VLIB_REGISTER_NODE (vmxnet3_input_node) = {
   .name = "vmxnet3-input",
   .sibling_of = "device-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .format_trace = format_vmxnet3_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,
   .state = VLIB_NODE_STATE_DISABLED,