memif: wrong interface counter is incremented

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

diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 3471128..82a7cbc 100644 (file)
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -180,12 +180,13 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   memif_main_t *mm = &memif_main;
   memif_ring_t *ring;
   memif_queue_t *mq;
-  u16 buffer_size = VLIB_BUFFER_DATA_SIZE;
+  u16 buffer_size = vlib_buffer_get_default_data_size (vm);
   uword n_trace = vlib_get_trace_count (vm, 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,
@@ -345,6 +346,7 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   ptd->buffer_template.current_data = start_offset;
   ptd->buffer_template.current_config_index = 0;
   ptd->buffer_template.buffer_pool_index = mq->buffer_pool_index;
+  ptd->buffer_template.ref_count = 1;
 
   if (mode == MEMIF_INTERFACE_MODE_ETHERNET)
     {
@@ -363,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);
        }
     }
 
@@ -382,10 +385,11 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
   while (n_from >= 8)
     {
-      b0 = vlib_get_buffer (vm, po[4].first_buffer_vec_index);
-      b1 = vlib_get_buffer (vm, po[5].first_buffer_vec_index);
-      b2 = vlib_get_buffer (vm, po[6].first_buffer_vec_index);
-      b3 = vlib_get_buffer (vm, po[7].first_buffer_vec_index);
+      b0 = vlib_get_buffer (vm, ptd->buffers[po[0].first_buffer_vec_index]);
+      b1 = vlib_get_buffer (vm, ptd->buffers[po[1].first_buffer_vec_index]);
+      b2 = vlib_get_buffer (vm, ptd->buffers[po[2].first_buffer_vec_index]);
+      b3 = vlib_get_buffer (vm, ptd->buffers[po[3].first_buffer_vec_index]);
+
       vlib_prefetch_buffer_header (b0, STORE);
       vlib_prefetch_buffer_header (b1, STORE);
       vlib_prefetch_buffer_header (b2, STORE);
@@ -505,7 +509,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 */
@@ -568,7 +572,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   /* asume that somebody will want to add ethernet header on the packet
      so start with IP header at offset 14 */
   start_offset = (mode == MEMIF_INTERFACE_MODE_IP) ? 14 : 0;
-  buffer_length = VLIB_BUFFER_DATA_SIZE - start_offset;
+  buffer_length = vlib_buffer_get_default_data_size (vm) - start_offset;
 
   cur_slot = mq->last_tail;
   last_slot = ring->tail;
@@ -592,7 +596,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))
@@ -615,7 +619,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;
 
@@ -768,7 +772,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 */
@@ -921,6 +925,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,