X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fnode.c;h=5abd20abc35cf668f1ef791171775bd1e9e65856;hb=fc025725b895057d16687ebcab22d1bbb0837cba;hp=490c60356db47eb076b613661e25e952fde8dc51;hpb=e58041f242bf4bd120ecc9619b88348d80b94c17;p=vpp.git diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c index 490c60356db..5abd20abc35 100644 --- a/src/plugins/memif/node.c +++ b/src/plugins/memif/node.c @@ -24,26 +24,29 @@ #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 MEMIF_IP_OFFSET 14 + +#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 +93,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,249 +142,252 @@ memif_add_to_chain (vlib_main_t * vm, vlib_buffer_t * b, u32 * buffers, } } -static_always_inline u32 -sat_sub (u32 x, u32 y) +static_always_inline u16 +memif_parse_desc (memif_per_thread_data_t *ptd, memif_if_t *mif, + memif_queue_t *mq, u16 next, u16 n_avail) { - u32 res = x - y; - res &= -(res <= x); - return res; + memif_ring_t *ring = mq->ring; + memif_desc_t *descs = ring->desc; + void **desc_data = ptd->desc_data; + u16 *desc_len = ptd->desc_len; + memif_desc_status_t *desc_status = ptd->desc_status; + u16 n_desc = 0, n_pkts = 0; + u32 i = 0; + u16 mask = pow2_mask (mq->log2_ring_size); + memif_desc_t *d = 0; + u32 slot = next; + + while (i < n_avail) + { + u8 flags; + d = descs + (slot++ & mask); + desc_data[i] = (void *) ((u64) d->region << 32 | d->offset); + desc_len[i] = d->length; + desc_status[i].as_u8 = flags = d->flags; + i++; + if (PREDICT_FALSE ((flags & MEMIF_DESC_FLAG_NEXT)) == 0) + { + n_desc = i; + if (++n_pkts == MEMIF_RX_VECTOR_SZ) + goto frame_full; + } + } +frame_full: + + /* done */ + ptd->n_packets = n_pkts; + return n_desc; } -/* 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) +static_always_inline void +memif_desc_status_set_err (memif_desc_status_t *p, + memif_desc_status_err_code_t e) { - 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); + memif_desc_status_t s = { .err = 1, .err_code = e }; + p->as_u8 |= s.as_u8; +} - if (PREDICT_FALSE (rv)) +static_always_inline void +memif_validate_desc_data (memif_per_thread_data_t *ptd, memif_if_t *mif, + u16 n_desc, int is_ethernet) +{ + void **desc_data = ptd->desc_data; + u16 *desc_len = ptd->desc_len; + memif_desc_status_t *desc_status = ptd->desc_status; + u16 n_regions = vec_len (mif->regions); + u32 n_rx_bytes = 0; + u16 max_len = 0; + u8 xor_status = 0; + + for (u32 i = 0; i < n_desc; i++) { - mif->flags |= MEMIF_IF_FLAG_ERROR; - return 1; + u16 region = ((u64) desc_data[i]) >> 32; + u32 offset = (u64) desc_data[i]; + u16 len = desc_len[i]; + memif_region_t *r = mif->regions + region; + + if (region >= n_regions) + memif_desc_status_set_err (desc_status + i, + MEMIF_DESC_STATUS_ERR_BAD_REGION); + else if (offset + len > r->region_size) + memif_desc_status_set_err (desc_status + i, + MEMIF_DESC_STATUS_ERR_REGION_OVERRUN); + else if (is_ethernet && len > ETHERNET_MAX_PACKET_BYTES) + memif_desc_status_set_err (desc_status + i, + MEMIF_DESC_STATUS_ERR_DATA_TOO_BIG); + else if (len == 0) + memif_desc_status_set_err (desc_status + i, + MEMIF_DESC_STATUS_ERR_ZERO_LENGTH); + else + { + desc_data[i] = r->shm + offset; + if (len > max_len) + max_len = len; + n_rx_bytes += len; + } + xor_status |= desc_status[i].as_u8; } - return 0; + ptd->max_desc_len = max_len; + ptd->xor_status = xor_status; + ptd->n_rx_bytes = n_rx_bytes; } -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_interface_mode_t mode) +static_always_inline u32 +memif_process_desc (vlib_main_t *vm, vlib_node_runtime_t *node, + memif_per_thread_data_t *ptd, memif_if_t *mif) { - vnet_main_t *vnm = vnet_get_main (); - memif_main_t *mm = &memif_main; - memif_ring_t *ring; - memif_queue_t *mq; - u16 buffer_size = VLIB_BUFFER_DATA_SIZE; - 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; - 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); - vlib_buffer_t bt; - u16 cur_slot, last_slot, ring_size, n_slots, mask; - i16 start_offset; - u16 n_buffers = 0, n_alloc; - memif_copy_op_t *co; - memif_packet_op_t *po; - memif_region_index_t last_region = ~0; - void *last_region_shm = 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 - 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 (cur_slot == last_slot) - goto refill; - n_slots = last_slot - cur_slot; + u16 buffer_size = vlib_buffer_get_default_data_size (vm); + int is_ip = mif->mode == MEMIF_INTERFACE_MODE_IP; + i16 start_offset = (is_ip) ? MEMIF_IP_OFFSET : 0; + memif_packet_op_t *po = ptd->packet_ops; + void **desc_data = ptd->desc_data; + u16 *desc_len = ptd->desc_len; + memif_desc_status_t *desc_status = ptd->desc_status; + u32 n_buffers = 0; + u32 n_left = ptd->n_packets; + u32 packet_len; + int i = -1; /* construct copy and packet vector out of ring slots */ - while (n_slots && n_rx_packets < MEMIF_RX_VECTOR_SZ) + while (n_left) { u32 dst_off, src_off, n_bytes_left; - u16 s0; - memif_desc_t *d0; void *mb0; - po = ptd->packet_ops + n_rx_packets; - n_rx_packets++; po->first_buffer_vec_index = n_buffers++; - po->packet_len = 0; + + packet_len = 0; src_off = 0; dst_off = start_offset; next_slot: - CLIB_PREFETCH (&ring->desc[(cur_slot + 8) & mask], - CLIB_CACHE_LINE_BYTES, LOAD); - s0 = cur_slot & mask; - d0 = &ring->desc[s0]; - n_bytes_left = d0->length; - - /* slave resets buffer length, - * so it can produce full size buffer for master - */ - if (type == MEMIF_RING_M2S) - d0->length = mif->run.buffer_size; + i++; /* next descriptor */ + n_bytes_left = desc_len[i]; - po->packet_len += n_bytes_left; - if (PREDICT_FALSE (last_region != d0->region)) - { - last_region_shm = mif->regions[d0->region].shm; - last_region = d0->region; - } - mb0 = last_region_shm + d0->offset; + packet_len += n_bytes_left; + mb0 = desc_data[i]; - 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 (desc_status[i].err)) + 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--; - if ((d0->flags & MEMIF_DESC_FLAG_NEXT) && n_slots) + if (desc_status[i].next) { src_off = 0; goto next_slot; } - } - /* allocate free buffers */ - vec_validate_aligned (ptd->buffers, n_buffers - 1, CLIB_CACHE_LINE_BYTES); - n_alloc = vlib_buffer_alloc (vm, ptd->buffers, n_buffers); - if (PREDICT_FALSE (n_alloc != n_buffers)) - { - if (n_alloc) - vlib_buffer_free (vm, ptd->buffers, n_alloc); - vlib_error_count (vm, node->node_index, - MEMIF_INPUT_ERROR_BUFFER_ALLOC_FAIL, 1); - goto refill; + /* update packet op */ + po->packet_len = packet_len; + po++; + + /* next packet */ + n_left--; } + return n_buffers; +} +static_always_inline void +memif_fill_buffer_mdata_simple (vlib_node_runtime_t *node, + memif_per_thread_data_t *ptd, + vlib_buffer_t **b, u16 *next, int is_ip) +{ + vlib_buffer_t bt; + u16 *dl = ptd->desc_len; + /* process buffer metadata */ + + u32 n_left = ptd->n_packets; + + /* copy template into local variable - will save per packet load */ + vlib_buffer_copy_template (&bt, &ptd->buffer_template); - /* copy data */ - n_left = vec_len (ptd->copy_ops); - 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); - - b0 = vlib_get_buffer (vm, ptd->buffers[co[0].buffer_vec_index]); - b1 = vlib_get_buffer (vm, ptd->buffers[co[1].buffer_vec_index]); - b2 = vlib_get_buffer (vm, ptd->buffers[co[2].buffer_vec_index]); - b3 = vlib_get_buffer (vm, ptd->buffers[co[3].buffer_vec_index]); - - clib_memcpy_fast (b0->data + co[0].buffer_offset, co[0].data, - co[0].data_len); - clib_memcpy_fast (b1->data + co[1].buffer_offset, co[1].data, - co[1].data_len); - clib_memcpy_fast (b2->data + co[2].buffer_offset, co[2].data, - co[2].data_len); - clib_memcpy_fast (b3->data + co[3].buffer_offset, co[3].data, - co[3].data_len); - - co += 4; - n_left -= 4; - } - while (n_left) - { - b0 = vlib_get_buffer (vm, ptd->buffers[co[0].buffer_vec_index]); - clib_memcpy_fast (b0->data + co[0].buffer_offset, co[0].data, - co[0].data_len); - co += 1; - n_left -= 1; - } + vlib_prefetch_buffer_header (b[4], STORE); + vlib_prefetch_buffer_header (b[5], STORE); + vlib_prefetch_buffer_header (b[6], STORE); + vlib_prefetch_buffer_header (b[7], STORE); + + vlib_buffer_copy_template (b[0], &bt); + vlib_buffer_copy_template (b[1], &bt); + vlib_buffer_copy_template (b[2], &bt); + vlib_buffer_copy_template (b[3], &bt); + + b[0]->current_length = dl[0]; + b[1]->current_length = dl[1]; + b[2]->current_length = dl[2]; + b[3]->current_length = dl[3]; + + if (is_ip) + { + next[0] = memif_next_from_ip_hdr (node, b[0]); + next[1] = memif_next_from_ip_hdr (node, b[1]); + next[2] = memif_next_from_ip_hdr (node, b[2]); + next[3] = memif_next_from_ip_hdr (node, b[3]); + } - /* release slots from the ring */ - if (type == MEMIF_RING_S2M) - { - CLIB_MEMORY_STORE_BARRIER (); - ring->tail = mq->last_head = cur_slot; - } - else - { - mq->last_tail = cur_slot; + /* next */ + n_left -= 4; + b += 4; + dl += 4; + next += 4; } - /* prepare buffer template and next indices */ - vnet_buffer (&ptd->buffer_template)->sw_if_index[VLIB_RX] = - mif->sw_if_index; - vnet_buffer (&ptd->buffer_template)->feature_arc_index = 0; - ptd->buffer_template.current_data = start_offset; - ptd->buffer_template.current_config_index = 0; - - if (mode == MEMIF_INTERFACE_MODE_ETHERNET) + while (n_left) { - next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT; - if (mif->per_interface_next_index != ~0) - next_index = mif->per_interface_next_index; - else - vnet_feature_start_device_input_x1 (mif->sw_if_index, &next_index, - &ptd->buffer_template); - - vlib_get_new_next_frame (vm, node, next_index, to_next_bufs, - n_left_to_next); - if (PREDICT_TRUE (next_index == VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT)) - { - vlib_next_frame_t *nf; - 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->flags = ETH_INPUT_FRAME_F_SINGLE_SW_IF_IDX; + /* enqueue buffer */ + vlib_buffer_copy_template (b[0], &bt); + b[0]->current_length = dl[0]; + if (is_ip) + next[0] = memif_next_from_ip_hdr (node, b[0]); - ef = vlib_frame_scalar_args (f); - ef->sw_if_index = mif->sw_if_index; - ef->hw_if_index = mif->hw_if_index; - } + /* next */ + n_left -= 1; + b += 1; + dl += 1; + next += 1; } +} +static_always_inline void +memif_fill_buffer_mdata (vlib_main_t *vm, vlib_node_runtime_t *node, + memif_per_thread_data_t *ptd, memif_if_t *mif, + u32 *bi, u16 *next, int is_ip) +{ + u16 buffer_size = vlib_buffer_get_default_data_size (vm); + vlib_buffer_t *b0, *b1, *b2, *b3, bt; + memif_packet_op_t *po; /* process buffer metadata */ - u32 n_from = n_rx_packets; + + u32 n_from = ptd->n_packets; po = ptd->packet_ops; - bi = to_next_bufs; /* copy template into local variable - will save per packet load */ vlib_buffer_copy_template (&bt, &ptd->buffer_template); 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[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); vlib_prefetch_buffer_header (b2, STORE); @@ -412,20 +416,16 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_copy_template (b3, &bt); b0->current_length = po[0].packet_len; - n_rx_bytes += b0->current_length; b1->current_length = po[1].packet_len; - n_rx_bytes += b1->current_length; b2->current_length = po[2].packet_len; - n_rx_bytes += b2->current_length; b3->current_length = po[3].packet_len; - n_rx_bytes += b3->current_length; memif_add_to_chain (vm, b0, ptd->buffers + fbvi[0] + 1, buffer_size); memif_add_to_chain (vm, b1, ptd->buffers + fbvi[1] + 1, buffer_size); memif_add_to_chain (vm, b2, ptd->buffers + fbvi[2] + 1, buffer_size); memif_add_to_chain (vm, b3, ptd->buffers + fbvi[3] + 1, buffer_size); - if (mode == MEMIF_INTERFACE_MODE_IP) + if (is_ip) { next[0] = memif_next_from_ip_hdr (node, b0); next[1] = memif_next_from_ip_hdr (node, b1); @@ -441,21 +441,18 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } while (n_from) { - u32 fbvi[4]; + u32 fbvi[1]; /* enqueue buffer */ fbvi[0] = po[0].first_buffer_vec_index; bi[0] = ptd->buffers[fbvi[0]]; b0 = vlib_get_buffer (vm, bi[0]); vlib_buffer_copy_template (b0, &bt); b0->current_length = po->packet_len; - n_rx_bytes += b0->current_length; memif_add_to_chain (vm, b0, ptd->buffers + fbvi[0] + 1, buffer_size); - if (mode == MEMIF_INTERFACE_MODE_IP) - { - next[0] = memif_next_from_ip_hdr (node, b0); - } + if (is_ip) + next[0] = memif_next_from_ip_hdr (node, b0); /* next */ n_from -= 1; @@ -463,11 +460,199 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, bi += 1; next += 1; } +} + +static_always_inline uword +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 (); + memif_main_t *mm = &memif_main; + memif_ring_t *ring; + memif_queue_t *mq; + u16 buffer_size = vlib_buffer_get_default_data_size (vm); + 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_left_to_next; + u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT; + vlib_buffer_t *buffer_ptrs[MEMIF_RX_VECTOR_SZ]; + 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, ring_size, n_slots, mask; + u16 n_buffers, n_alloc, n_desc; + i16 start_offset; + memif_copy_op_t *co; + int is_slave = (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) != 0; + int is_simple = 1; + int i; + + mq = vec_elt_at_index (mif->rx_queues, qid); + ring = mq->ring; + ring_size = 1 << mq->log2_ring_size; + mask = ring_size - 1; + + start_offset = (mode == MEMIF_INTERFACE_MODE_IP) ? MEMIF_IP_OFFSET : 0; + + if (is_slave) + { + cur_slot = mq->last_tail; + n_slots = __atomic_load_n (&ring->tail, __ATOMIC_ACQUIRE) - cur_slot; + } + else + { + cur_slot = mq->last_head; + n_slots = __atomic_load_n (&ring->head, __ATOMIC_ACQUIRE) - cur_slot; + } + + if (n_slots == 0) + goto refill; + + n_desc = memif_parse_desc (ptd, mif, mq, cur_slot, n_slots); + + if (n_desc != ptd->n_packets) + is_simple = 0; + + cur_slot += n_desc; + + if (mif->mode == MEMIF_INTERFACE_MODE_ETHERNET) + memif_validate_desc_data (ptd, mif, n_desc, /* is_ethernet */ 1); + else + memif_validate_desc_data (ptd, mif, n_desc, /* is_ethernet */ 0); + + if (ptd->max_desc_len > buffer_size - start_offset) + is_simple = 0; + + if (ptd->xor_status != 0) + is_simple = 0; + + if (is_simple) + n_buffers = ptd->n_packets; + else + n_buffers = memif_process_desc (vm, node, ptd, mif); + + /* allocate free buffers */ + vec_validate_aligned (ptd->buffers, n_buffers - 1, CLIB_CACHE_LINE_BYTES); + n_alloc = vlib_buffer_alloc_from_pool (vm, ptd->buffers, n_buffers, + mq->buffer_pool_index); + if (PREDICT_FALSE (n_alloc != n_buffers)) + { + if (n_alloc) + vlib_buffer_free (vm, ptd->buffers, n_alloc); + vlib_error_count (vm, node->node_index, + MEMIF_INPUT_ERROR_BUFFER_ALLOC_FAIL, 1); + goto refill; + } + + /* copy data */ + if (is_simple) + { + int n_pkts = ptd->n_packets; + void **desc_data = ptd->desc_data; + u16 *desc_len = ptd->desc_len; + + vlib_get_buffers (vm, ptd->buffers, buffer_ptrs, n_buffers); + + for (i = 0; i + 8 < n_pkts; i++) + { + clib_prefetch_load (desc_data[i + 8]); + clib_prefetch_store (buffer_ptrs[i + 8]->data); + clib_memcpy_fast (buffer_ptrs[i]->data + start_offset, desc_data[i], + desc_len[i]); + } + for (; i < n_pkts; i++) + clib_memcpy_fast (buffer_ptrs[i]->data + start_offset, desc_data[i], + desc_len[i]); + } + else + { + vlib_buffer_t *b; + u32 n_pkts = vec_len (ptd->copy_ops); + co = ptd->copy_ops; + + for (i = 0; i + 8 < n_pkts; i++) + { + clib_prefetch_load (co[i + 8].data); + b = vlib_get_buffer (vm, ptd->buffers[co[i].buffer_vec_index]); + clib_memcpy_fast (b->data + co[i].buffer_offset, co[i].data, + co[i].data_len); + } + for (; i < n_pkts; i++) + { + b = vlib_get_buffer (vm, ptd->buffers[co[i].buffer_vec_index]); + clib_memcpy_fast (b->data + co[i].buffer_offset, co[i].data, + co[i].data_len); + } + } + + /* release slots from the ring */ + if (type == MEMIF_RING_S2M) + { + __atomic_store_n (&ring->tail, cur_slot, __ATOMIC_RELEASE); + mq->last_head = cur_slot; + } + else + { + mq->last_tail = cur_slot; + } + + /* prepare buffer template and next indices */ + vnet_buffer (&ptd->buffer_template)->sw_if_index[VLIB_RX] = mif->sw_if_index; + vnet_buffer (&ptd->buffer_template)->feature_arc_index = 0; + 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) + { + next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT; + if (mif->per_interface_next_index != ~0) + next_index = mif->per_interface_next_index; + else + vnet_feature_start_device_input_x1 (mif->sw_if_index, &next_index, + &ptd->buffer_template); + + vlib_get_new_next_frame (vm, node, next_index, to_next_bufs, + n_left_to_next); + if (PREDICT_TRUE (next_index == VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT)) + { + vlib_next_frame_t *nf; + 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); + 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); + } + } + + if (is_simple) + { + vlib_buffer_copy_indices (to_next_bufs, ptd->buffers, ptd->n_packets); + if (mode == MEMIF_INTERFACE_MODE_IP) + memif_fill_buffer_mdata_simple (node, ptd, buffer_ptrs, nexts, 1); + else + memif_fill_buffer_mdata_simple (node, ptd, buffer_ptrs, nexts, 0); + } + else + { + if (mode == MEMIF_INTERFACE_MODE_IP) + memif_fill_buffer_mdata (vm, node, ptd, mif, to_next_bufs, nexts, 1); + else + memif_fill_buffer_mdata (vm, node, ptd, mif, to_next_bufs, nexts, 0); + } /* packet trace if enabled */ if (PREDICT_FALSE ((n_trace = vlib_get_trace_count (vm, node)))) { - u32 n_left = n_rx_packets; + u32 n_left = ptd->n_packets; bi = to_next_bufs; next = nexts; u32 ni = next_index; @@ -478,14 +663,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++; @@ -495,16 +683,16 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (mode == MEMIF_INTERFACE_MODE_ETHERNET) { - n_left_to_next -= n_rx_packets; + n_left_to_next -= ptd->n_packets; vlib_put_next_frame (vm, node, next_index, n_left_to_next); } else - vlib_buffer_enqueue_to_next (vm, node, to_next_bufs, nexts, n_rx_packets); + vlib_buffer_enqueue_to_next (vm, node, to_next_bufs, nexts, + ptd->n_packets); - vlib_increment_combined_counter (vnm->interface_main.combined_sw_if_counters - + VNET_INTERFACE_COUNTER_RX, thread_index, - mif->hw_if_index, n_rx_packets, - n_rx_bytes); + vlib_increment_combined_counter ( + vnm->interface_main.combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX, + thread_index, mif->sw_if_index, ptd->n_packets, ptd->n_rx_bytes); /* refill ring with empty buffers */ refill: @@ -523,17 +711,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; + return ptd->n_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; @@ -544,14 +731,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; @@ -566,10 +754,10 @@ 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; + last_slot = __atomic_load_n (&ring->tail, __ATOMIC_ACQUIRE); if (cur_slot == last_slot) goto refill; n_slots = last_slot - cur_slot; @@ -585,22 +773,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]; @@ -613,7 +798,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; @@ -766,7 +951,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 */ @@ -775,85 +960,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 (vm, mq->buffers, head & mask, - ring_size, n_slots); + 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; @@ -866,51 +1033,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; } @@ -918,12 +1083,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* */