X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.c;h=a19bbb867c34be8fccfcbb702dee6094cc4abfa3;hb=d7c030d6065962b433416c679f3b568b096b49e2;hp=f9490f34f6a8ec15c30f4bac0c2d5bdcb649d1fa;hpb=698eb87a8eed847fe555ef327bcc99a4467ed59a;p=vpp.git diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index f9490f34f6a..a19bbb867c3 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -39,12 +39,19 @@ #include #include +#include +#include #include #include #include #include -#include +#include +#include #include +#include +#include +#include +#include typedef struct { @@ -89,6 +96,7 @@ format_vnet_interface_output_trace (u8 * s, va_list * va) } return s; } +#endif /* CLIB_MARCH_VARIANT */ static void vnet_interface_output_trace (vlib_main_t * vm, @@ -159,353 +167,522 @@ vnet_interface_output_trace (vlib_main_t * vm, } } -static_always_inline uword -vnet_interface_output_node_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, - vnet_main_t * vnm, - vnet_hw_interface_t * hi, - int do_tx_offloads) +static_always_inline void +vnet_interface_output_handle_offload (vlib_main_t *vm, vlib_buffer_t *b) { - vnet_interface_output_runtime_t *rt = (void *) node->runtime_data; - vnet_sw_interface_t *si; - u32 n_left_to_tx, *from, *from_end, *to_tx; - u32 n_bytes, n_buffers, n_packets; - u32 n_bytes_b0, n_bytes_b1, n_bytes_b2, n_bytes_b3; - u32 thread_index = vm->thread_index; - vnet_interface_main_t *im = &vnm->interface_main; - u32 next_index = VNET_INTERFACE_OUTPUT_NEXT_TX; - u32 current_config_index = ~0; - u8 arc = im->output_feature_arc_index; - vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs; - - n_buffers = frame->n_vectors; - - if (node->flags & VLIB_NODE_FLAG_TRACE) - vnet_interface_output_trace (vm, node, frame, n_buffers); - - from = vlib_frame_vector_args (frame); - vlib_get_buffers (vm, from, b, n_buffers); - - if (rt->is_deleted) - return vlib_error_drop_buffers (vm, node, from, - /* buffer stride */ 1, - n_buffers, - VNET_INTERFACE_OUTPUT_NEXT_DROP, - node->node_index, - VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED); - - si = vnet_get_sw_interface (vnm, rt->sw_if_index); - hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index); - if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) || - !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP)) - { - vlib_simple_counter_main_t *cm; - - cm = vec_elt_at_index (vnm->interface_main.sw_if_counters, - VNET_INTERFACE_COUNTER_TX_ERROR); - vlib_increment_simple_counter (cm, thread_index, - rt->sw_if_index, n_buffers); - - return vlib_error_drop_buffers (vm, node, from, - /* buffer stride */ 1, - n_buffers, - VNET_INTERFACE_OUTPUT_NEXT_DROP, - node->node_index, - VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN); - } - - from_end = from + n_buffers; + if (b->flags & VNET_BUFFER_F_GSO) + return; + vnet_calc_checksums_inline (vm, b, b->flags & VNET_BUFFER_F_IS_IP4, + b->flags & VNET_BUFFER_F_IS_IP6); + vnet_calc_outer_checksums_inline (vm, b); +} - /* Total byte count of all buffers. */ - n_bytes = 0; - n_packets = 0; +static_always_inline uword +vnet_interface_output_node_inline (vlib_main_t *vm, u32 sw_if_index, + vlib_combined_counter_main_t *ccm, + vlib_buffer_t **b, void **p, + u32 config_index, u8 arc, u32 n_left, + int processing_level) +{ + u32 n_bytes = 0; + u32 n_bytes0, n_bytes1, n_bytes2, n_bytes3; + u32 ti = vm->thread_index; - /* interface-output feature arc handling */ - if (PREDICT_FALSE (vnet_have_features (arc, rt->sw_if_index))) + while (n_left >= 8) { - vnet_feature_config_main_t *fcm; - fcm = vnet_feature_get_config_main (arc); - current_config_index = vnet_get_feature_config_index (arc, - rt->sw_if_index); - vnet_get_config_data (&fcm->config_main, ¤t_config_index, - &next_index, 0); - } + u32 or_flags; - while (from < from_end) - { - /* Get new next frame since previous incomplete frame may have less - than VNET_FRAME_SIZE vectors in it. */ - vlib_get_new_next_frame (vm, node, next_index, to_tx, n_left_to_tx); + /* Prefetch next iteration. */ + vlib_prefetch_buffer_header (b[4], LOAD); + vlib_prefetch_buffer_header (b[5], LOAD); + vlib_prefetch_buffer_header (b[6], LOAD); + vlib_prefetch_buffer_header (b[7], LOAD); + + if (processing_level >= 1) + or_flags = b[0]->flags | b[1]->flags | b[2]->flags | b[3]->flags; + + /* Be grumpy about zero length buffers for benefit of + driver tx function. */ + ASSERT (b[0]->current_length > 0); + ASSERT (b[1]->current_length > 0); + ASSERT (b[2]->current_length > 0); + ASSERT (b[3]->current_length > 0); + + n_bytes += n_bytes0 = vlib_buffer_length_in_chain (vm, b[0]); + n_bytes += n_bytes1 = vlib_buffer_length_in_chain (vm, b[1]); + n_bytes += n_bytes2 = vlib_buffer_length_in_chain (vm, b[2]); + n_bytes += n_bytes3 = vlib_buffer_length_in_chain (vm, b[3]); + + if (processing_level >= 3) + { + p[0] = vlib_buffer_get_current (b[0]); + p[1] = vlib_buffer_get_current (b[1]); + p[2] = vlib_buffer_get_current (b[2]); + p[3] = vlib_buffer_get_current (b[3]); + p += 4; + } - while (from + 8 <= from_end && n_left_to_tx >= 4) + if (processing_level >= 2) { - u32 bi0, bi1, bi2, bi3; u32 tx_swif0, tx_swif1, tx_swif2, tx_swif3; - u32 or_flags; - - /* Prefetch next iteration. */ - vlib_prefetch_buffer_header (b[4], LOAD); - vlib_prefetch_buffer_header (b[5], LOAD); - vlib_prefetch_buffer_header (b[6], LOAD); - vlib_prefetch_buffer_header (b[7], LOAD); - - bi0 = from[0]; - bi1 = from[1]; - bi2 = from[2]; - bi3 = from[3]; - to_tx[0] = bi0; - to_tx[1] = bi1; - to_tx[2] = bi2; - to_tx[3] = bi3; - - or_flags = b[0]->flags | b[1]->flags | b[2]->flags | b[3]->flags; - - from += 4; - to_tx += 4; - n_left_to_tx -= 4; - - /* Be grumpy about zero length buffers for benefit of - driver tx function. */ - ASSERT (b[0]->current_length > 0); - ASSERT (b[1]->current_length > 0); - ASSERT (b[2]->current_length > 0); - ASSERT (b[3]->current_length > 0); - - n_bytes_b0 = vlib_buffer_length_in_chain (vm, b[0]); - n_bytes_b1 = vlib_buffer_length_in_chain (vm, b[1]); - n_bytes_b2 = vlib_buffer_length_in_chain (vm, b[2]); - n_bytes_b3 = vlib_buffer_length_in_chain (vm, b[3]); tx_swif0 = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; tx_swif1 = vnet_buffer (b[1])->sw_if_index[VLIB_TX]; tx_swif2 = vnet_buffer (b[2])->sw_if_index[VLIB_TX]; tx_swif3 = vnet_buffer (b[3])->sw_if_index[VLIB_TX]; - n_bytes += n_bytes_b0 + n_bytes_b1; - n_bytes += n_bytes_b2 + n_bytes_b3; - n_packets += 4; + /* update vlan subif tx counts, if required */ + if (PREDICT_FALSE (tx_swif0 != sw_if_index)) + vlib_increment_combined_counter (ccm, ti, tx_swif0, 1, n_bytes0); + + if (PREDICT_FALSE (tx_swif1 != sw_if_index)) + vlib_increment_combined_counter (ccm, ti, tx_swif1, 1, n_bytes1); + + if (PREDICT_FALSE (tx_swif2 != sw_if_index)) + vlib_increment_combined_counter (ccm, ti, tx_swif2, 1, n_bytes2); - if (PREDICT_FALSE (current_config_index != ~0)) + if (PREDICT_FALSE (tx_swif3 != sw_if_index)) + vlib_increment_combined_counter (ccm, ti, tx_swif3, 1, n_bytes3); + + if (PREDICT_FALSE (config_index != ~0)) { vnet_buffer (b[0])->feature_arc_index = arc; + b[0]->current_config_index = config_index; vnet_buffer (b[1])->feature_arc_index = arc; + b[1]->current_config_index = config_index; vnet_buffer (b[2])->feature_arc_index = arc; + b[2]->current_config_index = config_index; vnet_buffer (b[3])->feature_arc_index = arc; - b[0]->current_config_index = current_config_index; - b[1]->current_config_index = current_config_index; - b[2]->current_config_index = current_config_index; - b[3]->current_config_index = current_config_index; + b[3]->current_config_index = config_index; } + } - /* update vlan subif tx counts, if required */ - if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index)) - { - vlib_increment_combined_counter (im->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, - thread_index, tx_swif0, 1, - n_bytes_b0); - } - - if (PREDICT_FALSE (tx_swif1 != rt->sw_if_index)) - { - - vlib_increment_combined_counter (im->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, - thread_index, tx_swif1, 1, - n_bytes_b1); - } + if (processing_level >= 1 && (or_flags & VNET_BUFFER_F_OFFLOAD)) + { + vnet_interface_output_handle_offload (vm, b[0]); + vnet_interface_output_handle_offload (vm, b[1]); + vnet_interface_output_handle_offload (vm, b[2]); + vnet_interface_output_handle_offload (vm, b[3]); + } - if (PREDICT_FALSE (tx_swif2 != rt->sw_if_index)) - { + n_left -= 4; + b += 4; + } - vlib_increment_combined_counter (im->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, - thread_index, tx_swif2, 1, - n_bytes_b2); - } - if (PREDICT_FALSE (tx_swif3 != rt->sw_if_index)) - { + while (n_left) + { + /* Be grumpy about zero length buffers for benefit of + driver tx function. */ + ASSERT (b[0]->current_length > 0); - vlib_increment_combined_counter (im->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, - thread_index, tx_swif3, 1, - n_bytes_b3); - } - - if (do_tx_offloads) - { - u32 vnet_buffer_offload_flags = - (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM | - VNET_BUFFER_F_OFFLOAD_UDP_CKSUM | - VNET_BUFFER_F_OFFLOAD_IP_CKSUM); - if (or_flags & vnet_buffer_offload_flags) - { - if (b[0]->flags & vnet_buffer_offload_flags) - vnet_calc_checksums_inline - (vm, b[0], - b[0]->flags & VNET_BUFFER_F_IS_IP4, - b[0]->flags & VNET_BUFFER_F_IS_IP6); - if (b[1]->flags & vnet_buffer_offload_flags) - vnet_calc_checksums_inline - (vm, b[1], - b[1]->flags & VNET_BUFFER_F_IS_IP4, - b[1]->flags & VNET_BUFFER_F_IS_IP6); - if (b[2]->flags & vnet_buffer_offload_flags) - vnet_calc_checksums_inline - (vm, b[2], - b[2]->flags & VNET_BUFFER_F_IS_IP4, - b[2]->flags & VNET_BUFFER_F_IS_IP6); - if (b[3]->flags & vnet_buffer_offload_flags) - vnet_calc_checksums_inline - (vm, b[3], - b[3]->flags & VNET_BUFFER_F_IS_IP4, - b[3]->flags & VNET_BUFFER_F_IS_IP6); - } - } - b += 4; + n_bytes += n_bytes0 = vlib_buffer_length_in_chain (vm, b[0]); + if (processing_level >= 3) + { + p[0] = vlib_buffer_get_current (b[0]); + p += 1; } - while (from + 1 <= from_end && n_left_to_tx >= 1) + if (processing_level >= 2) { - u32 bi0; - u32 tx_swif0; - - bi0 = from[0]; - to_tx[0] = bi0; - from += 1; - to_tx += 1; - n_left_to_tx -= 1; + u32 tx_swif0 = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; - /* Be grumpy about zero length buffers for benefit of - driver tx function. */ - ASSERT (b[0]->current_length > 0); - - n_bytes_b0 = vlib_buffer_length_in_chain (vm, b[0]); - tx_swif0 = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; - n_bytes += n_bytes_b0; - n_packets += 1; - - if (PREDICT_FALSE (current_config_index != ~0)) + if (PREDICT_FALSE (config_index != ~0)) { vnet_buffer (b[0])->feature_arc_index = arc; - b[0]->current_config_index = current_config_index; - } - - if (PREDICT_FALSE (tx_swif0 != rt->sw_if_index)) - { - - vlib_increment_combined_counter (im->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, - thread_index, tx_swif0, 1, - n_bytes_b0); + b[0]->current_config_index = config_index; } - if (do_tx_offloads) - { - if (b[0]->flags & - (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM | - VNET_BUFFER_F_OFFLOAD_UDP_CKSUM | - VNET_BUFFER_F_OFFLOAD_IP_CKSUM)) - vnet_calc_checksums_inline - (vm, b[0], - b[0]->flags & VNET_BUFFER_F_IS_IP4, - b[0]->flags & VNET_BUFFER_F_IS_IP6); - } - b += 1; + if (PREDICT_FALSE (tx_swif0 != sw_if_index)) + vlib_increment_combined_counter (ccm, ti, tx_swif0, 1, n_bytes0); } - vlib_put_next_frame (vm, node, next_index, n_left_to_tx); + if (processing_level >= 1) + vnet_interface_output_handle_offload (vm, b[0]); + + n_left -= 1; + b += 1; } - /* Update main interface stats. */ - vlib_increment_combined_counter (im->combined_sw_if_counters - + VNET_INTERFACE_COUNTER_TX, - thread_index, - rt->sw_if_index, n_packets, n_bytes); - return n_buffers; + return n_bytes; } -#endif /* CLIB_MARCH_VARIANT */ -static_always_inline void vnet_interface_pcap_tx_trace - (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame, - int sw_if_index_from_buffer) +static_always_inline void +vnet_interface_pcap_tx_trace (vlib_main_t *vm, vlib_node_runtime_t *node, + vlib_frame_t *frame, int in_interface_ouput) { + vnet_main_t *vnm = vnet_get_main (); u32 n_left_from, *from; - u32 sw_if_index; - vnet_pcap_t *pp = &vlib_global_main.pcap; + u32 sw_if_index = ~0, hw_if_index = ~0; + vnet_pcap_t *pp = &vnm->pcap; if (PREDICT_TRUE (pp->pcap_tx_enable == 0)) return; - if (sw_if_index_from_buffer == 0) + if (in_interface_ouput) + { + /* interface-output is called right before interface-output-template. + * We only want to capture packets here if there is a per-interface + * filter, in case it matches the sub-interface sw_if_index. + * If there is no per-interface filter configured, let the + * interface-output-template node deal with it */ + if (pp->pcap_sw_if_index == 0) + return; + } + else { vnet_interface_output_runtime_t *rt = (void *) node->runtime_data; sw_if_index = rt->sw_if_index; } - else - sw_if_index = ~0; n_left_from = frame->n_vectors; from = vlib_frame_vector_args (frame); while (n_left_from > 0) { - int classify_filter_result; u32 bi0 = from[0]; vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0); from++; n_left_from--; - if (pp->filter_classify_table_index != ~0) + if (in_interface_ouput) { - classify_filter_result = - vnet_is_packet_traced_inline - (b0, pp->filter_classify_table_index, 0 /* full classify */ ); - if (classify_filter_result) - pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); - continue; + const u32 sii = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + if (PREDICT_FALSE (sii != sw_if_index)) + { + const vnet_hw_interface_t *hi = + vnet_get_sup_hw_interface (vnm, sii); + hw_if_index = hi->sw_if_index; + sw_if_index = sii; + } + if (hw_if_index == sw_if_index) + continue; /* defer to interface-output-template */ } - if (sw_if_index_from_buffer) - sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + if (vnet_is_packet_pcaped (pp, b0, sw_if_index)) + pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); + } +} + +static_always_inline void +hash_func_with_mask (void **p, u32 *hash, u32 n_packets, u32 *lookup_table, + u32 mask, vnet_hash_fn_t hf) +{ + u32 n_left_from = n_packets; + + hf (p, hash, n_packets); + + clib_array_mask_u32 (hash, mask, n_packets); + + while (n_left_from >= 4) + { + hash[0] = lookup_table[hash[0]]; + hash[1] = lookup_table[hash[1]]; + hash[2] = lookup_table[hash[2]]; + hash[3] = lookup_table[hash[3]]; + + hash += 4; + n_left_from -= 4; + } + + while (n_left_from > 0) + { + hash[0] = lookup_table[hash[0]]; + + hash += 1; + n_left_from -= 1; + } +} - if (pp->pcap_sw_if_index == 0 || pp->pcap_sw_if_index == sw_if_index) +static_always_inline void +store_tx_frame_scalar_data (vnet_hw_if_tx_frame_t *copy_frame, + vnet_hw_if_tx_frame_t *tf) +{ + if (copy_frame) + clib_memcpy_fast (tf, copy_frame, sizeof (vnet_hw_if_tx_frame_t)); +} + +static_always_inline u32 +enqueue_one_to_tx_node (vlib_main_t *vm, vlib_node_runtime_t *node, u32 *ppqi, + u32 *from, vnet_hw_if_tx_frame_t *copy_frame, + u32 n_vectors, u32 n_left, u32 next_index) +{ + u32 tmp[VLIB_FRAME_SIZE]; + vlib_frame_bitmap_t mask = {}; + vlib_frame_t *f; + vnet_hw_if_tx_frame_t *tf; + u32 *to; + u32 n_copy = 0, n_free = 0; + + f = vlib_get_next_frame_internal (vm, node, next_index, 0); + tf = vlib_frame_scalar_args (f); + + if (f->n_vectors > 0 && + (!copy_frame || (tf->queue_id == copy_frame->queue_id))) + { + /* append current next frame */ + n_free = VLIB_FRAME_SIZE - f->n_vectors; + /* + * if frame contains enough space for worst case scenario, + * we can avoid use of tmp + */ + if (n_free >= n_left) + to = (u32 *) vlib_frame_vector_args (f) + f->n_vectors; + else + to = tmp; + } + else + { + if (f->n_vectors > 0) { - vnet_main_t *vnm = vnet_get_main (); - vnet_hw_interface_t *hi = - vnet_get_sup_hw_interface (vnm, sw_if_index); - /* Capture pkt if not filtered, or if filter hits */ - if (hi->trace_classify_table_index == ~0 || - vnet_is_packet_traced_inline - (b0, hi->trace_classify_table_index, 0 /* full classify */ )) - pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); + /* current frame doesn't fit - grab empty one */ + f = vlib_get_next_frame_internal (vm, node, next_index, 1); + tf = vlib_frame_scalar_args (f); } + + /* empty frame - store scalar data */ + store_tx_frame_scalar_data (copy_frame, tf); + to = vlib_frame_vector_args (f); + n_free = VLIB_FRAME_SIZE; + } + + /* + * per packet queue id array + * compare with given queue_id, if match, copy respective buffer index from + * -> to + */ + if (ppqi) + { + clib_mask_compare_u32 (copy_frame->queue_id, ppqi, mask, n_vectors); + n_copy = clib_compress_u32 (to, from, mask, n_vectors); + + if (n_copy == 0) + return n_left; + } + else + { + /* + * no work required, just copy all buffer indices from -> to + */ + n_copy = n_left; + vlib_buffer_copy_indices (to, from, n_copy); } + + if (to != tmp) + { + /* indices already written to frame, just close it */ + vlib_put_next_frame (vm, node, next_index, n_free - n_copy); + } + else if (n_free >= n_copy) + { + /* enough space in the existing frame */ + to = (u32 *) vlib_frame_vector_args (f) + f->n_vectors; + vlib_buffer_copy_indices (to, tmp, n_copy); + vlib_put_next_frame (vm, node, next_index, n_free - n_copy); + } + else + { + /* full frame */ + to = (u32 *) vlib_frame_vector_args (f) + f->n_vectors; + vlib_buffer_copy_indices (to, tmp, n_free); + vlib_put_next_frame (vm, node, next_index, 0); + + /* second frame */ + u32 n_2nd_frame = n_copy - n_free; + f = vlib_get_next_frame_internal (vm, node, next_index, 1); + tf = vlib_frame_scalar_args (f); + /* empty frame - store scalar data */ + store_tx_frame_scalar_data (copy_frame, tf); + to = vlib_frame_vector_args (f); + vlib_buffer_copy_indices (to, tmp + n_free, n_2nd_frame); + vlib_put_next_frame (vm, node, next_index, + VLIB_FRAME_SIZE - n_2nd_frame); + } + + return n_left - n_copy; } -#ifndef CLIB_MARCH_VARIANT +static_always_inline void +enqueue_to_tx_node (vlib_main_t *vm, vlib_node_runtime_t *node, + vnet_hw_interface_t *hi, u32 next_index, + vnet_hw_if_output_node_runtime_t *r, u32 *from, void **p, + u32 n_vectors) +{ + u32 n_left = n_vectors; + + ASSERT (n_vectors <= VLIB_FRAME_SIZE); + + /* + * backward compatible for drivers not integrated with new tx infra. + */ + if (r == 0) + { + n_left = enqueue_one_to_tx_node (vm, node, NULL, from, NULL, n_vectors, + n_left, next_index); + } + /* + * only 1 tx queue of given interface is available on given thread + */ + else if (r->n_queues == 1) + { + n_left = enqueue_one_to_tx_node (vm, node, NULL, from, r->frame, + n_vectors, n_left, next_index); + } + /* + * multi tx-queues use case + */ + else if (r->n_queues > 1) + { + u32 qids[VLIB_FRAME_SIZE]; + + hash_func_with_mask (p, qids, n_vectors, r->lookup_table, + vec_len (r->lookup_table) - 1, hi->hf); -uword -vnet_interface_output_node (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) + for (u32 i = 0; i < r->n_queues; i++) + { + n_left = enqueue_one_to_tx_node (vm, node, qids, from, &r->frame[i], + n_vectors, n_left, next_index); + if (n_left == 0) + break; + } + } + else + ASSERT (0); +} + +VLIB_NODE_FN (vnet_interface_output_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame) { vnet_main_t *vnm = vnet_get_main (); + vnet_interface_main_t *im = &vnm->interface_main; + vlib_combined_counter_main_t *ccm; vnet_hw_interface_t *hi; + vnet_sw_interface_t *si; vnet_interface_output_runtime_t *rt = (void *) node->runtime_data; - hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index); + vnet_hw_if_output_node_runtime_t *r = 0; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE]; + u32 n_bytes, n_buffers = frame->n_vectors; + u32 config_index = ~0; + u32 sw_if_index = rt->sw_if_index; + u32 next_index = VNET_INTERFACE_OUTPUT_NEXT_TX; + u32 ti = vm->thread_index; + u8 arc = im->output_feature_arc_index; + int arc_or_subif = 0; + int do_tx_offloads = 0; + void *ptr[VLIB_FRAME_SIZE], **p = ptr; + u8 is_parr = 0; + u32 *from; + + if (node->flags & VLIB_NODE_FLAG_TRACE) + vnet_interface_output_trace (vm, node, frame, n_buffers); + + from = vlib_frame_vector_args (frame); + + if (rt->is_deleted) + return vlib_error_drop_buffers ( + vm, node, from, + /* buffer stride */ 1, n_buffers, VNET_INTERFACE_OUTPUT_NEXT_DROP, + node->node_index, VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DELETED); - vnet_interface_pcap_tx_trace (vm, node, frame, - 0 /* sw_if_index_from_buffer */ ); + vnet_interface_pcap_tx_trace (vm, node, frame, 0 /* in_interface_ouput */); - if (hi->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD) - return vnet_interface_output_node_inline (vm, node, frame, vnm, hi, - /* do_tx_offloads */ 0); + vlib_get_buffers (vm, from, bufs, n_buffers); + + si = vnet_get_sw_interface (vnm, sw_if_index); + hi = vnet_get_sup_hw_interface (vnm, sw_if_index); + + if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) || + !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP)) + { + vlib_simple_counter_main_t *cm; + + cm = vec_elt_at_index (vnm->interface_main.sw_if_counters, + VNET_INTERFACE_COUNTER_TX_ERROR); + vlib_increment_simple_counter (cm, ti, sw_if_index, n_buffers); + + return vlib_error_drop_buffers ( + vm, node, from, + /* buffer stride */ 1, n_buffers, VNET_INTERFACE_OUTPUT_NEXT_DROP, + node->node_index, VNET_INTERFACE_OUTPUT_ERROR_INTERFACE_DOWN); + } + + if (hi->output_node_thread_runtimes) + r = vec_elt_at_index (hi->output_node_thread_runtimes, vm->thread_index); + + if (r) + { + /* + * tx queue of given interface is not available on given thread + */ + if (r->n_queues == 0) + return vlib_error_drop_buffers ( + vm, node, from, + /* buffer stride */ 1, n_buffers, VNET_INTERFACE_OUTPUT_NEXT_DROP, + node->node_index, VNET_INTERFACE_OUTPUT_ERROR_NO_TX_QUEUE); + /* + * multiple tx queues available on given thread + */ + else if (r->n_queues > 1) + /* construct array of pointer */ + is_parr = 1; + } + + /* interface-output feature arc handling */ + if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index))) + { + vnet_feature_config_main_t *fcm; + fcm = vnet_feature_get_config_main (arc); + config_index = vnet_get_feature_config_index (arc, sw_if_index); + vnet_get_config_data (&fcm->config_main, &config_index, &next_index, 0); + arc_or_subif = 1; + } + else if (hash_elts (hi->sub_interface_sw_if_index_by_id)) + arc_or_subif = 1; + + ccm = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX; + + /* if not all three flags IP4_,TCP_,UDP_CKSUM set, do compute them + * here before sending to the interface */ + if ((hi->caps & VNET_HW_IF_CAP_TX_CKSUM) != VNET_HW_IF_CAP_TX_CKSUM) + do_tx_offloads = 1; + + // basic processing + if (do_tx_offloads == 0 && arc_or_subif == 0 && is_parr == 0) + n_bytes = vnet_interface_output_node_inline ( + vm, sw_if_index, ccm, bufs, NULL, config_index, arc, n_buffers, 0); + // basic processing + tx offloads + else if (do_tx_offloads == 1 && arc_or_subif == 0 && is_parr == 0) + n_bytes = vnet_interface_output_node_inline ( + vm, sw_if_index, ccm, bufs, NULL, config_index, arc, n_buffers, 1); + // basic processing + tx offloads + vlans + arcs + else if (do_tx_offloads == 1 && arc_or_subif == 1 && is_parr == 0) + n_bytes = vnet_interface_output_node_inline ( + vm, sw_if_index, ccm, bufs, NULL, config_index, arc, n_buffers, 2); + // basic processing + tx offloads + vlans + arcs + multi-txqs else - return vnet_interface_output_node_inline (vm, node, frame, vnm, hi, - /* do_tx_offloads */ 1); + n_bytes = vnet_interface_output_node_inline ( + vm, sw_if_index, ccm, bufs, p, config_index, arc, n_buffers, 3); + + from = vlib_frame_vector_args (frame); + if (PREDICT_TRUE (next_index == VNET_INTERFACE_OUTPUT_NEXT_TX)) + { + enqueue_to_tx_node (vm, node, hi, next_index, r, from, ptr, + frame->n_vectors); + } + else + { + vlib_buffer_enqueue_to_single_next (vm, node, from, next_index, + frame->n_vectors); + } + + /* Update main interface stats. */ + vlib_increment_combined_counter (ccm, ti, sw_if_index, n_buffers, n_bytes); + return n_buffers; } -#endif /* CLIB_MARCH_VARIANT */ + +VLIB_REGISTER_NODE (vnet_interface_output_node) = { + .name = "interface-output-template", + .vector_size = sizeof (u32), +}; /* Use buffer's sw_if_index[VNET_TX] to choose output interface. */ VLIB_NODE_FN (vnet_per_buffer_interface_output_node) (vlib_main_t * vm, @@ -517,8 +694,7 @@ VLIB_NODE_FN (vnet_per_buffer_interface_output_node) (vlib_main_t * vm, u32 n_left_to_next, *from, *to_next; u32 n_left_from, next_index; - vnet_interface_pcap_tx_trace (vm, node, frame, - 1 /* sw_if_index_from_buffer */ ); + vnet_interface_pcap_tx_trace (vm, node, frame, 1 /* in_interface_ouput */); n_left_from = frame->n_vectors; @@ -603,9 +779,13 @@ VLIB_NODE_FN (vnet_per_buffer_interface_output_node) (vlib_main_t * vm, typedef struct vnet_error_trace_t_ { u32 sw_if_index; + i8 details_valid; + u8 is_ip6; + u8 pad[2]; + u16 mactype; + ip46_address_t src, dst; } vnet_error_trace_t; - static u8 * format_vnet_error_trace (u8 * s, va_list * va) { @@ -613,9 +793,29 @@ format_vnet_error_trace (u8 * s, va_list * va) CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); vnet_error_trace_t *t = va_arg (*va, vnet_error_trace_t *); - s = format (s, "rx:%U", format_vnet_sw_if_index_name, - vnet_get_main (), t->sw_if_index); - + /* Normal, non-catchup trace */ + if (t->details_valid == 0) + { + s = format (s, "rx:%U", format_vnet_sw_if_index_name, + vnet_get_main (), t->sw_if_index); + } + else if (t->details_valid == 1) + { + /* The trace capture code didn't understant the mactype */ + s = format (s, "mactype 0x%4x (not decoded)", t->mactype); + } + else if (t->details_valid == 2) + { + /* Dump the src/dst addresses */ + if (t->is_ip6 == 0) + s = format (s, "IP4: %U -> %U", + format_ip4_address, &t->src.ip4, + format_ip4_address, &t->dst.ip4); + else + s = format (s, "IP6: %U -> %U", + format_ip6_address, &t->src.ip6, + format_ip6_address, &t->dst.ip6); + } return s; } @@ -646,13 +846,17 @@ interface_trace_buffers (vlib_main_t * vm, if (b0->flags & VLIB_BUFFER_IS_TRACED) { - t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); + t0 = vlib_add_trace (vm, node, b0, + STRUCT_OFFSET_OF (vnet_error_trace_t, pad)); t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + t0->details_valid = 0; } if (b1->flags & VLIB_BUFFER_IS_TRACED) { - t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0])); + t1 = vlib_add_trace (vm, node, b1, + STRUCT_OFFSET_OF (vnet_error_trace_t, pad)); t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX]; + t1->details_valid = 0; } buffers += 2; n_left -= 2; @@ -670,8 +874,10 @@ interface_trace_buffers (vlib_main_t * vm, if (b0->flags & VLIB_BUFFER_IS_TRACED) { - t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); + t0 = vlib_add_trace (vm, node, b0, + STRUCT_OFFSET_OF (vnet_error_trace_t, pad)); t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + t0->details_valid = 0; } buffers += 1; n_left -= 1; @@ -685,6 +891,56 @@ typedef enum VNET_ERROR_N_DISPOSITION, } vnet_error_disposition_t; +static void +drop_catchup_trace (vlib_main_t * vm, + vlib_node_runtime_t * node, vlib_buffer_t * b) +{ + /* Can we safely rewind the buffer? If not, fagedaboudit */ + if (b->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) + { + vnet_error_trace_t *t; + ip4_header_t *ip4; + ip6_header_t *ip6; + ethernet_header_t *eh; + i16 delta; + + t = vlib_add_trace (vm, node, b, sizeof (*t)); + delta = vnet_buffer (b)->l2_hdr_offset - b->current_data; + vlib_buffer_advance (b, delta); + + eh = vlib_buffer_get_current (b); + /* Save mactype */ + t->mactype = clib_net_to_host_u16 (eh->type); + t->details_valid = 1; + switch (t->mactype) + { + case ETHERNET_TYPE_IP4: + ip4 = (void *) (eh + 1); + t->details_valid = 2; + t->is_ip6 = 0; + t->src.ip4.as_u32 = ip4->src_address.as_u32; + t->dst.ip4.as_u32 = ip4->dst_address.as_u32; + break; + + case ETHERNET_TYPE_IP6: + ip6 = (void *) (eh + 1); + t->details_valid = 2; + t->is_ip6 = 1; + clib_memcpy_fast (t->src.as_u8, ip6->src_address.as_u8, + sizeof (ip6_address_t)); + clib_memcpy_fast (t->dst.as_u8, ip6->dst_address.as_u8, + sizeof (ip6_address_t)); + break; + + default: + /* Dunno, do nothing, leave details_valid alone */ + break; + } + /* Restore current data (probably unnecessary) */ + vlib_buffer_advance (b, -delta); + } +} + static_always_inline uword interface_drop_punt (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -696,6 +952,7 @@ interface_drop_punt (vlib_main_t * vm, u32 sw_if_indices[VLIB_FRAME_SIZE]; vlib_simple_counter_main_t *cm; u16 nexts[VLIB_FRAME_SIZE]; + u32 n_trace; vnet_main_t *vnm; vnm = vnet_get_main (); @@ -707,6 +964,41 @@ interface_drop_punt (vlib_main_t * vm, vlib_get_buffers (vm, from, bufs, n_left); + /* "trace add error-drop NNN?" */ + if (PREDICT_FALSE ((n_trace = vlib_get_trace_count (vm, node)))) + { + /* If pkts aren't otherwise traced... */ + if ((node->flags & VLIB_NODE_FLAG_TRACE) == 0) + { + /* Trace them from here */ + node->flags |= VLIB_NODE_FLAG_TRACE; + while (n_trace && n_left) + { + if (PREDICT_TRUE + (vlib_trace_buffer (vm, node, 0 /* next_index */ , b[0], + 0 /* follow chain */ ))) + { + /* + * Here we have a wireshark dissector problem. + * Packets may be well-formed, or not. We + * must not blow chunks in any case. + * + * Try to produce trace records which will help + * folks understand what's going on. + */ + drop_catchup_trace (vm, node, b[0]); + n_trace--; + } + n_left--; + b++; + } + } + + vlib_set_trace_count (vm, node, n_trace); + b = bufs; + n_left = frame->n_vectors; + } + if (node->flags & VLIB_NODE_FLAG_TRACE) interface_trace_buffers (vm, node, frame); @@ -789,8 +1081,6 @@ pcap_drop_trace (vlib_main_t * vm, i16 save_current_data; u16 save_current_length; vlib_error_main_t *em = &vm->error_main; - int do_trace = 0; - from = vlib_frame_vector_args (f); @@ -812,97 +1102,86 @@ pcap_drop_trace (vlib_main_t * vm, && hash_get (im->pcap_drop_filter_hash, b0->error)) continue; - do_trace = (pp->pcap_sw_if_index == 0) || - pp->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX]; + if (!vnet_is_packet_pcaped (pp, b0, ~0)) + continue; /* not matching, skip */ - if (PREDICT_FALSE - (do_trace == 0 && pp->filter_classify_table_index != ~0)) + /* Trace all drops, or drops received on a specific interface */ + save_current_data = b0->current_data; + save_current_length = b0->current_length; + + /* + * Typically, we'll need to rewind the buffer + * if l2_hdr_offset is valid, make sure to rewind to the start of + * the L2 header. This may not be the buffer start in case we pop-ed + * vlan tags. + * Otherwise, rewind to buffer start and hope for the best. + */ + if (b0->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) { - do_trace = vnet_is_packet_traced_inline - (b0, pp->filter_classify_table_index, 0 /* full classify */ ); + if (b0->current_data > vnet_buffer (b0)->l2_hdr_offset) + vlib_buffer_advance (b0, vnet_buffer (b0)->l2_hdr_offset - + b0->current_data); } - - /* Trace all drops, or drops received on a specific interface */ - if (do_trace) + else if (b0->current_data > 0) { - save_current_data = b0->current_data; - save_current_length = b0->current_length; - - /* - * Typically, we'll need to rewind the buffer - * if l2_hdr_offset is valid, make sure to rewind to the start of - * the L2 header. This may not be the buffer start in case we pop-ed - * vlan tags. - * Otherwise, rewind to buffer start and hope for the best. - */ - if (b0->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) - { - if (b0->current_data > vnet_buffer (b0)->l2_hdr_offset) - vlib_buffer_advance (b0, - vnet_buffer (b0)->l2_hdr_offset - - b0->current_data); - } - else if (b0->current_data > 0) - vlib_buffer_advance (b0, (word) - b0->current_data); + vlib_buffer_advance (b0, (word) -b0->current_data); + } + { + vlib_buffer_t *last = b0; + u32 error_node_index; + int drop_string_len; + vlib_node_t *n; + /* Length of the error string */ + int error_string_len = + clib_strnlen (em->counters_heap[b0->error].name, 128); + + /* Dig up the drop node */ + error_node_index = vm->node_main.node_by_error[b0->error]; + n = vlib_get_node (vm, error_node_index); + + /* Length of full drop string, w/ "nodename: " prepended */ + drop_string_len = error_string_len + vec_len (n->name) + 2; + + /* Find the last buffer in the chain */ + while (last->flags & VLIB_BUFFER_NEXT_PRESENT) + last = vlib_get_buffer (vm, last->next_buffer); + + /* + * Append : to the capture, + * only if we can do that without allocating a new buffer. + */ + if (PREDICT_TRUE ((last->current_data + last->current_length) < + (VLIB_BUFFER_DEFAULT_DATA_SIZE - drop_string_len))) { - vlib_buffer_t *last = b0; - u32 error_node_index; - int drop_string_len; - vlib_node_t *n; - /* Length of the error string */ - int error_string_len = - clib_strnlen (em->error_strings_heap[b0->error], 128); - - /* Dig up the drop node */ - error_node_index = vm->node_main.node_by_error[b0->error]; - n = vlib_get_node (vm, error_node_index); - - /* Length of full drop string, w/ "nodename: " prepended */ - drop_string_len = error_string_len + vec_len (n->name) + 2; - - /* Find the last buffer in the chain */ - while (last->flags & VLIB_BUFFER_NEXT_PRESENT) - last = vlib_get_buffer (vm, last->next_buffer); - - /* - * Append : to the capture, - * only if we can do that without allocating a new buffer. - */ - if (PREDICT_TRUE ((last->current_data + last->current_length) - < (VLIB_BUFFER_DEFAULT_DATA_SIZE - - drop_string_len))) - { - clib_memcpy_fast (last->data + last->current_data + - last->current_length, n->name, - vec_len (n->name)); - clib_memcpy_fast (last->data + last->current_data + - last->current_length + vec_len (n->name), - ": ", 2); - clib_memcpy_fast (last->data + last->current_data + - last->current_length + vec_len (n->name) + - 2, em->error_strings_heap[b0->error], - error_string_len); - last->current_length += drop_string_len; - b0->flags &= ~(VLIB_BUFFER_TOTAL_LENGTH_VALID); - pcap_add_buffer (&pp->pcap_main, vm, bi0, - pp->max_bytes_per_pkt); - last->current_length -= drop_string_len; - b0->current_data = save_current_data; - b0->current_length = save_current_length; - continue; - } + clib_memcpy_fast (last->data + last->current_data + + last->current_length, + n->name, vec_len (n->name)); + clib_memcpy_fast (last->data + last->current_data + + last->current_length + vec_len (n->name), + ": ", 2); + clib_memcpy_fast (last->data + last->current_data + + last->current_length + vec_len (n->name) + 2, + em->counters_heap[b0->error].name, + error_string_len); + last->current_length += drop_string_len; + b0->flags &= ~(VLIB_BUFFER_TOTAL_LENGTH_VALID); + pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); + last->current_length -= drop_string_len; + b0->current_data = save_current_data; + b0->current_length = save_current_length; + continue; } + } - /* - * Didn't have space in the last buffer, here's the dropped - * packet as-is - */ - pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); + /* + * Didn't have space in the last buffer, here's the dropped + * packet as-is + */ + pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt); - b0->current_data = save_current_data; - b0->current_length = save_current_length; - } + b0->current_data = save_current_data; + b0->current_length = save_current_length; } } @@ -926,8 +1205,9 @@ VLIB_NODE_FN (interface_drop) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { + vnet_main_t *vnm = vnet_get_main (); vnet_interface_main_t *im = &vnet_get_main ()->interface_main; - vnet_pcap_t *pp = &vlib_global_main.pcap; + vnet_pcap_t *pp = &vnm->pcap; if (PREDICT_FALSE (pp->pcap_drop_enable)) pcap_drop_trace (vm, im, pp, frame); @@ -947,6 +1227,7 @@ VLIB_REGISTER_NODE (interface_drop) = { .name = "error-drop", .vector_size = sizeof (u32), .format_trace = format_vnet_error_trace, + .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, .n_next_nodes = 1, .next_nodes = { [0] = "drop", @@ -959,6 +1240,7 @@ VLIB_REGISTER_NODE (interface_punt) = { .name = "error-punt", .vector_size = sizeof (u32), .format_trace = format_vnet_error_trace, + .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, .n_next_nodes = 1, .next_nodes = { [0] = "punt", @@ -966,63 +1248,125 @@ VLIB_REGISTER_NODE (interface_punt) = { }; /* *INDENT-ON* */ -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (vnet_per_buffer_interface_output_node) = { .name = "interface-output", .vector_size = sizeof (u32), }; -/* *INDENT-ON* */ -static uword -interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (vnet_interface_output_arc_end_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame) { vnet_main_t *vnm = vnet_get_main (); - u32 last_sw_if_index = ~0; - vlib_frame_t *to_frame = 0; - vnet_hw_interface_t *hw = 0; - u32 *from, *to_next = 0; - u32 n_left_from; - - from = vlib_frame_vector_args (from_frame); - n_left_from = from_frame->n_vectors; - while (n_left_from > 0) + vnet_interface_main_t *im = &vnm->interface_main; + vnet_hw_interface_t *hi; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs; + u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index = sw_if_indices; + vlib_frame_bitmap_t used_elts = {}, mask = {}; + u32 *tmp, *from, n_left, n_comp, n_p_comp, swif, off; + u16 next_index; + void *ptr[VLIB_FRAME_SIZE], **p = ptr; + + from = vlib_frame_vector_args (frame); + n_left = frame->n_vectors; + vlib_get_buffers (vm, from, bufs, n_left); + + while (n_left >= 8) { - u32 bi0; - vlib_buffer_t *b0; - u32 sw_if_index0; + vlib_prefetch_buffer_header (b[4], LOAD); + vlib_prefetch_buffer_header (b[5], LOAD); + vlib_prefetch_buffer_header (b[6], LOAD); + vlib_prefetch_buffer_header (b[7], LOAD); + + p[0] = vlib_buffer_get_current (b[0]); + p[1] = vlib_buffer_get_current (b[1]); + p[2] = vlib_buffer_get_current (b[2]); + p[3] = vlib_buffer_get_current (b[3]); + sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; + sw_if_index[1] = vnet_buffer (b[1])->sw_if_index[VLIB_TX]; + sw_if_index[2] = vnet_buffer (b[2])->sw_if_index[VLIB_TX]; + sw_if_index[3] = vnet_buffer (b[3])->sw_if_index[VLIB_TX]; + + p += 4; + b += 4; + sw_if_index += 4; + n_left -= 4; + } - bi0 = from[0]; - from++; - n_left_from--; - b0 = vlib_get_buffer (vm, bi0); - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + while (n_left) + { + p[0] = vlib_buffer_get_current (b[0]); + sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; + p++; + b++; + sw_if_index++; + n_left--; + } - if (PREDICT_FALSE ((last_sw_if_index != sw_if_index0) || to_frame == 0)) + n_left = frame->n_vectors; + swif = sw_if_indices[0]; + off = 0; + + /* a bit ugly but it allows us to reuse stack space for temporary store + * which may also improve memory latency */ + tmp = (u32 *) bufs; + +more: + next_index = vec_elt (im->if_out_arc_end_next_index_by_sw_if_index, swif); + hi = vnet_get_sup_hw_interface (vnm, swif); + vnet_hw_if_output_node_runtime_t *r = 0; + void *ptr_tmp[VLIB_FRAME_SIZE], **p_tmp = ptr_tmp; + + if (hi->output_node_thread_runtimes) + r = vec_elt_at_index (hi->output_node_thread_runtimes, vm->thread_index); + + /* compare and compress based on comparison mask */ + clib_mask_compare_u32 (swif, sw_if_indices, mask, frame->n_vectors); + n_comp = clib_compress_u32 (tmp, from, mask, frame->n_vectors); + + /* + * tx queue of given interface is not available on given thread + */ + if (r) + { + if (r->n_queues == 0) { - if (to_frame) - { - hw = vnet_get_sup_hw_interface (vnm, last_sw_if_index); - vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame); - } - last_sw_if_index = sw_if_index0; - hw = vnet_get_sup_hw_interface (vnm, sw_if_index0); - to_frame = vlib_get_frame_to_node (vm, hw->tx_node_index); - to_next = vlib_frame_vector_args (to_frame); + vlib_error_drop_buffers ( + vm, node, tmp, + /* buffer stride */ 1, n_comp, VNET_INTERFACE_OUTPUT_NEXT_DROP, + node->node_index, VNET_INTERFACE_OUTPUT_ERROR_NO_TX_QUEUE); + goto drop; } + else if (r->n_queues > 1) + { + n_p_comp = clib_compress_u64 ((u64 *) p_tmp, (u64 *) ptr, mask, + frame->n_vectors); + ASSERT (n_p_comp == n_comp); + } + } + + enqueue_to_tx_node (vm, node, hi, next_index, r, tmp, ptr_tmp, n_comp); - to_next[0] = bi0; - to_next++; - to_frame->n_vectors++; +drop: + n_left -= n_comp; + if (n_left) + { + /* store comparison mask so we can find next unused element */ + vlib_frame_bitmap_or (used_elts, mask); + + /* fine first unused sw_if_index by scanning trough used_elts bitmap */ + while (PREDICT_FALSE (used_elts[off] == ~0)) + off++; + + swif = + sw_if_indices[(off << 6) + count_trailing_zeros (~used_elts[off])]; + goto more; } - vlib_put_frame_to_node (vm, hw->tx_node_index, to_frame); - return from_frame->n_vectors; + + return frame->n_vectors; } -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (interface_tx) = { - .function = interface_tx_node_fn, - .name = "interface-tx", +VLIB_REGISTER_NODE (vnet_interface_output_arc_end_node) = { + .name = "interface-output-arc-end", .vector_size = sizeof (u32), .n_next_nodes = 1, .next_nodes = { @@ -1030,32 +1374,30 @@ VLIB_REGISTER_NODE (interface_tx) = { }, }; -VNET_FEATURE_ARC_INIT (interface_output, static) = -{ - .arc_name = "interface-output", +VNET_FEATURE_ARC_INIT (interface_output, static) = { + .arc_name = "interface-output", .start_nodes = VNET_FEATURES (0), - .last_in_arc = "interface-tx", + .last_in_arc = "interface-output-arc-end", .arc_index_ptr = &vnet_main.interface_main.output_feature_arc_index, }; VNET_FEATURE_INIT (span_tx, static) = { .arc_name = "interface-output", .node_name = "span-output", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; VNET_FEATURE_INIT (ipsec_if_tx, static) = { .arc_name = "interface-output", .node_name = "ipsec-if-output", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; -VNET_FEATURE_INIT (interface_tx, static) = { +VNET_FEATURE_INIT (interface_output_arc_end, static) = { .arc_name = "interface-output", - .node_name = "interface-tx", + .node_name = "interface-output-arc-end", .runs_before = 0, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT clib_error_t *