vlib: fix trace number accounting

[vpp.git] / src / plugins / memif / node.c

diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 3f4f5c5..506d88a 100644 (file)
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -92,10 +92,10 @@ memif_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node,
 {
   VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b);
 
-  if (PREDICT_TRUE (b != 0))
+  if (PREDICT_TRUE
+      (b != 0 && vlib_trace_buffer (vm, node, next, b, /* follow_chain */ 0)))
     {
       memif_input_trace_t *tr;
-      vlib_trace_buffer (vm, node, next, b, /* follow_chain */ 0);
       vlib_set_trace_count (vm, node, --(*n_tracep));
       tr = vlib_add_trace (vm, node, b, sizeof (*tr));
       tr->next_index = next;
@@ -185,7 +185,8 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   u16 nexts[MEMIF_RX_VECTOR_SZ], *next = nexts;
   u32 _to_next_bufs[MEMIF_RX_VECTOR_SZ], *to_next_bufs = _to_next_bufs, *bi;
   u32 n_rx_packets = 0, n_rx_bytes = 0;
-  u32 n_left, n_left_to_next, next_index;
+  u32 n_left, n_left_to_next;
+  u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
   vlib_buffer_t *b0, *b1, *b2, *b3;
   u32 thread_index = vm->thread_index;
   memif_per_thread_data_t *ptd = vec_elt_at_index (mm->per_thread_data,
@@ -364,12 +365,13 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_frame_t *f;
          ethernet_input_frame_t *ef;
          nf = vlib_node_runtime_get_next_frame (vm, node, next_index);
-         f = vlib_get_frame (vm, nf->frame_index);
+         f = vlib_get_frame (vm, nf->frame);
          f->flags = ETH_INPUT_FRAME_F_SINGLE_SW_IF_IDX;
 
          ef = vlib_frame_scalar_args (f);
          ef->sw_if_index = mif->sw_if_index;
          ef->hw_if_index = mif->hw_if_index;
+         vlib_frame_no_append (f);
        }
     }
 
@@ -482,14 +484,17 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          if (mode != MEMIF_INTERFACE_MODE_ETHERNET)
            ni = next[0];
          b = vlib_get_buffer (vm, bi[0]);
-         vlib_trace_buffer (vm, node, ni, b, /* follow_chain */ 0);
-         tr = vlib_add_trace (vm, node, b, sizeof (*tr));
-         tr->next_index = ni;
-         tr->hw_if_index = mif->hw_if_index;
-         tr->ring = qid;
+         if (PREDICT_TRUE
+             (vlib_trace_buffer (vm, node, ni, b, /* follow_chain */ 0)))
+           {
+             tr = vlib_add_trace (vm, node, b, sizeof (*tr));
+             tr->next_index = ni;
+             tr->hw_if_index = mif->hw_if_index;
+             tr->ring = qid;
+             n_trace--;
+           }
 
          /* next */
-         n_trace--;
          n_left--;
          bi++;
          next++;
@@ -507,7 +512,7 @@ memif_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,
-                                  mif->hw_if_index, n_rx_packets,
+                                  mif->sw_if_index, n_rx_packets,
                                   n_rx_bytes);
 
   /* refill ring with empty buffers */
@@ -594,7 +599,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       d0 = &ring->desc[s0];
       hb = b0 = vlib_get_buffer (vm, bi0);
       b0->current_data = start_offset;
-      b0->current_length = start_offset + d0->length;
+      b0->current_length = d0->length;
       n_rx_bytes += d0->length;
 
       if (0 && memif_desc_is_invalid (mif, d0, buffer_length))
@@ -617,7 +622,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          /* current buffer */
          b0 = vlib_get_buffer (vm, bi0);
          b0->current_data = start_offset;
-         b0->current_length = start_offset + d0->length;
+         b0->current_length = d0->length;
          hb->total_length_not_including_first_buffer += d0->length;
          n_rx_bytes += d0->length;
 
@@ -770,7 +775,7 @@ memif_device_input_zc_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,
-                                  mif->hw_if_index, n_rx_packets,
+                                  mif->sw_if_index, n_rx_packets,
                                   n_rx_bytes);
 
   /* refill ring with empty buffers */
@@ -923,6 +928,7 @@ VLIB_NODE_FN (memif_input_node) (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (memif_input_node) = {
   .name = "memif-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .sibling_of = "device-input",
   .format_trace = format_memif_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,