X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Finput.c;h=9d677ab96d56f061c0ff098a7371d277380cfdac;hb=bcaa44ced6fe456835f3f73d184ab2345e39d367;hp=94854af556401aaf55f6625f8ff3b7b9c9357c20;hpb=eb25abdfd8d39261430c73028c11b6a94cacf818;p=vpp.git diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c index 94854af5564..9d677ab96d5 100644 --- a/src/plugins/avf/input.c +++ b/src/plugins/avf/input.c @@ -24,8 +24,7 @@ #include #define foreach_avf_input_error \ - _(BUFFER_ALLOC, "buffer alloc error") \ - _(RX_PACKET_ERROR, "Rx packet errors") + _(BUFFER_ALLOC, "buffer alloc error") typedef enum { @@ -73,7 +72,9 @@ avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq, slot = (rxq->next - n_refill - 1) & mask; n_refill &= ~7; /* round to 8 */ - n_alloc = vlib_buffer_alloc_to_ring (vm, rxq->bufs, slot, size, n_refill); + n_alloc = + vlib_buffer_alloc_to_ring_from_pool (vm, rxq->bufs, slot, size, n_refill, + rxq->buffer_pool_index); if (PREDICT_FALSE (n_alloc != n_refill)) { @@ -124,17 +125,52 @@ avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq, n_alloc -= 8; } - CLIB_MEMORY_STORE_BARRIER (); - *(rxq->qrx_tail) = slot; + clib_atomic_store_rel_n (rxq->qrx_tail, slot); +} + + +static_always_inline uword +avf_rx_attach_tail (vlib_main_t * vm, vlib_buffer_t * bt, vlib_buffer_t * b, + u64 qw1, avf_rx_tail_t * t) +{ + vlib_buffer_t *hb = b; + u32 tlnifb = 0, i = 0; + + if (qw1 & AVF_RXD_STATUS_EOP) + return 0; + + while ((qw1 & AVF_RXD_STATUS_EOP) == 0) + { + ASSERT (i < AVF_RX_MAX_DESC_IN_CHAIN - 1); + ASSERT (qw1 & AVF_RXD_STATUS_DD); + qw1 = t->qw1s[i]; + b->next_buffer = t->buffers[i]; + b->flags |= VLIB_BUFFER_NEXT_PRESENT; + b = vlib_get_buffer (vm, b->next_buffer); + vlib_buffer_copy_template (b, bt); + tlnifb += b->current_length = qw1 >> AVF_RXD_LEN_SHIFT; + i++; + } + + hb->total_length_not_including_first_buffer = tlnifb; + hb->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; + return tlnifb; } static_always_inline uword avf_process_rx_burst (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_buffer_t * bt, u64 * qw1, - vlib_buffer_t ** b, u32 n_left) + avf_per_thread_data_t * ptd, u32 n_left, + int maybe_multiseg) { + vlib_buffer_t bt; + vlib_buffer_t **b = ptd->bufs; + u64 *qw1 = ptd->qw1s; + avf_rx_tail_t *tail = ptd->tails; uword n_rx_bytes = 0; + /* copy template into local variable - will save per packet load */ + vlib_buffer_copy_template (&bt, &ptd->buffer_template); + while (n_left >= 4) { if (n_left >= 12) @@ -145,19 +181,23 @@ avf_process_rx_burst (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_prefetch_buffer_header (b[11], LOAD); } + 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); + n_rx_bytes += b[0]->current_length = qw1[0] >> AVF_RXD_LEN_SHIFT; n_rx_bytes += b[1]->current_length = qw1[1] >> AVF_RXD_LEN_SHIFT; n_rx_bytes += b[2]->current_length = qw1[2] >> AVF_RXD_LEN_SHIFT; n_rx_bytes += b[3]->current_length = qw1[3] >> AVF_RXD_LEN_SHIFT; - clib_memcpy_fast (vnet_buffer (b[0])->sw_if_index, - vnet_buffer (bt)->sw_if_index, 2 * sizeof (u32)); - clib_memcpy_fast (vnet_buffer (b[1])->sw_if_index, - vnet_buffer (bt)->sw_if_index, 2 * sizeof (u32)); - clib_memcpy_fast (vnet_buffer (b[2])->sw_if_index, - vnet_buffer (bt)->sw_if_index, 2 * sizeof (u32)); - clib_memcpy_fast (vnet_buffer (b[3])->sw_if_index, - vnet_buffer (bt)->sw_if_index, 2 * sizeof (u32)); + if (maybe_multiseg) + { + n_rx_bytes += avf_rx_attach_tail (vm, &bt, b[0], qw1[0], tail + 0); + n_rx_bytes += avf_rx_attach_tail (vm, &bt, b[1], qw1[1], tail + 1); + n_rx_bytes += avf_rx_attach_tail (vm, &bt, b[2], qw1[2], tail + 2); + n_rx_bytes += avf_rx_attach_tail (vm, &bt, b[3], qw1[3], tail + 3); + } VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[1]); @@ -166,20 +206,24 @@ avf_process_rx_burst (vlib_main_t * vm, vlib_node_runtime_t * node, /* next */ qw1 += 4; + tail += 4; b += 4; n_left -= 4; } while (n_left) { + vlib_buffer_copy_template (b[0], &bt); + n_rx_bytes += b[0]->current_length = qw1[0] >> AVF_RXD_LEN_SHIFT; - clib_memcpy_fast (vnet_buffer (b[0])->sw_if_index, - vnet_buffer (bt)->sw_if_index, 2 * sizeof (u32)); + if (maybe_multiseg) + n_rx_bytes += avf_rx_attach_tail (vm, &bt, b[0], qw1[0], tail + 0); VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); /* next */ qw1 += 1; + tail += 1; b += 1; n_left -= 1; } @@ -197,13 +241,11 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vec_elt_at_index (am->per_thread_data, thr_idx); avf_rxq_t *rxq = vec_elt_at_index (ad->rxqs, qid); u32 n_trace, n_rx_packets = 0, n_rx_bytes = 0; - u16 n_desc = 0; + u16 n_tail_desc = 0; u64 or_qw1 = 0; u32 *bi, *to_next, n_left_to_next; - vlib_buffer_t *bufs[AVF_RX_VECTOR_SZ]; vlib_buffer_t *bt = &ptd->buffer_template; u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT; - u64 qw1s[AVF_RX_VECTOR_SZ]; u16 next = rxq->next; u16 size = rxq->size; u16 mask = size - 1; @@ -220,13 +262,17 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE (ad->per_interface_next_index != ~0)) next_index = ad->per_interface_next_index; + + if (PREDICT_FALSE (vnet_device_input_have_features (ad->sw_if_index))) + vnet_feature_start_device_input_x1 (ad->sw_if_index, &next_index, bt); + vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next); /* fetch up to AVF_RX_VECTOR_SZ from the rx ring, unflatten them and copy needed data from descriptor to rx vector */ bi = to_next; - while (n_desc < AVF_RX_VECTOR_SZ) + while (n_rx_packets < AVF_RX_VECTOR_SZ) { if (next + 11 < size) { @@ -242,7 +288,7 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } #ifdef CLIB_HAVE_VEC256 - if (n_desc >= AVF_RX_VECTOR_SZ - 4 || next >= size - 4) + if (n_rx_packets >= AVF_RX_VECTOR_SZ - 4 || next >= size - 4) goto one_by_one; q1x4 = u64x4_gather ((void *) &d[0].qword[1], (void *) &d[1].qword[1], @@ -253,68 +299,88 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, goto one_by_one; or_q1x4 |= q1x4; - u64x4_store_unaligned (q1x4, qw1s + n_desc); - clib_memcpy_fast (bi, rxq->bufs + next, 4 * sizeof (u32)); + u64x4_store_unaligned (q1x4, ptd->qw1s + n_rx_packets); + vlib_buffer_copy_indices (bi, rxq->bufs + next, 4); /* next */ next = (next + 4) & mask; d = fd + next; - n_desc += 4; + n_rx_packets += 4; bi += 4; continue; one_by_one: #endif CLIB_PREFETCH ((void *) (fd + ((next + 8) & mask)), CLIB_CACHE_LINE_BYTES, LOAD); - if ((d->qword[1] & AVF_RXD_STATUS_DD) == 0) + + if (avf_rxd_is_not_dd (d)) break; - or_qw1 |= qw1s[n_desc] = d[0].qword[1]; bi[0] = rxq->bufs[next]; /* deal with chained buffers */ - while (PREDICT_FALSE ((d->qword[1] & AVF_RXD_STATUS_EOP) == 0)) + if (PREDICT_FALSE (avf_rxd_is_not_eop (d))) { - clib_error ("fixme"); + u16 tail_desc = 0; + u16 tail_next = next; + avf_rx_tail_t *tail = ptd->tails + n_rx_packets; + avf_rx_desc_t *td; + do + { + tail_next = (tail_next + 1) & mask; + td = fd + tail_next; + + /* bail out in case of incomplete transaction */ + if (avf_rxd_is_not_dd (td)) + goto no_more_desc; + + or_qw1 |= tail->qw1s[tail_desc] = td[0].qword[1]; + tail->buffers[tail_desc] = rxq->bufs[tail_next]; + tail_desc++; + } + while (avf_rxd_is_not_eop (td)); + next = tail_next; + n_tail_desc += tail_desc; } + or_qw1 |= ptd->qw1s[n_rx_packets] = d[0].qword[1]; + /* next */ next = (next + 1) & mask; d = fd + next; - n_desc++; + n_rx_packets++; bi++; } +no_more_desc: - if (n_desc == 0) + if (n_rx_packets == 0) goto done; rxq->next = next; - rxq->n_enqueued -= n_desc; + rxq->n_enqueued -= n_rx_packets + n_tail_desc; #ifdef CLIB_HAVE_VEC256 or_qw1 |= or_q1x4[0] | or_q1x4[1] | or_q1x4[2] | or_q1x4[3]; #endif - /* refill rx ring */ - if (ad->flags & AVF_DEVICE_F_VA_DMA) - avf_rxq_refill (vm, node, rxq, 1 /* use_va_dma */ ); - else - avf_rxq_refill (vm, node, rxq, 0 /* use_va_dma */ ); - - vlib_get_buffers (vm, to_next, bufs, n_desc); - n_rx_packets = n_desc; + vlib_get_buffers (vm, to_next, ptd->bufs, n_rx_packets); vnet_buffer (bt)->sw_if_index[VLIB_RX] = ad->sw_if_index; vnet_buffer (bt)->sw_if_index[VLIB_TX] = ~0; + bt->buffer_pool_index = rxq->buffer_pool_index; + bt->ref_count = 1; - n_rx_bytes = avf_process_rx_burst (vm, node, bt, qw1s, bufs, n_desc); + if (n_tail_desc) + n_rx_bytes = avf_process_rx_burst (vm, node, ptd, n_rx_packets, 1); + else + n_rx_bytes = avf_process_rx_burst (vm, node, ptd, n_rx_packets, 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 = n_rx_packets, i = 0, j; bi = to_next; - u64 *qw1 = qw1s; + while (n_trace && n_left) { vlib_buffer_t *b; @@ -323,14 +389,17 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_trace_buffer (vm, node, next_index, b, /* follow_chain */ 0); tr = vlib_add_trace (vm, node, b, sizeof (*tr)); tr->next_index = next_index; + tr->qid = qid; tr->hw_if_index = ad->hw_if_index; - tr->qw1 = qw1[0]; + tr->qw1s[0] = ptd->qw1s[i]; + for (j = 1; j < AVF_RX_MAX_DESC_IN_CHAIN; j++) + tr->qw1s[j] = ptd->tails[i].qw1s[j - 1]; /* next */ n_trace--; n_left--; bi++; - qw1++; + i++; } vlib_set_trace_count (vm, node, n_trace); } @@ -341,7 +410,7 @@ avf_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); @@ -350,6 +419,7 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if ((or_qw1 & AVF_RXD_ERROR_IPE) == 0) f->flags |= ETH_INPUT_FRAME_F_IP4_CKSUM_OK; + vlib_frame_no_append (f); } n_left_to_next -= n_rx_packets; @@ -360,6 +430,12 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, ad->hw_if_index, n_rx_packets, n_rx_bytes); done: + /* refill rx ring */ + if (ad->flags & AVF_DEVICE_F_VA_DMA) + avf_rxq_refill (vm, node, rxq, 1 /* use_va_dma */ ); + else + avf_rxq_refill (vm, node, rxq, 0 /* use_va_dma */ ); + return n_rx_packets; } @@ -367,14 +443,13 @@ VLIB_NODE_FN (avf_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { u32 n_rx = 0; - avf_main_t *am = &avf_main; vnet_device_input_runtime_t *rt = (void *) node->runtime_data; vnet_device_and_queue_t *dq; foreach_device_and_queue (dq, rt->devices_and_queues) { avf_device_t *ad; - ad = vec_elt_at_index (am->devices, dq->dev_instance); + ad = avf_get_device (dq->dev_instance); if ((ad->flags & AVF_DEVICE_F_ADMIN_UP) == 0) continue; n_rx += avf_device_input_inline (vm, node, frame, ad, dq->queue_id); @@ -391,6 +466,7 @@ VLIB_REGISTER_NODE (avf_input_node) = { .state = VLIB_NODE_STATE_DISABLED, .n_errors = AVF_INPUT_N_ERROR, .error_strings = avf_input_error_strings, + .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, }; /* *INDENT-ON* */