X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.c;h=eadee69291981ec3ba84cd998a73f12128dd09d6;hb=b49bc1ae6;hp=2f62023aa4e8571dd832718bce6e9a04c7c6268b;hpb=6266877b0126045bbd309bf33dcf351db07e37d9;p=vpp.git diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index 2f62023aa4e..eadee692919 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -38,19 +38,19 @@ */ #include +#include #include #include #include #include #include +#include typedef struct { u32 sw_if_index; u32 flags; - u16 gso_size; - u8 gso_l4_hdr_sz; - u8 data[128 - 3 * sizeof (u32)]; + u8 data[128 - 2 * sizeof (u32)]; } interface_output_trace_t; @@ -82,17 +82,6 @@ format_vnet_interface_output_trace (u8 * s, va_list * va) format (s, "%U ", format_vnet_sw_interface_name, vnm, si, t->flags); } -#define _(bit, name, v, x) \ - if (v && (t->flags & VNET_BUFFER_F_##name)) \ - s = format (s, "%s ", v); - foreach_vnet_buffer_flag -#undef _ - if (t->flags & VNET_BUFFER_F_GSO) - { - s = format (s, "\n%Ugso_sz %d gso_l4_hdr_sz %d", - format_white_space, indent + 2, t->gso_size, - t->gso_l4_hdr_sz); - } s = format (s, "\n%U%U", format_white_space, indent, node->format_buffer ? node->format_buffer : format_hex_bytes, @@ -132,8 +121,6 @@ vnet_interface_output_trace (vlib_main_t * vm, t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; t0->flags = b0->flags; - t0->gso_size = vnet_buffer2 (b0)->gso_size; - t0->gso_l4_hdr_sz = vnet_buffer2 (b0)->gso_l4_hdr_sz; clib_memcpy_fast (t0->data, vlib_buffer_get_current (b0), sizeof (t0->data)); } @@ -142,8 +129,6 @@ vnet_interface_output_trace (vlib_main_t * vm, t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0])); t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX]; t1->flags = b1->flags; - t1->gso_size = vnet_buffer2 (b1)->gso_size; - t1->gso_l4_hdr_sz = vnet_buffer2 (b1)->gso_l4_hdr_sz; clib_memcpy_fast (t1->data, vlib_buffer_get_current (b1), sizeof (t1->data)); } @@ -166,8 +151,6 @@ vnet_interface_output_trace (vlib_main_t * vm, t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; t0->flags = b0->flags; - t0->gso_size = vnet_buffer2 (b0)->gso_size; - t0->gso_l4_hdr_sz = vnet_buffer2 (b0)->gso_l4_hdr_sz; clib_memcpy_fast (t0->data, vlib_buffer_get_current (b0), sizeof (t0->data)); } @@ -179,24 +162,25 @@ vnet_interface_output_trace (vlib_main_t * vm, static_always_inline void calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) { - ip4_header_t *ip4; - ip6_header_t *ip6; tcp_header_t *th; udp_header_t *uh; + gso_header_offset_t gho = { 0 }; int is_ip4 = (b->flags & VNET_BUFFER_F_IS_IP4) != 0; int is_ip6 = (b->flags & VNET_BUFFER_F_IS_IP6) != 0; ASSERT (!(is_ip4 && is_ip6)); - ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset); - ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset); - th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset); - uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset); + gho = vnet_gso_header_offset_parser (b, is_ip6); + th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset); + uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset); if (is_ip4) { - ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset); + ip4_header_t *ip4; + + ip4 = + (ip4_header_t *) (vlib_buffer_get_current (b) + gho.l3_hdr_offset); if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM) ip4->checksum = ip4_header_checksum (ip4); if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM) @@ -204,271 +188,44 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b) th->checksum = 0; th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); } - if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) - uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); + else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) + { + uh->checksum = 0; + uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4); + } } - if (is_ip6) + else if (is_ip6) { int bogus; + ip6_header_t *ip6; + + ip6 = + (ip6_header_t *) (vlib_buffer_get_current (b) + gho.l3_hdr_offset); if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM) { th->checksum = 0; th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus); } - if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) + else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM) { uh->checksum = 0; uh->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus); } } - b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM; b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM; } -static_always_inline u16 -tso_alloc_tx_bufs (vlib_main_t * vm, - vnet_interface_per_thread_data_t * ptd, - vlib_buffer_t * b0, u16 l4_hdr_sz) -{ - u32 n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0); - u16 gso_size = vnet_buffer2 (b0)->gso_size; - u16 l234_sz = vnet_buffer (b0)->l4_hdr_offset + l4_hdr_sz; - /* rounded-up division */ - u16 n_bufs = (n_bytes_b0 - l234_sz + (gso_size - 1)) / gso_size; - u16 n_alloc; - - ASSERT (n_bufs > 0); - vec_validate (ptd->split_buffers, n_bufs - 1); - - n_alloc = vlib_buffer_alloc (vm, ptd->split_buffers, n_bufs); - if (n_alloc < n_bufs) - { - vlib_buffer_free (vm, ptd->split_buffers, n_alloc); - return 0; - } - return 1; -} - -static_always_inline void -tso_init_buf_from_template_base (vlib_buffer_t * nb0, vlib_buffer_t * b0, - u32 flags, u16 length) -{ - nb0->current_data = 0; - nb0->total_length_not_including_first_buffer = 0; - nb0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID | flags; - clib_memcpy_fast (&nb0->opaque, &b0->opaque, sizeof (nb0->opaque)); - clib_memcpy_fast (nb0->data, b0->data, length); - nb0->current_length = length; -} - -static_always_inline void -tso_init_buf_from_template (vlib_main_t * vm, vlib_buffer_t * nb0, - vlib_buffer_t * b0, u16 template_data_sz, - u16 gso_size, u8 ** p_dst_ptr, u16 * p_dst_left, - u32 next_tcp_seq, u32 flags) -{ - tso_init_buf_from_template_base (nb0, b0, flags, template_data_sz); - - *p_dst_left = - clib_min (gso_size, - vlib_buffer_get_default_data_size (vm) - template_data_sz); - *p_dst_ptr = nb0->data + template_data_sz; - - tcp_header_t *tcp = - (tcp_header_t *) (nb0->data + vnet_buffer (nb0)->l4_hdr_offset); - tcp->seq_number = clib_host_to_net_u32 (next_tcp_seq); -} - -static_always_inline void -tso_fixup_segmented_buf (vlib_buffer_t * b0, u8 tcp_flags, int is_ip6) -{ - u16 l3_hdr_offset = vnet_buffer (b0)->l3_hdr_offset; - u16 l4_hdr_offset = vnet_buffer (b0)->l4_hdr_offset; - ip4_header_t *ip4 = (ip4_header_t *) (b0->data + l3_hdr_offset); - ip6_header_t *ip6 = (ip6_header_t *) (b0->data + l3_hdr_offset); - tcp_header_t *tcp = (tcp_header_t *) (b0->data + l4_hdr_offset); - - tcp->flags = tcp_flags; - - if (is_ip6) - ip6->payload_length = - clib_host_to_net_u16 (b0->current_length - - vnet_buffer (b0)->l4_hdr_offset); - else - ip4->length = - clib_host_to_net_u16 (b0->current_length - - vnet_buffer (b0)->l3_hdr_offset); -} - -/** - * Allocate the necessary number of ptd->split_buffers, - * and segment the possibly chained buffer(s) from b0 into - * there. - * - * Return the cumulative number of bytes sent or zero - * if allocation failed. - */ - -static_always_inline u32 -tso_segment_buffer (vlib_main_t * vm, vnet_interface_per_thread_data_t * ptd, - int do_tx_offloads, u32 sbi0, vlib_buffer_t * sb0, - u32 n_bytes_b0) -{ - u32 n_tx_bytes = 0; - int is_ip4 = sb0->flags & VNET_BUFFER_F_IS_IP4; - int is_ip6 = sb0->flags & VNET_BUFFER_F_IS_IP6; - ASSERT (is_ip4 || is_ip6); - ASSERT (sb0->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID); - ASSERT (sb0->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID); - ASSERT (sb0->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID); - u16 gso_size = vnet_buffer2 (sb0)->gso_size; - - int l4_hdr_sz = vnet_buffer2 (sb0)->gso_l4_hdr_sz; - u8 save_tcp_flags = 0; - u8 tcp_flags_no_fin_psh = 0; - u32 next_tcp_seq = 0; - - tcp_header_t *tcp = - (tcp_header_t *) (sb0->data + vnet_buffer (sb0)->l4_hdr_offset); - next_tcp_seq = clib_net_to_host_u32 (tcp->seq_number); - /* store original flags for last packet and reset FIN and PSH */ - save_tcp_flags = tcp->flags; - tcp_flags_no_fin_psh = tcp->flags & ~(TCP_FLAG_FIN | TCP_FLAG_PSH); - tcp->checksum = 0; - - u32 default_bflags = - sb0->flags & ~(VNET_BUFFER_F_GSO | VLIB_BUFFER_NEXT_PRESENT); - u16 l234_sz = vnet_buffer (sb0)->l4_hdr_offset + l4_hdr_sz; - int first_data_size = clib_min (gso_size, sb0->current_length - l234_sz); - next_tcp_seq += first_data_size; - - if (PREDICT_FALSE (!tso_alloc_tx_bufs (vm, ptd, sb0, l4_hdr_sz))) - return 0; - - vlib_buffer_t *b0 = vlib_get_buffer (vm, ptd->split_buffers[0]); - tso_init_buf_from_template_base (b0, sb0, default_bflags, - l4_hdr_sz + first_data_size); - - u32 total_src_left = n_bytes_b0 - l234_sz - first_data_size; - if (total_src_left) - { - /* Need to copy more segments */ - u8 *src_ptr, *dst_ptr; - u16 src_left, dst_left; - /* current source buffer */ - vlib_buffer_t *csb0 = sb0; - u32 csbi0 = sbi0; - /* current dest buffer */ - vlib_buffer_t *cdb0; - u16 dbi = 1; /* the buffer [0] is b0 */ - - src_ptr = sb0->data + l234_sz + first_data_size; - src_left = sb0->current_length - l234_sz - first_data_size; - b0->current_length = l234_sz + first_data_size; - - tso_fixup_segmented_buf (b0, tcp_flags_no_fin_psh, is_ip6); - if (do_tx_offloads) - calc_checksums (vm, b0); - - /* grab a second buffer and prepare the loop */ - ASSERT (dbi < vec_len (ptd->split_buffers)); - cdb0 = vlib_get_buffer (vm, ptd->split_buffers[dbi++]); - tso_init_buf_from_template (vm, cdb0, b0, l234_sz, gso_size, &dst_ptr, - &dst_left, next_tcp_seq, default_bflags); - - /* an arbitrary large number to catch the runaway loops */ - int nloops = 2000; - while (total_src_left) - { - if (nloops-- <= 0) - clib_panic ("infinite loop detected"); - u16 bytes_to_copy = clib_min (src_left, dst_left); - - clib_memcpy_fast (dst_ptr, src_ptr, bytes_to_copy); - - src_left -= bytes_to_copy; - src_ptr += bytes_to_copy; - total_src_left -= bytes_to_copy; - dst_left -= bytes_to_copy; - dst_ptr += bytes_to_copy; - next_tcp_seq += bytes_to_copy; - cdb0->current_length += bytes_to_copy; - - if (0 == src_left) - { - int has_next = (csb0->flags & VLIB_BUFFER_NEXT_PRESENT); - u32 next_bi = csb0->next_buffer; - - /* init src to the next buffer in chain */ - if (has_next) - { - csbi0 = next_bi; - csb0 = vlib_get_buffer (vm, csbi0); - src_left = csb0->current_length; - src_ptr = csb0->data; - } - else - { - ASSERT (total_src_left == 0); - break; - } - } - if (0 == dst_left && total_src_left) - { - if (do_tx_offloads) - calc_checksums (vm, cdb0); - n_tx_bytes += cdb0->current_length; - ASSERT (dbi < vec_len (ptd->split_buffers)); - cdb0 = vlib_get_buffer (vm, ptd->split_buffers[dbi++]); - tso_init_buf_from_template (vm, cdb0, b0, l234_sz, - gso_size, &dst_ptr, &dst_left, - next_tcp_seq, default_bflags); - } - } - - tso_fixup_segmented_buf (cdb0, save_tcp_flags, is_ip6); - if (do_tx_offloads) - calc_checksums (vm, cdb0); - - n_tx_bytes += cdb0->current_length; - } - n_tx_bytes += b0->current_length; - return n_tx_bytes; -} - -static_always_inline void -drop_one_buffer_and_count (vlib_main_t * vm, vnet_main_t * vnm, - vlib_node_runtime_t * node, u32 * pbi0, - u32 drop_error_code) -{ - u32 thread_index = vm->thread_index; - vnet_interface_output_runtime_t *rt = (void *) node->runtime_data; - - 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, 1); - - vlib_error_drop_buffers (vm, node, pbi0, - /* buffer stride */ 1, - /* n_buffers */ 1, - VNET_INTERFACE_OUTPUT_NEXT_DROP, - node->node_index, drop_error_code); -} - static_always_inline uword -vnet_interface_output_node_inline_gso (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, - int do_segmentation) +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) { vnet_interface_output_runtime_t *rt = (void *) node->runtime_data; vnet_sw_interface_t *si; @@ -480,8 +237,7 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, u32 next_index = VNET_INTERFACE_OUTPUT_NEXT_TX; u32 current_config_index = ~0; u8 arc = im->output_feature_arc_index; - vnet_interface_per_thread_data_t *ptd = - vec_elt_at_index (im->per_thread_data, thread_index); + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs; n_buffers = frame->n_vectors; @@ -489,6 +245,7 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, 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, @@ -500,8 +257,7 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, 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 | - VNET_SW_INTERFACE_FLAG_BOND_SLAVE)) || + if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) || !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP)) { vlib_simple_counter_main_t *cm; @@ -545,15 +301,14 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, while (from + 8 <= from_end && n_left_to_tx >= 4) { u32 bi0, bi1, bi2, bi3; - vlib_buffer_t *b0, *b1, *b2, *b3; u32 tx_swif0, tx_swif1, tx_swif2, tx_swif3; u32 or_flags; /* Prefetch next iteration. */ - vlib_prefetch_buffer_with_index (vm, from[4], LOAD); - vlib_prefetch_buffer_with_index (vm, from[5], LOAD); - vlib_prefetch_buffer_with_index (vm, from[6], LOAD); - vlib_prefetch_buffer_with_index (vm, from[7], LOAD); + 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]; @@ -563,45 +318,28 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, to_tx[1] = bi1; to_tx[2] = bi2; to_tx[3] = bi3; - if (!do_segmentation) - { - from += 4; - to_tx += 4; - n_left_to_tx -= 4; - } - b0 = vlib_get_buffer (vm, bi0); - b1 = vlib_get_buffer (vm, bi1); - b2 = vlib_get_buffer (vm, bi2); - b3 = vlib_get_buffer (vm, bi3); + or_flags = b[0]->flags | b[1]->flags | b[2]->flags | b[3]->flags; - if (do_segmentation) - { - or_flags = b0->flags | b1->flags | b2->flags | b3->flags; - - /* go to single loop if we need TSO segmentation */ - if (PREDICT_FALSE (or_flags & VNET_BUFFER_F_GSO)) - break; - from += 4; - to_tx += 4; - n_left_to_tx -= 4; - } + from += 4; + to_tx += 4; + n_left_to_tx -= 4; /* Be grumpy about zero length buffers for benefit of driver tx function. */ - ASSERT (b0->current_length > 0); - ASSERT (b1->current_length > 0); - ASSERT (b2->current_length > 0); - ASSERT (b3->current_length > 0); - - n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0); - n_bytes_b1 = vlib_buffer_length_in_chain (vm, b1); - n_bytes_b2 = vlib_buffer_length_in_chain (vm, b2); - n_bytes_b3 = vlib_buffer_length_in_chain (vm, b3); - tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX]; - tx_swif1 = vnet_buffer (b1)->sw_if_index[VLIB_TX]; - tx_swif2 = vnet_buffer (b2)->sw_if_index[VLIB_TX]; - tx_swif3 = vnet_buffer (b3)->sw_if_index[VLIB_TX]; + 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; @@ -609,14 +347,14 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, if (PREDICT_FALSE (current_config_index != ~0)) { - vnet_buffer (b0)->feature_arc_index = arc; - vnet_buffer (b1)->feature_arc_index = arc; - vnet_buffer (b2)->feature_arc_index = arc; - vnet_buffer (b3)->feature_arc_index = arc; - b0->current_config_index = current_config_index; - b1->current_config_index = current_config_index; - b2->current_config_index = current_config_index; - b3->current_config_index = current_config_index; + vnet_buffer (b[0])->feature_arc_index = arc; + vnet_buffer (b[1])->feature_arc_index = arc; + vnet_buffer (b[2])->feature_arc_index = arc; + 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; } /* update vlan subif tx counts, if required */ @@ -654,9 +392,6 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, n_bytes_b3); } - if (!do_segmentation) - or_flags = b0->flags | b1->flags | b2->flags | b3->flags; - if (do_tx_offloads) { if (or_flags & @@ -664,18 +399,19 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, VNET_BUFFER_F_OFFLOAD_UDP_CKSUM | VNET_BUFFER_F_OFFLOAD_IP_CKSUM)) { - calc_checksums (vm, b0); - calc_checksums (vm, b1); - calc_checksums (vm, b2); - calc_checksums (vm, b3); + calc_checksums (vm, b[0]); + calc_checksums (vm, b[1]); + calc_checksums (vm, b[2]); + calc_checksums (vm, b[3]); } } + b += 4; + } while (from + 1 <= from_end && n_left_to_tx >= 1) { u32 bi0; - vlib_buffer_t *b0; u32 tx_swif0; bi0 = from[0]; @@ -684,100 +420,19 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, to_tx += 1; n_left_to_tx -= 1; - b0 = vlib_get_buffer (vm, bi0); - /* Be grumpy about zero length buffers for benefit of driver tx function. */ - ASSERT (b0->current_length > 0); + ASSERT (b[0]->current_length > 0); - n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0); - tx_swif0 = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + 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)) { - vnet_buffer (b0)->feature_arc_index = arc; - b0->current_config_index = current_config_index; - } - - if (do_segmentation) - { - if (PREDICT_FALSE (b0->flags & VNET_BUFFER_F_GSO)) - { - /* - * Undo the enqueue of the b0 - it is not going anywhere, - * and will be freed either after it's segmented or - * when dropped, if there is no buffers to segment into. - */ - to_tx -= 1; - n_left_to_tx += 1; - /* undo the counting. */ - n_bytes -= n_bytes_b0; - n_packets -= 1; - - u32 n_tx_bytes = 0; - - n_tx_bytes = - tso_segment_buffer (vm, ptd, do_tx_offloads, bi0, b0, - n_bytes_b0); - - if (PREDICT_FALSE (n_tx_bytes == 0)) - { - drop_one_buffer_and_count (vm, vnm, node, from - 1, - VNET_INTERFACE_OUTPUT_ERROR_NO_BUFFERS_FOR_GSO); - continue; - } - - u16 n_tx_bufs = vec_len (ptd->split_buffers); - u32 *from_tx_seg = ptd->split_buffers; - - while (n_tx_bufs > 0) - { - if (n_tx_bufs >= n_left_to_tx) - { - while (n_left_to_tx > 0) - { - to_tx[0] = from_tx_seg[0]; - to_tx += 1; - from_tx_seg += 1; - n_left_to_tx -= 1; - n_tx_bufs -= 1; - n_packets += 1; - } - vlib_put_next_frame (vm, node, next_index, - n_left_to_tx); - vlib_get_new_next_frame (vm, node, next_index, - to_tx, n_left_to_tx); - } - else - { - while (n_tx_bufs > 0) - { - to_tx[0] = from_tx_seg[0]; - to_tx += 1; - from_tx_seg += 1; - n_left_to_tx -= 1; - n_tx_bufs -= 1; - n_packets += 1; - } - } - } - n_bytes += n_tx_bytes; - 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, - _vec_len (ptd->split_buffers), n_tx_bytes); - } - /* The buffers were enqueued. Reset the length */ - _vec_len (ptd->split_buffers) = 0; - /* Free the now segmented buffer */ - vlib_buffer_free_one (vm, bi0); - continue; - } + 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)) @@ -790,7 +445,14 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm, } if (do_tx_offloads) - calc_checksums (vm, b0); + { + if (b[0]->flags & + (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM | + VNET_BUFFER_F_OFFLOAD_UDP_CKSUM | + VNET_BUFFER_F_OFFLOAD_IP_CKSUM)) + calc_checksums (vm, b[0]); + } + b += 1; } vlib_put_next_frame (vm, node, next_index, n_left_to_tx); @@ -811,8 +473,9 @@ static_always_inline void vnet_interface_pcap_tx_trace { u32 n_left_from, *from; u32 sw_if_index; + vnet_pcap_t *pp = &vlib_global_main.pcap; - if (PREDICT_TRUE (vm->pcap[VLIB_TX].pcap_enable == 0)) + if (PREDICT_TRUE (pp->pcap_tx_enable == 0)) return; if (sw_if_index_from_buffer == 0) @@ -828,50 +491,40 @@ static_always_inline void vnet_interface_pcap_tx_trace 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) + { + 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; + } if (sw_if_index_from_buffer) sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; - if (vm->pcap[VLIB_TX].pcap_sw_if_index == 0 || - vm->pcap[VLIB_TX].pcap_sw_if_index == sw_if_index) - pcap_add_buffer (&vm->pcap[VLIB_TX].pcap_main, vm, bi0, 512); - from++; - n_left_from--; + if (pp->pcap_sw_if_index == 0 || pp->pcap_sw_if_index == sw_if_index) + { + 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); + } } } #ifndef CLIB_MARCH_VARIANT -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) -{ - vnet_interface_pcap_tx_trace (vm, node, frame, - 0 /* sw_if_index_from_buffer */ ); - - /* - * The 3-headed "if" is here because we want to err on the side - * of not impacting the non-GSO performance - so for the more - * common case of no GSO interfaces we want to prevent the - * segmentation codepath from being there altogether. - */ - if (PREDICT_TRUE (vnm->interface_main.gso_interface_count == 0)) - return vnet_interface_output_node_inline_gso (vm, node, frame, vnm, hi, - do_tx_offloads, - /* do_segmentation */ 0); - else if (hi->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) - return vnet_interface_output_node_inline_gso (vm, node, frame, vnm, hi, - do_tx_offloads, - /* do_segmentation */ 0); - else - return vnet_interface_output_node_inline_gso (vm, node, frame, vnm, hi, - do_tx_offloads, - /* do_segmentation */ 1); -} uword vnet_interface_output_node (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -987,43 +640,28 @@ VLIB_NODE_FN (vnet_per_buffer_interface_output_node) (vlib_main_t * vm, return frame->n_vectors; } -always_inline u32 -counter_index (vlib_main_t * vm, vlib_error_t e) +typedef struct vnet_error_trace_t_ { - vlib_node_t *n; - u32 ci, ni; - - ni = vlib_error_get_node (e); - n = vlib_get_node (vm, ni); - - ci = vlib_error_get_code (e); - ASSERT (ci < n->n_errors); - - ci += n->error_heap_index; + u32 sw_if_index; +} vnet_error_trace_t; - return ci; -} static u8 * format_vnet_error_trace (u8 * s, va_list * va) { - vlib_main_t *vm = va_arg (*va, vlib_main_t *); + CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); - vlib_error_t *e = va_arg (*va, vlib_error_t *); - vlib_node_t *error_node; - vlib_error_main_t *em = &vm->error_main; - u32 i; + vnet_error_trace_t *t = va_arg (*va, vnet_error_trace_t *); - error_node = vlib_get_node (vm, vlib_error_get_node (e[0])); - i = counter_index (vm, e[0]); - s = format (s, "%v: %s", error_node->name, em->error_strings_heap[i]); + s = format (s, "rx:%U", format_vnet_sw_if_index_name, + vnet_get_main (), t->sw_if_index); return s; } static void -trace_errors_with_buffers (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +interface_trace_buffers (vlib_main_t * vm, + vlib_node_runtime_t * node, vlib_frame_t * frame) { u32 n_left, *buffers; @@ -1034,7 +672,7 @@ trace_errors_with_buffers (vlib_main_t * vm, { u32 bi0, bi1; vlib_buffer_t *b0, *b1; - vlib_error_t *t0, *t1; + vnet_error_trace_t *t0, *t1; /* Prefetch next iteration. */ vlib_prefetch_buffer_with_index (vm, buffers[2], LOAD); @@ -1049,12 +687,12 @@ trace_errors_with_buffers (vlib_main_t * vm, if (b0->flags & VLIB_BUFFER_IS_TRACED) { t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); - t0[0] = b0->error; + t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; } if (b1->flags & VLIB_BUFFER_IS_TRACED) { t1 = vlib_add_trace (vm, node, b1, sizeof (t1[0])); - t1[0] = b1->error; + t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX]; } buffers += 2; n_left -= 2; @@ -1064,7 +702,7 @@ trace_errors_with_buffers (vlib_main_t * vm, { u32 bi0; vlib_buffer_t *b0; - vlib_error_t *t0; + vnet_error_trace_t *t0; bi0 = buffers[0]; @@ -1073,52 +711,13 @@ trace_errors_with_buffers (vlib_main_t * vm, if (b0->flags & VLIB_BUFFER_IS_TRACED) { t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0])); - t0[0] = b0->error; + t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; } buffers += 1; n_left -= 1; } } -static u8 * -validate_error (vlib_main_t * vm, vlib_error_t * e, u32 index) -{ - uword node_index = vlib_error_get_node (e[0]); - uword code = vlib_error_get_code (e[0]); - vlib_node_t *n; - - if (node_index >= vec_len (vm->node_main.nodes)) - return format (0, "[%d], node index out of range 0x%x, error 0x%x", - index, node_index, e[0]); - - n = vlib_get_node (vm, node_index); - if (code >= n->n_errors) - return format (0, "[%d], code %d out of range for node %v", - index, code, n->name); - - return 0; -} - -static u8 * -validate_error_frame (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * f) -{ - u32 *buffers = vlib_frame_vector_args (f); - vlib_buffer_t *b; - u8 *msg = 0; - uword i; - - for (i = 0; i < f->n_vectors; i++) - { - b = vlib_get_buffer (vm, buffers[i]); - msg = validate_error (vm, &b->error, i); - if (msg) - return msg; - } - - return msg; -} - typedef enum { VNET_ERROR_DISPOSITION_DROP, @@ -1126,213 +725,102 @@ typedef enum VNET_ERROR_N_DISPOSITION, } vnet_error_disposition_t; -always_inline void -do_packet (vlib_main_t * vm, vlib_error_t a) -{ - vlib_error_main_t *em = &vm->error_main; - u32 i = counter_index (vm, a); - em->counters[i] += 1; - vlib_error_elog_count (vm, i, 1); -} - static_always_inline uword -process_drop_punt (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, vnet_error_disposition_t disposition) +interface_drop_punt (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame, + vnet_error_disposition_t disposition) { - vnet_main_t *vnm = vnet_get_main (); - vlib_error_main_t *em = &vm->error_main; - u32 *buffers, *first_buffer; - vlib_error_t current_error; - u32 current_counter_index, n_errors_left; - u32 current_sw_if_index, n_errors_current_sw_if_index; - u64 current_counter; + u32 *from, n_left, thread_index, *sw_if_index; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; + u32 sw_if_indices[VLIB_FRAME_SIZE]; vlib_simple_counter_main_t *cm; - u32 thread_index = vm->thread_index; - - static vlib_error_t memory[VNET_ERROR_N_DISPOSITION]; - static char memory_init[VNET_ERROR_N_DISPOSITION]; - - buffers = vlib_frame_vector_args (frame); - first_buffer = buffers; + u16 nexts[VLIB_FRAME_SIZE]; + vnet_main_t *vnm; - { - vlib_buffer_t *b = vlib_get_buffer (vm, first_buffer[0]); - - if (!memory_init[disposition]) - { - memory_init[disposition] = 1; - memory[disposition] = b->error; - } - - current_sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX]; - n_errors_current_sw_if_index = 0; - } + vnm = vnet_get_main (); + thread_index = vm->thread_index; + from = vlib_frame_vector_args (frame); + n_left = frame->n_vectors; + b = bufs; + sw_if_index = sw_if_indices; - current_error = memory[disposition]; - current_counter_index = counter_index (vm, memory[disposition]); - current_counter = em->counters[current_counter_index]; + vlib_get_buffers (vm, from, bufs, n_left); if (node->flags & VLIB_NODE_FLAG_TRACE) - trace_errors_with_buffers (vm, node, frame); + interface_trace_buffers (vm, node, frame); + + /* All going to drop regardless, this is just a counting exercise */ + clib_memset (nexts, 0, sizeof (nexts)); - n_errors_left = frame->n_vectors; cm = vec_elt_at_index (vnm->interface_main.sw_if_counters, (disposition == VNET_ERROR_DISPOSITION_PUNT ? VNET_INTERFACE_COUNTER_PUNT : VNET_INTERFACE_COUNTER_DROP)); - while (n_errors_left >= 2) + /* collect the array of interfaces first ... */ + while (n_left >= 4) { - vlib_buffer_t *b0, *b1; - vnet_sw_interface_t *sw_if0, *sw_if1; - vlib_error_t e0, e1; - u32 bi0, bi1; - u32 sw_if_index0, sw_if_index1; - - bi0 = buffers[0]; - bi1 = buffers[1]; - - buffers += 2; - n_errors_left -= 2; - - b0 = vlib_get_buffer (vm, bi0); - b1 = vlib_get_buffer (vm, bi1); - - e0 = b0->error; - e1 = b1->error; - - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX]; - - /* Speculate that sw_if_index == sw_if_index[01]. */ - n_errors_current_sw_if_index += 2; - - /* Speculatively assume all 2 (node, code) pairs are equal - to current (node, code). */ - current_counter += 2; - - if (PREDICT_FALSE (e0 != current_error - || e1 != current_error - || sw_if_index0 != current_sw_if_index - || sw_if_index1 != current_sw_if_index)) + if (n_left >= 12) { - current_counter -= 2; - n_errors_current_sw_if_index -= 2; - - vlib_increment_simple_counter (cm, thread_index, sw_if_index0, 1); - vlib_increment_simple_counter (cm, thread_index, sw_if_index1, 1); - - /* Increment super-interface drop/punt counters for - sub-interfaces. */ - sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0); - vlib_increment_simple_counter - (cm, thread_index, sw_if0->sup_sw_if_index, - sw_if0->sup_sw_if_index != sw_if_index0); - - sw_if1 = vnet_get_sw_interface (vnm, sw_if_index1); - vlib_increment_simple_counter - (cm, thread_index, sw_if1->sup_sw_if_index, - sw_if1->sup_sw_if_index != sw_if_index1); - - em->counters[current_counter_index] = current_counter; - do_packet (vm, e0); - do_packet (vm, e1); - - /* For 2 repeated errors, change current error. */ - if (e0 == e1 && e1 != current_error) - { - current_error = e0; - current_counter_index = counter_index (vm, e0); - } - current_counter = em->counters[current_counter_index]; + /* Prefetch 8 ahead - there's not much going on in each 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); } + sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; + sw_if_index[1] = vnet_buffer (b[1])->sw_if_index[VLIB_RX]; + sw_if_index[2] = vnet_buffer (b[2])->sw_if_index[VLIB_RX]; + sw_if_index[3] = vnet_buffer (b[3])->sw_if_index[VLIB_RX]; + + sw_if_index += 4; + n_left -= 4; + b += 4; } - - while (n_errors_left >= 1) + while (n_left) { - vlib_buffer_t *b0; - vnet_sw_interface_t *sw_if0; - vlib_error_t e0; - u32 bi0, sw_if_index0; - - bi0 = buffers[0]; - - buffers += 1; - n_errors_left -= 1; - current_counter += 1; - - b0 = vlib_get_buffer (vm, bi0); - e0 = b0->error; - - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - - /* Increment drop/punt counters. */ - vlib_increment_simple_counter (cm, thread_index, sw_if_index0, 1); - - /* Increment super-interface drop/punt counters for sub-interfaces. */ - sw_if0 = vnet_get_sw_interface (vnm, sw_if_index0); - vlib_increment_simple_counter (cm, thread_index, - sw_if0->sup_sw_if_index, - sw_if0->sup_sw_if_index != sw_if_index0); - - if (PREDICT_FALSE (e0 != current_error)) - { - current_counter -= 1; + sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; - vlib_error_elog_count (vm, current_counter_index, - (current_counter - - em->counters[current_counter_index])); - - em->counters[current_counter_index] = current_counter; - - do_packet (vm, e0); - current_error = e0; - current_counter_index = counter_index (vm, e0); - current_counter = em->counters[current_counter_index]; - } + sw_if_index += 1; + n_left -= 1; + b += 1; } - if (n_errors_current_sw_if_index > 0) - { - vnet_sw_interface_t *si; - - vlib_increment_simple_counter (cm, thread_index, current_sw_if_index, - n_errors_current_sw_if_index); + /* ... then count against them in blocks */ + n_left = frame->n_vectors; - si = vnet_get_sw_interface (vnm, current_sw_if_index); - if (si->sup_sw_if_index != current_sw_if_index) - vlib_increment_simple_counter (cm, thread_index, si->sup_sw_if_index, - n_errors_current_sw_if_index); - } + while (n_left) + { + vnet_sw_interface_t *sw_if0; + u16 off, count; - vlib_error_elog_count (vm, current_counter_index, - (current_counter - - em->counters[current_counter_index])); + off = frame->n_vectors - n_left; - /* Return cached counter. */ - em->counters[current_counter_index] = current_counter; + sw_if_index = sw_if_indices + off; - /* Save memory for next iteration. */ - memory[disposition] = current_error; + count = clib_count_equal_u32 (sw_if_index, n_left); + n_left -= count; - if (disposition == VNET_ERROR_DISPOSITION_DROP || !vm->os_punt_frame) - { - vlib_buffer_free (vm, first_buffer, frame->n_vectors); + vlib_increment_simple_counter (cm, thread_index, sw_if_index[0], count); - /* If there is no punt function, free the frame as well. */ - if (disposition == VNET_ERROR_DISPOSITION_PUNT && !vm->os_punt_frame) - vlib_frame_free (vm, node, frame); + /* Increment super-interface drop/punt counters for + sub-interfaces. */ + sw_if0 = vnet_get_sw_interface (vnm, sw_if_index[0]); + if (sw_if0->sup_sw_if_index != sw_if_index[0]) + vlib_increment_simple_counter + (cm, thread_index, sw_if0->sup_sw_if_index, count); } - else - vm->os_punt_frame (vm, node, frame); + + vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors); return frame->n_vectors; } static inline void pcap_drop_trace (vlib_main_t * vm, - vnet_interface_main_t * im, vlib_frame_t * f) + vnet_interface_main_t * im, + vnet_pcap_t * pp, vlib_frame_t * f) { u32 *from; u32 n_left = f->n_vectors; @@ -1340,6 +828,9 @@ pcap_drop_trace (vlib_main_t * vm, u32 bi0; 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); @@ -1361,20 +852,93 @@ 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 (PREDICT_FALSE + (do_trace == 0 && pp->filter_classify_table_index != ~0)) + { + do_trace = vnet_is_packet_traced_inline + (b0, pp->filter_classify_table_index, 0 /* full classify */ ); + } + /* Trace all drops, or drops received on a specific interface */ - if (im->pcap_sw_if_index == 0 || - im->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX]) + if (do_trace) { 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->current_data > 0) + 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); - pcap_add_buffer (&im->pcap_main, vm, bi0, 512); + { + 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; + } + } + + /* + * 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; @@ -1398,41 +962,47 @@ vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add) } #endif /* CLIB_MARCH_VARIANT */ -VLIB_NODE_FN (drop_buffers) (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (interface_drop) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { vnet_interface_main_t *im = &vnet_get_main ()->interface_main; + vnet_pcap_t *pp = &vlib_global_main.pcap; - if (PREDICT_FALSE (im->drop_pcap_enable)) - pcap_drop_trace (vm, im, frame); + if (PREDICT_FALSE (pp->pcap_drop_enable)) + pcap_drop_trace (vm, im, pp, frame); - return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_DROP); + return interface_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_DROP); } -VLIB_NODE_FN (punt_buffers) (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (interface_punt) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { - return process_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_PUNT); + return interface_drop_punt (vm, node, frame, VNET_ERROR_DISPOSITION_PUNT); } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (drop_buffers) = { +VLIB_REGISTER_NODE (interface_drop) = { .name = "error-drop", - .flags = VLIB_NODE_FLAG_IS_DROP, .vector_size = sizeof (u32), .format_trace = format_vnet_error_trace, - .validate_frame = validate_error_frame, + .n_next_nodes = 1, + .next_nodes = { + [0] = "drop", + }, }; /* *INDENT-ON* */ /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (punt_buffers) = { - .flags = (VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH - | VLIB_NODE_FLAG_IS_PUNT), +VLIB_REGISTER_NODE (interface_punt) = { .name = "error-punt", .vector_size = sizeof (u32), .format_trace = format_vnet_error_trace, - .validate_frame = validate_error_frame, + .n_next_nodes = 1, + .next_nodes = { + [0] = "punt", + }, }; /* *INDENT-ON* */ @@ -1443,37 +1013,6 @@ VLIB_REGISTER_NODE (vnet_per_buffer_interface_output_node) = { }; /* *INDENT-ON* */ -/* Convenience node to drop a vector of buffers with a "misc error". */ -static uword -misc_drop_buffers (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - return vlib_error_drop_buffers (vm, node, vlib_frame_vector_args (frame), - /* buffer stride */ 1, - frame->n_vectors, - /* next */ 0, - node->node_index, - /* error */ 0); -} - -static char *misc_drop_buffers_error_strings[] = { - [0] = "misc. errors", -}; - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (misc_drop_buffers_node,static) = { - .function = misc_drop_buffers, - .name = "misc-drop-buffers", - .vector_size = sizeof (u32), - .n_errors = 1, - .n_next_nodes = 1, - .next_nodes = { - "error-drop", - }, - .error_strings = misc_drop_buffers_error_strings, -}; -/* *INDENT-ON* */ - static uword interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) @@ -1521,7 +1060,7 @@ interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (interface_tx, static) = { +VLIB_REGISTER_NODE (interface_tx) = { .function = interface_tx_node_fn, .name = "interface-tx", .vector_size = sizeof (u32), @@ -1594,140 +1133,6 @@ vnet_set_interface_output_node (vnet_main_t * vnm, } #endif /* CLIB_MARCH_VARIANT */ -static clib_error_t * -pcap_drop_trace_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - vnet_main_t *vnm = vnet_get_main (); - vnet_interface_main_t *im = &vnm->interface_main; - u8 *filename; - u32 max; - int matched = 0; - clib_error_t *error = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "on")) - { - if (im->drop_pcap_enable == 0) - { - if (im->pcap_filename == 0) - im->pcap_filename = format (0, "/tmp/drop.pcap%c", 0); - - clib_memset (&im->pcap_main, 0, sizeof (im->pcap_main)); - im->pcap_main.file_name = (char *) im->pcap_filename; - im->pcap_main.n_packets_to_capture = 100; - if (im->pcap_pkts_to_capture) - im->pcap_main.n_packets_to_capture = im->pcap_pkts_to_capture; - - im->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet; - im->drop_pcap_enable = 1; - matched = 1; - vlib_cli_output (vm, "pcap drop capture on..."); - } - else - { - vlib_cli_output (vm, "pcap drop capture already on..."); - } - matched = 1; - } - else if (unformat (input, "off")) - { - matched = 1; - - if (im->drop_pcap_enable) - { - vlib_cli_output (vm, "captured %d pkts...", - im->pcap_main.n_packets_captured); - if (im->pcap_main.n_packets_captured) - { - im->pcap_main.n_packets_to_capture = - im->pcap_main.n_packets_captured; - error = pcap_write (&im->pcap_main); - if (error) - clib_error_report (error); - else - vlib_cli_output (vm, "saved to %s...", im->pcap_filename); - } - } - else - { - vlib_cli_output (vm, "pcap drop capture already off..."); - } - - im->drop_pcap_enable = 0; - } - else if (unformat (input, "max %d", &max)) - { - im->pcap_pkts_to_capture = max; - matched = 1; - } - - else if (unformat (input, "intfc %U", - unformat_vnet_sw_interface, vnm, - &im->pcap_sw_if_index)) - matched = 1; - else if (unformat (input, "intfc any")) - { - im->pcap_sw_if_index = 0; - matched = 1; - } - else if (unformat (input, "file %s", &filename)) - { - u8 *chroot_filename; - /* Brain-police user path input */ - if (strstr ((char *) filename, "..") - || index ((char *) filename, '/')) - { - vlib_cli_output (vm, "illegal characters in filename '%s'", - filename); - continue; - } - - chroot_filename = format (0, "/tmp/%s%c", filename, 0); - vec_free (filename); - - if (im->pcap_filename) - vec_free (im->pcap_filename); - im->pcap_filename = chroot_filename; - im->pcap_main.file_name = (char *) im->pcap_filename; - matched = 1; - } - else if (unformat (input, "status")) - { - if (im->drop_pcap_enable == 0) - { - vlib_cli_output (vm, "pcap drop capture is off..."); - continue; - } - - vlib_cli_output (vm, "pcap drop capture: %d of %d pkts...", - im->pcap_main.n_packets_captured, - im->pcap_main.n_packets_to_capture); - matched = 1; - } - - else - break; - } - - if (matched == 0) - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); - - return 0; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (pcap_trace_command, static) = { - .path = "pcap drop trace", - .short_help = - "pcap drop trace on off max intfc file status", - .function = pcap_drop_trace_command_fn, -}; -/* *INDENT-ON* */ - /* * fd.io coding-style-patch-verification: ON *