X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fnode.c;h=794e6b713bfd40f4196c37f97d9a57c19571a26d;hb=a427690b80003303d2cf6278f512a027ec430d6d;hp=07ce76dc6d5c261f62e294d30b9135a894c3140e;hpb=296988d358cd570247dd8b9b8bd5816a856c3d30;p=vpp.git diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c index 07ce76dc6d5..794e6b713bf 100644 --- a/src/plugins/memif/node.c +++ b/src/plugins/memif/node.c @@ -24,26 +24,27 @@ #include #include #include -#include +#include #include #include #include -#define foreach_memif_input_error \ - _(BUFFER_ALLOC_FAIL, "buffer allocation failed") \ - _(NOT_IP, "not ip packet") +#define foreach_memif_input_error \ + _ (BUFFER_ALLOC_FAIL, buffer_alloc, ERROR, "buffer allocation failed") \ + _ (BAD_DESC, bad_desc, ERROR, "bad descriptor") \ + _ (NOT_IP, not_ip, INFO, "not ip packet") typedef enum { -#define _(f,s) MEMIF_INPUT_ERROR_##f, +#define _(f, n, s, d) MEMIF_INPUT_ERROR_##f, foreach_memif_input_error #undef _ MEMIF_INPUT_N_ERROR, } memif_input_error_t; -static __clib_unused char *memif_input_error_strings[] = { -#define _(n,s) s, +static vlib_error_desc_t memif_input_error_counters[] = { +#define _(f, n, s, d) { #n, d, VL_COUNTER_SEVERITY_##s }, foreach_memif_input_error #undef _ }; @@ -90,12 +91,10 @@ memif_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node, memif_if_t * mif, vlib_buffer_t * b, u32 next, u16 qid, uword * n_tracep) { - 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; @@ -141,39 +140,9 @@ memif_add_to_chain (vlib_main_t * vm, vlib_buffer_t * b, u32 * buffers, } } -static_always_inline u32 -sat_sub (u32 x, u32 y) -{ - u32 res = x - y; - res &= -(res <= x); - return res; -} - -/* branchless validation of the descriptor - uses saturated subtraction */ -static_always_inline u32 -memif_desc_is_invalid (memif_if_t * mif, memif_desc_t * d, u32 buffer_length) -{ - u32 rv; - u16 valid_flags = MEMIF_DESC_FLAG_NEXT; - - rv = d->flags & (~valid_flags); - rv |= sat_sub (d->region + 1, vec_len (mif->regions)); - rv |= sat_sub (d->length, buffer_length); - rv |= sat_sub (d->offset + d->length, mif->regions[d->region].region_size); - - if (PREDICT_FALSE (rv)) - { - mif->flags |= MEMIF_IF_FLAG_ERROR; - return 1; - } - - return 0; -} - static_always_inline uword -memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame, memif_if_t * mif, - memif_ring_type_t type, u16 qid, +memif_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node, + memif_if_t *mif, memif_ring_type_t type, u16 qid, memif_interface_mode_t mode) { vnet_main_t *vnm = vnet_get_main (); @@ -181,11 +150,12 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, memif_ring_t *ring; memif_queue_t *mq; u16 buffer_size = vlib_buffer_get_default_data_size (vm); - uword n_trace = vlib_get_trace_count (vm, node); + uword n_trace; 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, @@ -198,20 +168,26 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, memif_packet_op_t *po; memif_region_index_t last_region = ~0; void *last_region_shm = 0; + void *last_region_max = 0; mq = vec_elt_at_index (mif->rx_queues, qid); ring = mq->ring; ring_size = 1 << mq->log2_ring_size; mask = ring_size - 1; - /* asume that somebody will want to add ethernet header on the packet + /* assume 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; /* for S2M rings, we are consumers of packet buffers, and for M2S rings we are producers of empty buffers */ cur_slot = (type == MEMIF_RING_S2M) ? mq->last_head : mq->last_tail; - last_slot = (type == MEMIF_RING_S2M) ? ring->head : ring->tail; + + if (type == MEMIF_RING_S2M) + last_slot = __atomic_load_n (&ring->head, __ATOMIC_ACQUIRE); + else + last_slot = __atomic_load_n (&ring->tail, __ATOMIC_ACQUIRE); + if (cur_slot == last_slot) goto refill; n_slots = last_slot - cur_slot; @@ -231,8 +207,7 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, dst_off = start_offset; next_slot: - CLIB_PREFETCH (&ring->desc[(cur_slot + 8) & mask], - CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&ring->desc[(cur_slot + 8) & mask]); s0 = cur_slot & mask; d0 = &ring->desc[s0]; n_bytes_left = d0->length; @@ -248,26 +223,31 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { last_region_shm = mif->regions[d0->region].shm; last_region = d0->region; + last_region_max = + last_region_shm + mif->regions[last_region].region_size; } mb0 = last_region_shm + d0->offset; - do - { - u32 dst_free = buffer_size - dst_off; - if (dst_free == 0) - { - dst_off = 0; - dst_free = buffer_size; - n_buffers++; - } - u32 bytes_to_copy = clib_min (dst_free, n_bytes_left); - memif_add_copy_op (ptd, mb0 + src_off, bytes_to_copy, dst_off, - n_buffers - 1); - n_bytes_left -= bytes_to_copy; - src_off += bytes_to_copy; - dst_off += bytes_to_copy; - } - while (PREDICT_FALSE (n_bytes_left)); + if (PREDICT_FALSE (mb0 + n_bytes_left > last_region_max)) + vlib_error_count (vm, node->node_index, MEMIF_INPUT_ERROR_BAD_DESC, 1); + else + do + { + u32 dst_free = buffer_size - dst_off; + if (dst_free == 0) + { + dst_off = 0; + dst_free = buffer_size; + n_buffers++; + } + u32 bytes_to_copy = clib_min (dst_free, n_bytes_left); + memif_add_copy_op (ptd, mb0 + src_off, bytes_to_copy, dst_off, + n_buffers - 1); + n_bytes_left -= bytes_to_copy; + src_off += bytes_to_copy; + dst_off += bytes_to_copy; + } + while (PREDICT_FALSE (n_bytes_left)); cur_slot++; n_slots--; @@ -296,10 +276,10 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, co = ptd->copy_ops; while (n_left >= 8) { - CLIB_PREFETCH (co[4].data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (co[5].data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (co[6].data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (co[7].data, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (co[4].data); + clib_prefetch_load (co[5].data); + clib_prefetch_load (co[6].data); + clib_prefetch_load (co[7].data); b0 = vlib_get_buffer (vm, ptd->buffers[co[0].buffer_vec_index]); b1 = vlib_get_buffer (vm, ptd->buffers[co[1].buffer_vec_index]); @@ -330,8 +310,8 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* release slots from the ring */ if (type == MEMIF_RING_S2M) { - CLIB_MEMORY_STORE_BARRIER (); - ring->tail = mq->last_head = cur_slot; + __atomic_store_n (&ring->tail, cur_slot, __ATOMIC_RELEASE); + mq->last_head = cur_slot; } else { @@ -364,7 +344,7 @@ 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); @@ -384,10 +364,10 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_from >= 8) { - 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]); + b0 = vlib_get_buffer (vm, ptd->buffers[po[4].first_buffer_vec_index]); + b1 = vlib_get_buffer (vm, ptd->buffers[po[5].first_buffer_vec_index]); + b2 = vlib_get_buffer (vm, ptd->buffers[po[6].first_buffer_vec_index]); + b3 = vlib_get_buffer (vm, ptd->buffers[po[7].first_buffer_vec_index]); vlib_prefetch_buffer_header (b0, STORE); vlib_prefetch_buffer_header (b1, STORE); @@ -483,14 +463,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++; @@ -508,7 +491,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 */ @@ -528,17 +511,16 @@ refill: d->length = mif->run.buffer_size; } - CLIB_MEMORY_STORE_BARRIER (); - ring->head = head; + __atomic_store_n (&ring->head, head, __ATOMIC_RELEASE); } return n_rx_packets; } static_always_inline uword -memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame, memif_if_t * mif, - u16 qid, memif_interface_mode_t mode) +memif_device_input_zc_inline (vlib_main_t *vm, vlib_node_runtime_t *node, + memif_if_t *mif, u16 qid, + memif_interface_mode_t mode) { vnet_main_t *vnm = vnet_get_main (); memif_main_t *mm = &memif_main; @@ -549,14 +531,15 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u32 n_rx_packets = 0, n_rx_bytes = 0; u32 *to_next = 0, *buffers; u32 bi0, bi1, bi2, bi3; - u16 s0, s1, s2, s3; - memif_desc_t *d0, *d1, *d2, *d3; + u16 slot, s0; + memif_desc_t *d0; 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, thread_index); u16 cur_slot, last_slot, ring_size, n_slots, mask, head; i16 start_offset; + u64 offset; u32 buffer_length; u16 n_alloc, n_from; @@ -574,7 +557,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node, buffer_length = vlib_buffer_get_default_data_size (vm) - start_offset; cur_slot = mq->last_tail; - last_slot = ring->tail; + last_slot = __atomic_load_n (&ring->tail, __ATOMIC_ACQUIRE); if (cur_slot == last_slot) goto refill; n_slots = last_slot - cur_slot; @@ -590,22 +573,19 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node, bi0 = mq->buffers[s0]; ptd->buffers[n_rx_packets++] = bi0; - CLIB_PREFETCH (&ring->desc[(cur_slot + 8) & mask], - CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&ring->desc[(cur_slot + 8) & mask]); 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)) - return 0; - cur_slot++; n_slots--; if (PREDICT_FALSE ((d0->flags & MEMIF_DESC_FLAG_NEXT) && n_slots)) { hb->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; + hb->total_length_not_including_first_buffer = 0; next_slot: s0 = cur_slot & mask; d0 = &ring->desc[s0]; @@ -618,7 +598,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; @@ -771,7 +751,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 */ @@ -780,86 +760,67 @@ refill: head = ring->head; n_slots = ring_size - head + mq->last_tail; + slot = head & mask; + + n_slots &= ~7; if (n_slots < 32) goto done; - memif_desc_t *dt = &ptd->desc_template; + memif_desc_t desc_template, *dt = &desc_template; clib_memset (dt, 0, sizeof (memif_desc_t)); dt->length = buffer_length; - n_alloc = vlib_buffer_alloc_to_ring_from_pool (vm, mq->buffers, head & mask, - ring_size, n_slots, - mq->buffer_pool_index); + n_alloc = vlib_buffer_alloc_to_ring_from_pool ( + vm, mq->buffers, slot, ring_size, n_slots, mq->buffer_pool_index); + dt->region = mq->buffer_pool_index + 1; + offset = (u64) mif->regions[dt->region].shm - start_offset; if (PREDICT_FALSE (n_alloc != n_slots)) - { - vlib_error_count (vm, node->node_index, - MEMIF_INPUT_ERROR_BUFFER_ALLOC_FAIL, 1); - } + vlib_error_count (vm, node->node_index, + MEMIF_INPUT_ERROR_BUFFER_ALLOC_FAIL, 1); - while (n_alloc >= 32) - { - bi0 = mq->buffers[(head + 4) & mask]; - vlib_prefetch_buffer_with_index (vm, bi0, LOAD); - bi1 = mq->buffers[(head + 5) & mask]; - vlib_prefetch_buffer_with_index (vm, bi1, LOAD); - bi2 = mq->buffers[(head + 6) & mask]; - vlib_prefetch_buffer_with_index (vm, bi2, LOAD); - bi3 = mq->buffers[(head + 7) & mask]; - vlib_prefetch_buffer_with_index (vm, bi3, LOAD); - - s0 = head++ & mask; - s1 = head++ & mask; - s2 = head++ & mask; - s3 = head++ & mask; + head += n_alloc; - d0 = &ring->desc[s0]; - d1 = &ring->desc[s1]; - d2 = &ring->desc[s2]; - d3 = &ring->desc[s3]; - - clib_memcpy_fast (d0, dt, sizeof (memif_desc_t)); - clib_memcpy_fast (d1, dt, sizeof (memif_desc_t)); - clib_memcpy_fast (d2, dt, sizeof (memif_desc_t)); - clib_memcpy_fast (d3, dt, sizeof (memif_desc_t)); - - b0 = vlib_get_buffer (vm, mq->buffers[s0]); - b1 = vlib_get_buffer (vm, mq->buffers[s1]); - b2 = vlib_get_buffer (vm, mq->buffers[s2]); - b3 = vlib_get_buffer (vm, mq->buffers[s3]); - - d0->region = b0->buffer_pool_index + 1; - d1->region = b1->buffer_pool_index + 1; - d2->region = b2->buffer_pool_index + 1; - d3->region = b3->buffer_pool_index + 1; - - d0->offset = - (void *) b0->data - mif->regions[d0->region].shm + start_offset; - d1->offset = - (void *) b1->data - mif->regions[d1->region].shm + start_offset; - d2->offset = - (void *) b2->data - mif->regions[d2->region].shm + start_offset; - d3->offset = - (void *) b3->data - mif->regions[d3->region].shm + start_offset; - - n_alloc -= 4; - } while (n_alloc) { - s0 = head++ & mask; - d0 = &ring->desc[s0]; - clib_memcpy_fast (d0, dt, sizeof (memif_desc_t)); - b0 = vlib_get_buffer (vm, mq->buffers[s0]); - d0->region = b0->buffer_pool_index + 1; - d0->offset = - (void *) b0->data - mif->regions[d0->region].shm + start_offset; - + memif_desc_t *d = ring->desc + slot; + u32 *bi = mq->buffers + slot; + + if (PREDICT_FALSE (((slot + 7 > mask) || (n_alloc < 8)))) + goto one_by_one; + + clib_memcpy_fast (d + 0, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 1, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 2, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 3, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 4, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 5, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 6, dt, sizeof (memif_desc_t)); + clib_memcpy_fast (d + 7, dt, sizeof (memif_desc_t)); + + d[0].offset = (u64) vlib_get_buffer (vm, bi[0])->data - offset; + d[1].offset = (u64) vlib_get_buffer (vm, bi[1])->data - offset; + d[2].offset = (u64) vlib_get_buffer (vm, bi[2])->data - offset; + d[3].offset = (u64) vlib_get_buffer (vm, bi[3])->data - offset; + d[4].offset = (u64) vlib_get_buffer (vm, bi[4])->data - offset; + d[5].offset = (u64) vlib_get_buffer (vm, bi[5])->data - offset; + d[6].offset = (u64) vlib_get_buffer (vm, bi[6])->data - offset; + d[7].offset = (u64) vlib_get_buffer (vm, bi[7])->data - offset; + + slot = (slot + 8) & mask; + n_alloc -= 8; + continue; + + one_by_one: + clib_memcpy_fast (d, dt, sizeof (memif_desc_t)); + d[0].offset = (u64) vlib_get_buffer (vm, bi[0])->data - offset; + + slot = (slot + 1) & mask; n_alloc -= 1; } - CLIB_MEMORY_STORE_BARRIER (); - ring->head = head; + __atomic_store_n (&ring->head, head, __ATOMIC_RELEASE); done: return n_rx_packets; @@ -872,51 +833,49 @@ VLIB_NODE_FN (memif_input_node) (vlib_main_t * vm, { u32 n_rx = 0; memif_main_t *mm = &memif_main; - vnet_device_input_runtime_t *rt = (void *) node->runtime_data; - vnet_device_and_queue_t *dq; memif_interface_mode_t mode_ip = MEMIF_INTERFACE_MODE_IP; memif_interface_mode_t mode_eth = MEMIF_INTERFACE_MODE_ETHERNET; - foreach_device_and_queue (dq, rt->devices_and_queues) - { - memif_if_t *mif; - mif = vec_elt_at_index (mm->interfaces, dq->dev_instance); - if ((mif->flags & MEMIF_IF_FLAG_ADMIN_UP) && - (mif->flags & MEMIF_IF_FLAG_CONNECTED)) - { - if (mif->flags & MEMIF_IF_FLAG_ZERO_COPY) - { - if (mif->mode == MEMIF_INTERFACE_MODE_IP) - n_rx += memif_device_input_zc_inline (vm, node, frame, mif, - dq->queue_id, mode_ip); - else - n_rx += memif_device_input_zc_inline (vm, node, frame, mif, - dq->queue_id, mode_eth); - } - else if (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) - { - if (mif->mode == MEMIF_INTERFACE_MODE_IP) - n_rx += memif_device_input_inline (vm, node, frame, mif, - MEMIF_RING_M2S, dq->queue_id, - mode_ip); - else - n_rx += memif_device_input_inline (vm, node, frame, mif, - MEMIF_RING_M2S, dq->queue_id, - mode_eth); - } - else - { - if (mif->mode == MEMIF_INTERFACE_MODE_IP) - n_rx += memif_device_input_inline (vm, node, frame, mif, - MEMIF_RING_S2M, dq->queue_id, - mode_ip); - else - n_rx += memif_device_input_inline (vm, node, frame, mif, - MEMIF_RING_S2M, dq->queue_id, - mode_eth); - } - } - } + vnet_hw_if_rxq_poll_vector_t *pv; + pv = vnet_hw_if_get_rxq_poll_vector (vm, node); + for (int i = 0; i < vec_len (pv); i++) + { + memif_if_t *mif; + u32 qid; + mif = vec_elt_at_index (mm->interfaces, pv[i].dev_instance); + qid = pv[i].queue_id; + if ((mif->flags & MEMIF_IF_FLAG_ADMIN_UP) && + (mif->flags & MEMIF_IF_FLAG_CONNECTED)) + { + if (mif->flags & MEMIF_IF_FLAG_ZERO_COPY) + { + if (mif->mode == MEMIF_INTERFACE_MODE_IP) + n_rx += + memif_device_input_zc_inline (vm, node, mif, qid, mode_ip); + else + n_rx += + memif_device_input_zc_inline (vm, node, mif, qid, mode_eth); + } + else if (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) + { + if (mif->mode == MEMIF_INTERFACE_MODE_IP) + n_rx += memif_device_input_inline ( + vm, node, mif, MEMIF_RING_M2S, qid, mode_ip); + else + n_rx += memif_device_input_inline ( + vm, node, mif, MEMIF_RING_M2S, qid, mode_eth); + } + else + { + if (mif->mode == MEMIF_INTERFACE_MODE_IP) + n_rx += memif_device_input_inline ( + vm, node, mif, MEMIF_RING_S2M, qid, mode_ip); + else + n_rx += memif_device_input_inline ( + vm, node, mif, MEMIF_RING_S2M, qid, mode_eth); + } + } + } return n_rx; } @@ -924,12 +883,13 @@ 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, .state = VLIB_NODE_STATE_INTERRUPT, .n_errors = MEMIF_INPUT_N_ERROR, - .error_strings = memif_input_error_strings, + .error_counters = memif_input_error_counters, }; /* *INDENT-ON* */