X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_output.c;h=5b445fa516537e23579d92b92e818c1d3249822d;hb=0c4931cb351929a1ccdb6b29431def3705f101d7;hp=e3228c07fa19bf04b64ba7ed8950b0b8becfefaa;hpb=2a7ea2ee92d6dc4800ee21323d3324a9e8449dcf;p=vpp.git diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index e3228c07fa1..5b445fa5165 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -14,7 +14,10 @@ */ #include +#include #include +#include +#include typedef enum _tcp_output_next { @@ -37,8 +40,8 @@ typedef enum _tcp_output_next _ (IP_REWRITE, "ip6-rewrite") \ _ (IP_ARP, "ip6-discover-neighbor") -static char *tcp_error_strings[] = { -#define tcp_error(n,s) s, +static vlib_error_desc_t tcp_output_error_counters[] = { +#define tcp_error(f, n, s, d) { #n, d, VL_COUNTER_SEVERITY_##s }, #include #undef tcp_error }; @@ -55,12 +58,12 @@ format_tcp_tx_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); tcp_tx_trace_t *t = va_arg (*args, tcp_tx_trace_t *); + tcp_connection_t *tc = &t->tcp_connection; u32 indent = format_get_indent (s); - s = format (s, "%U\n%U%U", - format_tcp_header, &t->tcp_header, 128, - format_white_space, indent, - format_tcp_connection, &t->tcp_connection, 1); + s = format (s, "%U state %U\n%U%U", format_tcp_connection_id, tc, + format_tcp_state, tc->state, format_white_space, indent, + format_tcp_header, &t->tcp_header, 128); return s; } @@ -115,17 +118,10 @@ tcp_update_rcv_wnd (tcp_connection_t * tc) u32 available_space, wnd; i32 observed_wnd; - ASSERT (tc->rcv_opts.mss < transport_rx_fifo_size (&tc->connection)); - /* * Figure out how much space we have available */ available_space = transport_max_rx_enqueue (&tc->connection); - if (PREDICT_FALSE (available_space < tc->rcv_opts.mss)) - { - tc->rcv_wnd = 0; - return; - } /* * Use the above and what we know about what we've previously advertised @@ -133,24 +129,22 @@ tcp_update_rcv_wnd (tcp_connection_t * tc) */ observed_wnd = (i32) tc->rcv_wnd - (tc->rcv_nxt - tc->rcv_las); - /* Bad. Thou shalt not shrink */ + /* Check if we are about to retract the window. Do the comparison before + * rounding to avoid errors. Per RFC7323 sec. 2.4 we could remove this */ if (PREDICT_FALSE ((i32) available_space < observed_wnd)) { - wnd = clib_max (observed_wnd, 0); + wnd = round_down_pow2 (clib_max (observed_wnd, 0), 1 << tc->rcv_wscale); TCP_EVT (TCP_EVT_RCV_WND_SHRUNK, tc, observed_wnd, available_space); } else { - wnd = available_space; + /* Make sure we have a multiple of 1 << rcv_wscale. We round down to + * avoid advertising a window larger than what can be buffered */ + wnd = round_down_pow2 (available_space, 1 << tc->rcv_wscale); } - /* Make sure we have a multiple of rcv_wscale */ - if (wnd && tc->rcv_wscale) - { - wnd &= ~((1 << tc->rcv_wscale) - 1); - if (wnd == 0) - wnd = 1 << tc->rcv_wscale; - } + if (PREDICT_FALSE (wnd < tc->rcv_opts.mss)) + wnd = 0; tc->rcv_wnd = clib_min (wnd, TCP_WND_MAX << tc->rcv_wscale); } @@ -168,90 +162,6 @@ tcp_window_to_advertise (tcp_connection_t * tc, tcp_state_t state) return tc->rcv_wnd >> tc->rcv_wscale; } -/** - * Write TCP options to segment. - */ -static u32 -tcp_options_write (u8 * data, tcp_options_t * opts) -{ - u32 opts_len = 0; - u32 buf, seq_len = 4; - - if (tcp_opts_mss (opts)) - { - *data++ = TCP_OPTION_MSS; - *data++ = TCP_OPTION_LEN_MSS; - buf = clib_host_to_net_u16 (opts->mss); - clib_memcpy_fast (data, &buf, sizeof (opts->mss)); - data += sizeof (opts->mss); - opts_len += TCP_OPTION_LEN_MSS; - } - - if (tcp_opts_wscale (opts)) - { - *data++ = TCP_OPTION_WINDOW_SCALE; - *data++ = TCP_OPTION_LEN_WINDOW_SCALE; - *data++ = opts->wscale; - opts_len += TCP_OPTION_LEN_WINDOW_SCALE; - } - - if (tcp_opts_sack_permitted (opts)) - { - *data++ = TCP_OPTION_SACK_PERMITTED; - *data++ = TCP_OPTION_LEN_SACK_PERMITTED; - opts_len += TCP_OPTION_LEN_SACK_PERMITTED; - } - - if (tcp_opts_tstamp (opts)) - { - *data++ = TCP_OPTION_TIMESTAMP; - *data++ = TCP_OPTION_LEN_TIMESTAMP; - buf = clib_host_to_net_u32 (opts->tsval); - clib_memcpy_fast (data, &buf, sizeof (opts->tsval)); - data += sizeof (opts->tsval); - buf = clib_host_to_net_u32 (opts->tsecr); - clib_memcpy_fast (data, &buf, sizeof (opts->tsecr)); - data += sizeof (opts->tsecr); - opts_len += TCP_OPTION_LEN_TIMESTAMP; - } - - if (tcp_opts_sack (opts)) - { - int i; - - if (opts->n_sack_blocks != 0) - { - *data++ = TCP_OPTION_SACK_BLOCK; - *data++ = 2 + opts->n_sack_blocks * TCP_OPTION_LEN_SACK_BLOCK; - for (i = 0; i < opts->n_sack_blocks; i++) - { - buf = clib_host_to_net_u32 (opts->sacks[i].start); - clib_memcpy_fast (data, &buf, seq_len); - data += seq_len; - buf = clib_host_to_net_u32 (opts->sacks[i].end); - clib_memcpy_fast (data, &buf, seq_len); - data += seq_len; - } - opts_len += 2 + opts->n_sack_blocks * TCP_OPTION_LEN_SACK_BLOCK; - } - } - - /* Terminate TCP options */ - if (opts_len % 4) - { - *data++ = TCP_OPTION_EOL; - opts_len += TCP_OPTION_LEN_EOL; - } - - /* Pad with zeroes to a u32 boundary */ - while (opts_len % 4) - { - *data++ = TCP_OPTION_NOOP; - opts_len += TCP_OPTION_LEN_NOOP; - } - return opts_len; -} - static int tcp_make_syn_options (tcp_connection_t * tc, tcp_options_t * opts) { @@ -266,7 +176,7 @@ tcp_make_syn_options (tcp_connection_t * tc, tcp_options_t * opts) len += TCP_OPTION_LEN_WINDOW_SCALE; opts->flags |= TCP_OPTS_FLAG_TSTAMP; - opts->tsval = tcp_time_now (); + opts->tsval = tcp_time_tstamp (tc->c_thread_index); opts->tsecr = 0; len += TCP_OPTION_LEN_TIMESTAMP; @@ -300,7 +210,7 @@ tcp_make_synack_options (tcp_connection_t * tc, tcp_options_t * opts) if (tcp_opts_tstamp (&tc->rcv_opts)) { opts->flags |= TCP_OPTS_FLAG_TSTAMP; - opts->tsval = tcp_time_now (); + opts->tsval = tcp_time_tstamp (tc->c_thread_index); opts->tsecr = tc->tsval_recent; len += TCP_OPTION_LEN_TIMESTAMP; } @@ -406,12 +316,19 @@ tcp_update_burst_snd_vars (tcp_connection_t * tc) tcp_update_rcv_wnd (tc); if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) - tc->flags |= TCP_CONN_TRACK_BURST; + tcp_bt_check_app_limited (tc); if (tc->snd_una == tc->snd_nxt) { tcp_cc_event (tc, TCP_CC_EVT_START_TX); - tcp_connection_tx_pacer_reset (tc, tc->cwnd, TRANSPORT_PACER_MIN_MSS); + tcp_connection_tx_pacer_reset (tc, tc->cwnd, TRANSPORT_PACER_MIN_BURST); + } + + if (tc->flags & TCP_CONN_PSH_PENDING) + { + u32 max_deq = transport_max_tx_dequeue (&tc->connection); + /* Last byte marked for push */ + tc->psh_seq = tc->snd_una + max_deq - 1; } } @@ -428,7 +345,7 @@ tcp_reuse_buffer (vlib_main_t * vm, vlib_buffer_t * b) b->current_length = 0; b->total_length_not_including_first_buffer = 0; vnet_buffer (b)->tcp.flags = 0; - + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b); /* Leave enough space for headers */ return vlib_buffer_make_headroom (b, TRANSPORT_MAX_HDRS_LEN); } @@ -442,7 +359,6 @@ tcp_init_buffer (vlib_main_t * vm, vlib_buffer_t * b) b->total_length_not_including_first_buffer = 0; b->current_data = 0; vnet_buffer (b)->tcp.flags = 0; - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b); /* Leave enough space for headers */ return vlib_buffer_make_headroom (b, TRANSPORT_MAX_HDRS_LEN); } @@ -513,7 +429,7 @@ tcp_compute_checksum (tcp_connection_t * tc, vlib_buffer_t * b) } else { - b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; + vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TCP_CKSUM); } return checksum; } @@ -546,7 +462,10 @@ tcp_make_ack_i (tcp_connection_t * tc, vlib_buffer_t * b, tcp_state_t state, vnet_buffer (b)->tcp.connection_index = tc->c_c_index; if (wnd == 0) - tcp_zero_rwnd_sent_on (tc); + { + transport_rx_fifo_req_deq_ntf (&tc->connection); + tcp_zero_rwnd_sent_on (tc); + } else tcp_zero_rwnd_sent_off (tc); } @@ -565,7 +484,7 @@ tcp_make_ack (tcp_connection_t * tc, vlib_buffer_t * b) /** * Convert buffer to FIN-ACK */ -void +static void tcp_make_fin (tcp_connection_t * tc, vlib_buffer_t * b) { tcp_make_ack_i (tc, b, TCP_STATE_ESTABLISHED, TCP_FLAG_FIN | TCP_FLAG_ACK); @@ -600,7 +519,7 @@ tcp_make_syn (tcp_connection_t * tc, vlib_buffer_t * b) /** * Convert buffer to SYN-ACK */ -void +static void tcp_make_synack (tcp_connection_t * tc, vlib_buffer_t * b) { tcp_options_t _snd_opts, *snd_opts = &_snd_opts; @@ -622,146 +541,105 @@ tcp_make_synack (tcp_connection_t * tc, vlib_buffer_t * b) th->checksum = tcp_compute_checksum (tc, b); } -always_inline void -tcp_enqueue_to_ip_lookup_i (tcp_worker_ctx_t * wrk, vlib_buffer_t * b, u32 bi, - u8 is_ip4, u32 fib_index, u8 flush) +static void +tcp_enqueue_half_open (tcp_worker_ctx_t *wrk, tcp_connection_t *tc, + vlib_buffer_t *b, u32 bi) { vlib_main_t *vm = wrk->vm; - u32 *to_next, next_index; - vlib_frame_t *f; b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; b->error = 0; - vnet_buffer (b)->sw_if_index[VLIB_TX] = fib_index; - vnet_buffer (b)->sw_if_index[VLIB_RX] = 0; + session_add_pending_tx_buffer (vm->thread_index, bi, + wrk->tco_next_node[!tc->c_is_ip4]); - /* Send to IP lookup */ - next_index = is_ip4 ? ip4_lookup_node.index : ip6_lookup_node.index; - tcp_trajectory_add_start (b, 1); - - f = wrk->ip_lookup_tx_frames[!is_ip4]; - if (!f) - { - f = vlib_get_frame_to_node (vm, next_index); - ASSERT (f); - wrk->ip_lookup_tx_frames[!is_ip4] = f; - } - - to_next = vlib_frame_vector_args (f); - to_next[f->n_vectors] = bi; - f->n_vectors += 1; - if (flush || f->n_vectors == VLIB_FRAME_SIZE) - { - vlib_put_frame_to_node (vm, next_index, f); - wrk->ip_lookup_tx_frames[!is_ip4] = 0; - } -} - -static void -tcp_enqueue_to_ip_lookup_now (tcp_worker_ctx_t * wrk, vlib_buffer_t * b, - u32 bi, u8 is_ip4, u32 fib_index) -{ - tcp_enqueue_to_ip_lookup_i (wrk, b, bi, is_ip4, fib_index, 1); -} - -static void -tcp_enqueue_to_ip_lookup (tcp_worker_ctx_t * wrk, vlib_buffer_t * b, u32 bi, - u8 is_ip4, u32 fib_index) -{ - tcp_enqueue_to_ip_lookup_i (wrk, b, bi, is_ip4, fib_index, 0); - if (wrk->vm->thread_index == 0 && vlib_num_workers ()) - session_flush_frames_main_thread (wrk->vm); + if (vm->thread_index == 0 && vlib_num_workers ()) + session_queue_run_on_main_thread (vm); } static void tcp_enqueue_to_output (tcp_worker_ctx_t * wrk, vlib_buffer_t * b, u32 bi, u8 is_ip4) { - session_type_t st; - b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; b->error = 0; - st = session_type_from_proto_and_ip (TRANSPORT_PROTO_TCP, is_ip4); - session_add_pending_tx_buffer (st, wrk->vm->thread_index, bi); + session_add_pending_tx_buffer (wrk->vm->thread_index, bi, + wrk->tco_next_node[!is_ip4]); } #endif /* CLIB_MARCH_VARIANT */ static int -tcp_make_reset_in_place (vlib_main_t * vm, vlib_buffer_t * b0, - tcp_state_t state, u8 thread_index, u8 is_ip4) +tcp_make_reset_in_place (vlib_main_t * vm, vlib_buffer_t * b, u8 is_ip4) { ip4_header_t *ih4; ip6_header_t *ih6; - tcp_header_t *th0; - ip4_address_t src_ip40, dst_ip40; - ip6_address_t src_ip60, dst_ip60; + tcp_header_t *th; + ip4_address_t src_ip4, dst_ip4; + ip6_address_t src_ip6, dst_ip6; u16 src_port, dst_port; - u32 tmp; - u32 seq, ack; + u32 tmp, len, seq, ack; u8 flags; /* Find IP and TCP headers */ - th0 = tcp_buffer_hdr (b0); + th = tcp_buffer_hdr (b); /* Save src and dst ip */ if (is_ip4) { - ih4 = vlib_buffer_get_current (b0); + ih4 = vlib_buffer_get_current (b); ASSERT ((ih4->ip_version_and_header_length & 0xF0) == 0x40); - src_ip40.as_u32 = ih4->src_address.as_u32; - dst_ip40.as_u32 = ih4->dst_address.as_u32; + src_ip4.as_u32 = ih4->src_address.as_u32; + dst_ip4.as_u32 = ih4->dst_address.as_u32; } else { - ih6 = vlib_buffer_get_current (b0); + ih6 = vlib_buffer_get_current (b); ASSERT ((ih6->ip_version_traffic_class_and_flow_label & 0xF0) == 0x60); - clib_memcpy_fast (&src_ip60, &ih6->src_address, sizeof (ip6_address_t)); - clib_memcpy_fast (&dst_ip60, &ih6->dst_address, sizeof (ip6_address_t)); + clib_memcpy_fast (&src_ip6, &ih6->src_address, sizeof (ip6_address_t)); + clib_memcpy_fast (&dst_ip6, &ih6->dst_address, sizeof (ip6_address_t)); } - src_port = th0->src_port; - dst_port = th0->dst_port; + src_port = th->src_port; + dst_port = th->dst_port; + flags = TCP_FLAG_RST; - /* Try to determine what/why we're actually resetting */ - if (state == TCP_STATE_CLOSED) + /* + * RFC 793. If the ACK bit is off, sequence number zero is used, + * + * If the ACK bit is on, + * + */ + if (tcp_ack (th)) { - if (!tcp_syn (th0)) - return -1; - - tmp = clib_net_to_host_u32 (th0->seq_number); - - /* Got a SYN for no listener. */ - flags = TCP_FLAG_RST | TCP_FLAG_ACK; - ack = clib_host_to_net_u32 (tmp + 1); - seq = 0; + seq = th->ack_number; + ack = 0; } else { - flags = TCP_FLAG_RST; - seq = th0->ack_number; - ack = 0; + flags |= TCP_FLAG_ACK; + tmp = clib_net_to_host_u32 (th->seq_number); + len = vnet_buffer (b)->tcp.data_len + tcp_is_syn (th) + tcp_is_fin (th); + ack = clib_host_to_net_u32 (tmp + len); + seq = 0; } - tcp_reuse_buffer (vm, b0); - tcp_trajectory_add_start (b0, 4); - th0 = vlib_buffer_push_tcp_net_order (b0, dst_port, src_port, seq, ack, - sizeof (tcp_header_t), flags, 0); + tcp_reuse_buffer (vm, b); + th = vlib_buffer_push_tcp_net_order (b, dst_port, src_port, seq, ack, + sizeof (tcp_header_t), flags, 0); if (is_ip4) { - ih4 = vlib_buffer_push_ip4 (vm, b0, &dst_ip40, &src_ip40, + ih4 = vlib_buffer_push_ip4 (vm, b, &dst_ip4, &src_ip4, IP_PROTOCOL_TCP, 1); - th0->checksum = ip4_tcp_udp_compute_checksum (vm, b0, ih4); + th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ih4); } else { int bogus = ~0; - ih6 = vlib_buffer_push_ip6 (vm, b0, &dst_ip60, &src_ip60, - IP_PROTOCOL_TCP); - th0->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b0, ih6, &bogus); + ih6 = vlib_buffer_push_ip6 (vm, b, &dst_ip6, &src_ip6, IP_PROTOCOL_TCP); + th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ih6, &bogus); ASSERT (!bogus); } @@ -781,21 +659,19 @@ tcp_send_reset_w_pkt (tcp_connection_t * tc, vlib_buffer_t * pkt, tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); vlib_main_t *vm = wrk->vm; vlib_buffer_t *b; - u32 bi, sw_if_index, fib_index; u8 tcp_hdr_len, flags = 0; tcp_header_t *th, *pkt_th; - u32 seq, ack; + u32 seq, ack, bi; ip4_header_t *ih4, *pkt_ih4; ip6_header_t *ih6, *pkt_ih6; - fib_protocol_t fib_proto; if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return; + } b = vlib_get_buffer (vm, bi); - sw_if_index = vnet_buffer (pkt)->sw_if_index[VLIB_RX]; - fib_proto = is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6; - fib_index = fib_table_get_index_for_sw_if_index (fib_proto, sw_if_index); tcp_init_buffer (vm, b); /* Make and write options */ @@ -842,13 +718,15 @@ tcp_send_reset_w_pkt (tcp_connection_t * tc, vlib_buffer_t * pkt, int bogus = ~0; ASSERT ((pkt_ih6->ip_version_traffic_class_and_flow_label & 0xF0) == 0x60); - ih6 = vlib_buffer_push_ip6 (vm, b, &pkt_ih6->dst_address, - &pkt_ih6->src_address, IP_PROTOCOL_TCP); + ih6 = vlib_buffer_push_ip6_custom (vm, b, &pkt_ih6->dst_address, + &pkt_ih6->src_address, + IP_PROTOCOL_TCP, + tc->ipv6_flow_label); th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ih6, &bogus); ASSERT (!bogus); } - tcp_enqueue_to_ip_lookup_now (wrk, b, bi, is_ip4, fib_index); + tcp_enqueue_half_open (wrk, tc, b, bi); TCP_EVT (TCP_EVT_RST_SENT, tc); vlib_node_increment_counter (vm, tcp_node_index (output, tc->c_is_ip4), TCP_ERROR_RST_SENT, 1); @@ -869,14 +747,17 @@ tcp_send_reset (tcp_connection_t * tc) u8 flags; if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return; + } b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); tc->snd_opts_len = tcp_make_options (tc, &tc->snd_opts, tc->state); tcp_hdr_opts_len = tc->snd_opts_len + sizeof (tcp_header_t); - advertise_wnd = tcp_window_to_advertise (tc, TCP_STATE_ESTABLISHED); - flags = TCP_FLAG_RST; + advertise_wnd = tc->rcv_wnd >> tc->rcv_wscale; + flags = TCP_FLAG_RST | TCP_FLAG_ACK; th = vlib_buffer_push_tcp (b, tc->c_lcl_port, tc->c_rmt_port, tc->snd_nxt, tc->rcv_nxt, tcp_hdr_opts_len, flags, advertise_wnd); @@ -890,38 +771,13 @@ tcp_send_reset (tcp_connection_t * tc) TCP_ERROR_RST_SENT, 1); } -static void -tcp_push_ip_hdr (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, - vlib_buffer_t * b) -{ - tcp_header_t *th = vlib_buffer_get_current (b); - vlib_main_t *vm = wrk->vm; - if (tc->c_is_ip4) - { - ip4_header_t *ih; - ih = vlib_buffer_push_ip4 (vm, b, &tc->c_lcl_ip4, - &tc->c_rmt_ip4, IP_PROTOCOL_TCP, - tcp_csum_offload (tc)); - th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ih); - } - else - { - ip6_header_t *ih; - int bogus = ~0; - - ih = vlib_buffer_push_ip6 (vm, b, &tc->c_lcl_ip6, - &tc->c_rmt_ip6, IP_PROTOCOL_TCP); - th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ih, &bogus); - ASSERT (!bogus); - } -} - /** * Send SYN * - * Builds a SYN packet for a half-open connection and sends it to ipx_lookup. - * The packet is not forwarded through tcpx_output to avoid doing lookups - * in the half_open pool. + * Builds a SYN packet for a half-open connection and sends it to tcp-output. + * The packet is handled by main thread and because half-open and established + * connections use the same pool the connection can be retrieved without + * additional logic. */ void tcp_send_syn (tcp_connection_t * tc) @@ -935,12 +791,14 @@ tcp_send_syn (tcp_connection_t * tc) * Setup retransmit and establish timers before requesting buffer * such that we can return if we've ran out. */ - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT_SYN, + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, tc->rto * TCP_TO_TIMER_TICK); if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT_SYN, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, + tcp_cfg.alloc_err_timeout); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -953,8 +811,7 @@ tcp_send_syn (tcp_connection_t * tc) tc->rtt_seq = tc->snd_nxt; tc->rto_boff = 0; - tcp_push_ip_hdr (wrk, tc, b); - tcp_enqueue_to_ip_lookup (wrk, b, bi, tc->c_is_ip4, tc->c_fib_index); + tcp_enqueue_half_open (wrk, tc, b, bi); TCP_EVT (TCP_EVT_SYN_SENT, tc); } @@ -966,11 +823,14 @@ tcp_send_synack (tcp_connection_t * tc) vlib_buffer_t *b; u32 bi; - tcp_retransmit_timer_force_update (tc); + ASSERT (tc->snd_una != tc->snd_nxt); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, + tcp_cfg.alloc_err_timeout); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -982,32 +842,6 @@ tcp_send_synack (tcp_connection_t * tc) TCP_EVT (TCP_EVT_SYNACK_SENT, tc); } -/** - * Flush ip lookup tx frames populated by timer pops - */ -static void -tcp_flush_frame_to_ip_lookup (tcp_worker_ctx_t * wrk, u8 is_ip4) -{ - if (wrk->ip_lookup_tx_frames[!is_ip4]) - { - u32 next_index; - next_index = is_ip4 ? ip4_lookup_node.index : ip6_lookup_node.index; - vlib_put_frame_to_node (wrk->vm, next_index, - wrk->ip_lookup_tx_frames[!is_ip4]); - wrk->ip_lookup_tx_frames[!is_ip4] = 0; - } -} - -/** - * Flush v4 and v6 tcp and ip-lookup tx frames for thread index - */ -void -tcp_flush_frames_to_output (tcp_worker_ctx_t * wrk) -{ - tcp_flush_frame_to_ip_lookup (wrk, 1); - tcp_flush_frame_to_ip_lookup (wrk, 0); -} - /** * Send FIN */ @@ -1027,12 +861,14 @@ tcp_send_fin (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { /* Out of buffers so program fin retransmit ASAP */ - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, + tcp_cfg.alloc_err_timeout); if (fin_snt) tc->snd_nxt += 1; else /* Make sure retransmit retries a fin not data */ tc->flags |= TCP_CONN_FINSNT; + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1040,7 +876,6 @@ tcp_send_fin (tcp_connection_t * tc) if ((tc->flags & TCP_CONN_SNDACK) && !tc->pending_dupacks) tc->flags &= ~TCP_CONN_SNDACK; - tcp_retransmit_timer_force_update (tc); b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); tcp_make_fin (tc, b); @@ -1048,11 +883,11 @@ tcp_send_fin (tcp_connection_t * tc) TCP_EVT (TCP_EVT_FIN_SENT, tc); /* Account for the FIN */ tc->snd_nxt += 1; + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); if (!fin_snt) { tc->flags |= TCP_CONN_FINSNT; tc->flags &= ~TCP_CONN_FINPNDG; - tc->snd_una_max = seq_max (tc->snd_una_max, tc->snd_nxt); } } @@ -1124,23 +959,27 @@ tcp_push_hdr_i (tcp_connection_t * tc, vlib_buffer_t * b, u32 snd_nxt, TCP_EVT (TCP_EVT_PKTIZE, tc); } +always_inline u32 +tcp_buffer_len (vlib_buffer_t * b) +{ + u32 data_len = b->current_length; + if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT)) + data_len += b->total_length_not_including_first_buffer; + return data_len; +} + u32 tcp_session_push_header (transport_connection_t * tconn, vlib_buffer_t * b) { tcp_connection_t *tc = (tcp_connection_t *) tconn; - if (tc->flags & TCP_CONN_TRACK_BURST) - { - tcp_bt_check_app_limited (tc); - tcp_bt_track_tx (tc); - tc->flags &= ~TCP_CONN_TRACK_BURST; - } + if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) + tcp_bt_track_tx (tc, tcp_buffer_len (b)); tcp_push_hdr_i (tc, b, tc->snd_nxt, /* compute opts */ 0, /* burst */ 1, /* update_snd_nxt */ 1); - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); - tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + tcp_validate_txf_size (tc, tc->snd_nxt - tc->snd_una); /* If not tracking an ACK, start tracking */ if (tc->rtt_ts == 0 && !tcp_in_cong_recovery (tc)) { @@ -1149,10 +988,10 @@ tcp_session_push_header (transport_connection_t * tconn, vlib_buffer_t * b) } if (PREDICT_FALSE (!tcp_timer_is_active (tc, TCP_TIMER_RETRANSMIT))) { - tcp_retransmit_timer_set (tc); + tcp_worker_ctx_t *wrk = tcp_get_worker (tc->c_thread_index); + tcp_retransmit_timer_set (&wrk->timer_wheel, tc); tc->rto_boff = 0; } - tcp_trajectory_add_start (b, 3); return 0; } @@ -1167,6 +1006,7 @@ tcp_send_ack (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_update_rcv_wnd (tc); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } b = vlib_get_buffer (vm, bi); @@ -1207,22 +1047,6 @@ tcp_program_retransmit (tcp_connection_t * tc) } } -/** - * Delayed ack timer handler - * - * Sends delayed ACK when timer expires - */ -void -tcp_timer_delack_handler (u32 index) -{ - u32 thread_index = vlib_get_thread_index (); - tcp_connection_t *tc; - - tc = tcp_connection_get (index, thread_index); - tc->timers[TCP_TIMER_DELACK] = TCP_TIMER_HANDLE_INVALID; - tcp_send_ack (tc); -} - /** * Send window update ack * @@ -1281,7 +1105,10 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, if (PREDICT_TRUE (seg_size <= bytes_per_buffer)) { if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return 0; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return 0; + } *b = vlib_get_buffer (vm, bi); data = tcp_init_buffer (vm, *b); n_bytes = session_tx_fifo_peek_bytes (&tc->connection, data, offset, @@ -1308,6 +1135,7 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, { if (n_bufs) vlib_buffer_free (vm, wrk->tx_buffers, n_bufs); + tcp_worker_stats_inc (wrk, no_buffer, 1); return 0; } @@ -1392,6 +1220,8 @@ tcp_prepare_retransmit_segment (tcp_worker_ctx_t * wrk, max_deq_bytes = clib_min (available_bytes, max_deq_bytes); start = tc->snd_una + offset; + ASSERT (seq_leq (start + max_deq_bytes, tc->snd_nxt)); + n_bytes = tcp_prepare_segment (wrk, tc, offset, max_deq_bytes, b); if (!n_bytes) return 0; @@ -1403,6 +1233,7 @@ tcp_prepare_retransmit_segment (tcp_worker_ctx_t * wrk, tc->bytes_retrans += n_bytes; tc->segs_retrans += 1; + tcp_worker_stats_inc (wrk, rxt_segs, 1); TCP_EVT (TCP_EVT_CC_RTX, tc, offset, n_bytes); return n_bytes; @@ -1443,27 +1274,24 @@ tcp_cc_init_rxt_timeout (tcp_connection_t * tc) tc->rtt_ts = 0; tc->cwnd_acc_bytes = 0; tc->tr_occurences += 1; + tc->sack_sb.reorder = TCP_DUPACK_THRESHOLD; tcp_recovery_on (tc); } void -tcp_timer_retransmit_handler (u32 tc_index) +tcp_timer_retransmit_handler (tcp_connection_t * tc) { - u32 thread_index = vlib_get_thread_index (); - tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + tcp_worker_ctx_t *wrk = tcp_get_worker (tc->c_thread_index); vlib_main_t *vm = wrk->vm; - tcp_connection_t *tc; vlib_buffer_t *b = 0; u32 bi, n_bytes; - tc = tcp_connection_get (tc_index, thread_index); + tcp_worker_stats_inc (wrk, tr_events, 1); - /* Note: the connection may have been closed and pool_put */ - if (PREDICT_FALSE (tc == 0 || tc->state == TCP_STATE_SYN_SENT)) + /* Should be handled by a different handler */ + if (PREDICT_FALSE (tc->state == TCP_STATE_SYN_SENT)) return; - tc->timers[TCP_TIMER_RETRANSMIT] = TCP_TIMER_HANDLE_INVALID; - /* Wait-close and retransmit could pop at the same time */ if (tc->state == TCP_STATE_CLOSED) return; @@ -1481,11 +1309,8 @@ tcp_timer_retransmit_handler (u32 tc_index) return; } - /* Shouldn't be here. This condition is tricky because it has to take - * into account boff > 0 due to persist timeout. */ - if ((tc->rto_boff == 0 && tc->snd_una == tc->snd_nxt) - || (tc->rto_boff > 0 && seq_geq (tc->snd_una, tc->snd_congestion) - && !tcp_flight_size (tc))) + /* Shouldn't be here */ + if (tc->snd_una == tc->snd_nxt) { ASSERT (!tcp_in_recovery (tc)); tc->rto_boff = 0; @@ -1508,8 +1333,10 @@ tcp_timer_retransmit_handler (u32 tc_index) tcp_send_reset (tc); tcp_connection_set_state (tc, TCP_STATE_CLOSED); session_transport_closing_notify (&tc->connection); + session_transport_closed_notify (&tc->connection); tcp_connection_timers_reset (tc); - tcp_timer_update (tc, TCP_TIMER_WAITCLOSE, tcp_cfg.closewait_time); + tcp_program_cleanup (wrk, tc); + tcp_worker_stats_inc (wrk, tr_abort, 1); return; } @@ -1521,10 +1348,12 @@ tcp_timer_retransmit_handler (u32 tc_index) /* Send the first unacked segment. If we're short on buffers, return * as soon as possible */ - n_bytes = tcp_prepare_retransmit_segment (wrk, tc, 0, tc->snd_mss, &b); + n_bytes = clib_min (tc->snd_mss, tc->snd_nxt - tc->snd_una); + n_bytes = tcp_prepare_retransmit_segment (wrk, tc, 0, n_bytes, &b); if (!n_bytes) { - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, + tcp_cfg.alloc_err_timeout); return; } @@ -1532,7 +1361,7 @@ tcp_timer_retransmit_handler (u32 tc_index) tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); tc->rto = clib_min (tc->rto << 1, TCP_RTO_MAX); - tcp_retransmit_timer_force_update (tc); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); tc->rto_boff += 1; if (tc->rto_boff == 1) @@ -1559,13 +1388,16 @@ tcp_timer_retransmit_handler (u32 tc_index) { tcp_connection_set_state (tc, TCP_STATE_CLOSED); tcp_connection_timers_reset (tc); - tcp_timer_update (tc, TCP_TIMER_WAITCLOSE, tcp_cfg.cleanup_time); + tcp_program_cleanup (wrk, tc); + tcp_worker_stats_inc (wrk, tr_abort, 1); return; } if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, + tcp_cfg.alloc_err_timeout); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1573,7 +1405,8 @@ tcp_timer_retransmit_handler (u32 tc_index) if (tc->rto_boff > TCP_RTO_SYN_RETRIES) tc->rto = clib_min (tc->rto << 1, TCP_RTO_MAX); - tcp_retransmit_timer_force_update (tc); + ASSERT (tc->snd_una != tc->snd_nxt); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); @@ -1594,23 +1427,17 @@ tcp_timer_retransmit_handler (u32 tc_index) * SYN retransmit timer handler. Active open only. */ void -tcp_timer_retransmit_syn_handler (u32 tc_index) +tcp_timer_retransmit_syn_handler (tcp_connection_t * tc) { - u32 thread_index = vlib_get_thread_index (); - tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + tcp_worker_ctx_t *wrk = tcp_get_worker (tc->c_thread_index); vlib_main_t *vm = wrk->vm; - tcp_connection_t *tc; vlib_buffer_t *b = 0; u32 bi; - tc = tcp_half_open_connection_get (tc_index); - /* Note: the connection may have transitioned to ESTABLISHED... */ - if (PREDICT_FALSE (tc == 0 || tc->state != TCP_STATE_SYN_SENT)) + if (PREDICT_FALSE (tc->state != TCP_STATE_SYN_SENT)) return; - tc->timers[TCP_TIMER_RETRANSMIT_SYN] = TCP_TIMER_HANDLE_INVALID; - /* Half-open connection actually moved to established but we were * waiting for syn retransmit to pop to call cleanup from the right * thread. */ @@ -1627,14 +1454,16 @@ tcp_timer_retransmit_syn_handler (u32 tc_index) /* Active open establish timeout */ if (tc->rto >= TCP_ESTABLISH_TIME >> 1) { - session_stream_connect_notify (&tc->connection, 1 /* fail */ ); + session_stream_connect_notify (&tc->connection, SESSION_E_TIMEDOUT); tcp_connection_cleanup (tc); return; } if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT_SYN, 1); + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, + tcp_cfg.alloc_err_timeout); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1650,11 +1479,9 @@ tcp_timer_retransmit_syn_handler (u32 tc_index) TCP_EVT (TCP_EVT_SYN_RXT, tc, 0); - /* This goes straight to ipx_lookup */ - tcp_push_ip_hdr (wrk, tc, b); - tcp_enqueue_to_ip_lookup (wrk, b, bi, tc->c_is_ip4, tc->c_fib_index); + tcp_enqueue_half_open (wrk, tc, b, bi); - tcp_timer_update (tc, TCP_TIMER_RETRANSMIT_SYN, + tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, tc->rto * TCP_TO_TIMER_TICK); } @@ -1663,29 +1490,20 @@ tcp_timer_retransmit_syn_handler (u32 tc_index) * */ void -tcp_timer_persist_handler (u32 index) +tcp_timer_persist_handler (tcp_connection_t * tc) { - u32 thread_index = vlib_get_thread_index (); - tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + tcp_worker_ctx_t *wrk = tcp_get_worker (tc->c_thread_index); u32 bi, max_snd_bytes, available_bytes, offset; tcp_main_t *tm = vnet_get_tcp_main (); vlib_main_t *vm = wrk->vm; - tcp_connection_t *tc; vlib_buffer_t *b; int n_bytes = 0; u8 *data; - tc = tcp_connection_get_if_valid (index, thread_index); - if (!tc) - return; - - /* Make sure timer handle is set to invalid */ - tc->timers[TCP_TIMER_PERSIST] = TCP_TIMER_HANDLE_INVALID; - /* Problem already solved or worse */ if (tc->state == TCP_STATE_CLOSED || tc->snd_wnd > tc->snd_mss || (tc->flags & TCP_CONN_FINSNT)) - return; + goto update_scheduler; available_bytes = transport_max_tx_dequeue (&tc->connection); offset = tc->snd_nxt - tc->snd_una; @@ -1694,15 +1512,12 @@ tcp_timer_persist_handler (u32 index) * next time */ if (!available_bytes) { - tcp_persist_timer_set (tc); + tcp_persist_timer_set (&wrk->timer_wheel, tc); return; } if (available_bytes <= offset) - { - ASSERT (tcp_timer_is_active (tc, TCP_TIMER_RETRANSMIT)); - return; - } + goto update_scheduler; /* Increment RTO backoff */ tc->rto_boff += 1; @@ -1713,9 +1528,11 @@ tcp_timer_persist_handler (u32 index) */ if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { - tcp_persist_timer_set (tc); + tcp_persist_timer_set (&wrk->timer_wheel, tc); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } + b = vlib_get_buffer (vm, bi); data = tcp_init_buffer (vm, b); @@ -1727,23 +1544,29 @@ tcp_timer_persist_handler (u32 index) max_snd_bytes); b->current_length = n_bytes; ASSERT (n_bytes != 0 && (tcp_timer_is_active (tc, TCP_TIMER_RETRANSMIT) - || tc->snd_nxt == tc->snd_una_max + || tc->snd_una == tc->snd_nxt || tc->rto_boff > 1)); if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) { tcp_bt_check_app_limited (tc); - tcp_bt_track_tx (tc); + tcp_bt_track_tx (tc, n_bytes); } tcp_push_hdr_i (tc, b, tc->snd_nxt, /* compute opts */ 0, /* burst */ 0, /* update_snd_nxt */ 1); - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); - tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + tcp_validate_txf_size (tc, tc->snd_nxt - tc->snd_una); tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); /* Just sent new data, enable retransmit */ - tcp_retransmit_timer_update (tc); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); + + return; + +update_scheduler: + + if (tcp_is_descheduled (tc)) + transport_connection_reschedule (&tc->connection); } /** @@ -1780,6 +1603,9 @@ tcp_transmit_unsent (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, available_wnd = tc->snd_wnd - offset; burst_size = clib_min (burst_size, available_wnd / tc->snd_mss); + if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) + tcp_bt_check_app_limited (tc); + while (n_segs < burst_size) { n_written = tcp_prepare_segment (wrk, tc, offset, tc->snd_mss, &b); @@ -1791,8 +1617,10 @@ tcp_transmit_unsent (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, offset += n_written; n_segs += 1; + if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) + tcp_bt_track_tx (tc, n_written); + tc->snd_nxt += n_written; - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); } done: @@ -1833,6 +1661,9 @@ tcp_retransmit_should_retry_head (tcp_connection_t * tc, u32 tx_adv_sack = sb->high_sacked - tc->snd_congestion; f64 rr = (f64) tc->ssthresh / tc->prev_cwnd; + if (tcp_fastrecovery_first (tc)) + return 1; + return (tx_adv_sack > (tc->snd_una - tc->prr_start) * rr); } @@ -1854,21 +1685,18 @@ static int tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, u32 burst_size) { - u8 snd_limited = 0, can_rescue = 0, reset_pacer = 0; u32 n_written = 0, offset, max_bytes, n_segs = 0; - u32 bi, max_deq, burst_bytes, sent_bytes; + u8 snd_limited = 0, can_rescue = 0; + u32 bi, max_deq, burst_bytes; sack_scoreboard_hole_t *hole; vlib_main_t *vm = wrk->vm; vlib_buffer_t *b = 0; sack_scoreboard_t *sb; int snd_space; - u64 time_now; ASSERT (tcp_in_cong_recovery (tc)); - time_now = wrk->vm->clib_time.last_cpu_time; - burst_bytes = transport_connection_tx_pacer_burst (&tc->connection, - time_now); + burst_bytes = transport_connection_tx_pacer_burst (&tc->connection); burst_size = clib_min (burst_size, burst_bytes / tc->snd_mss); if (!burst_size) { @@ -1882,12 +1710,7 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, snd_space = tcp_fastrecovery_prr_snd_space (tc); if (snd_space < tc->snd_mss) - { - reset_pacer = burst_bytes > tc->snd_mss; - goto done; - } - - reset_pacer = snd_space < burst_bytes; + goto done; sb = &tc->sack_sb; @@ -1897,8 +1720,8 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, && tc->rxt_head != tc->snd_una && tcp_retransmit_should_retry_head (tc, sb)) { - n_written = tcp_prepare_retransmit_segment (wrk, tc, 0, tc->snd_mss, - &b); + max_bytes = clib_min (tc->snd_mss, tc->snd_congestion - tc->snd_una); + n_written = tcp_prepare_retransmit_segment (wrk, tc, 0, max_bytes, &b); if (!n_written) { tcp_program_retransmit (tc); @@ -1914,6 +1737,8 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, ASSERT (tc->rxt_delivered <= tc->snd_rxt_bytes); } + tcp_fastrecovery_first_off (tc); + TCP_EVT (TCP_EVT_CC_EVT, tc, 0); hole = scoreboard_get_hole (sb, sb->cur_rxt_hole); @@ -1922,7 +1747,7 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, while (snd_space > 0 && n_segs < burst_size) { - hole = scoreboard_next_rxt_hole (sb, hole, max_deq, &can_rescue, + hole = scoreboard_next_rxt_hole (sb, hole, max_deq != 0, &can_rescue, &snd_limited); if (!hole) { @@ -1932,8 +1757,10 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, u32 n_segs_new; int av_wnd; + /* Make sure we don't exceed available window and leave space + * for one more packet, to avoid zero window acks */ av_wnd = (int) tc->snd_wnd - (tc->snd_nxt - tc->snd_una); - av_wnd = clib_max (av_wnd, 0); + av_wnd = clib_max (av_wnd - tc->snd_mss, 0); snd_space = clib_min (snd_space, av_wnd); snd_space = clib_min (max_deq, snd_space); burst_size = clib_min (burst_size - n_segs, @@ -1956,16 +1783,16 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, * unSACKed sequence number SHOULD be returned, and RescueRxt set to * RecoveryPoint. HighRxt MUST NOT be updated. */ - max_bytes = clib_min (tc->snd_mss, - tc->snd_congestion - tc->snd_una); + hole = scoreboard_last_hole (sb); + max_bytes = clib_min (tc->snd_mss, hole->end - hole->start); max_bytes = clib_min (max_bytes, snd_space); - offset = tc->snd_congestion - tc->snd_una - max_bytes; - sb->rescue_rxt = tc->snd_congestion; + offset = hole->end - tc->snd_una - max_bytes; n_written = tcp_prepare_retransmit_segment (wrk, tc, offset, max_bytes, &b); if (!n_written) goto done; + sb->rescue_rxt = tc->snd_congestion; bi = vlib_get_buffer_index (vm, b); tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); n_segs += 1; @@ -1990,6 +1817,8 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); sb->high_rxt += n_written; + ASSERT (seq_leq (sb->high_rxt, tc->snd_nxt)); + snd_space -= n_written; n_segs += 1; } @@ -1999,19 +1828,7 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, done: - if (reset_pacer) - { - transport_connection_tx_pacer_reset_bucket (&tc->connection, - vm->clib_time. - last_cpu_time); - } - else - { - sent_bytes = clib_min (n_segs * tc->snd_mss, burst_bytes); - transport_connection_tx_pacer_update_bytes (&tc->connection, - sent_bytes); - } - + transport_connection_tx_pacer_reset_bucket (&tc->connection, 0); return n_segs; } @@ -2022,20 +1839,17 @@ static int tcp_retransmit_no_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, u32 burst_size) { - u32 n_written = 0, offset = 0, bi, max_deq, n_segs_now; + u32 n_written = 0, offset = 0, bi, max_deq, n_segs_now, max_bytes; u32 burst_bytes, sent_bytes; vlib_main_t *vm = wrk->vm; int snd_space, n_segs = 0; u8 cc_limited = 0; vlib_buffer_t *b; - u64 time_now; - ASSERT (tcp_in_fastrecovery (tc)); + ASSERT (tcp_in_cong_recovery (tc)); TCP_EVT (TCP_EVT_CC_EVT, tc, 0); - time_now = wrk->vm->clib_time.last_cpu_time; - burst_bytes = transport_connection_tx_pacer_burst (&tc->connection, - time_now); + burst_bytes = transport_connection_tx_pacer_burst (&tc->connection); burst_size = clib_min (burst_size, burst_bytes / tc->snd_mss); if (!burst_size) { @@ -2053,8 +1867,12 @@ tcp_retransmit_no_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, * segment. */ while (snd_space > 0 && n_segs < burst_size) { - n_written = tcp_prepare_retransmit_segment (wrk, tc, offset, - tc->snd_mss, &b); + max_bytes = clib_min (tc->snd_mss, + tc->snd_congestion - tc->snd_una - offset); + if (!max_bytes) + break; + n_written = tcp_prepare_retransmit_segment (wrk, tc, offset, max_bytes, + &b); /* Nothing left to retransmit */ if (n_written == 0) @@ -2083,7 +1901,7 @@ send_unsent: snd_space = clib_min (max_deq, snd_space); burst_size = clib_min (burst_size - n_segs, snd_space / tc->snd_mss); n_segs_now = tcp_transmit_unsent (wrk, tc, burst_size); - if (max_deq > n_segs_now * tc->snd_mss) + if (n_segs_now && max_deq > n_segs_now * tc->snd_mss) tcp_program_retransmit (tc); n_segs += n_segs_now; } @@ -2119,6 +1937,7 @@ tcp_send_acks (tcp_connection_t * tc, u32 max_burst_size) if (!vec_len (tc->snd_sacks)) { tcp_send_ack (tc); + tc->dupacks_out += 1; tc->pending_dupacks = 0; return 1; } @@ -2158,6 +1977,9 @@ tcp_do_retransmit (tcp_connection_t * tc, u32 max_burst_size) tcp_worker_ctx_t *wrk; u32 n_segs; + if (PREDICT_FALSE (tc->state == TCP_STATE_CLOSED)) + return 0; + wrk = tcp_get_worker (tc->c_thread_index); if (tcp_opts_sack_permitted (&tc->rcv_opts)) @@ -2169,7 +1991,7 @@ tcp_do_retransmit (tcp_connection_t * tc, u32 max_burst_size) } int -tcp_session_custom_tx (void *conn, u32 max_burst_size) +tcp_session_custom_tx (void *conn, transport_send_params_t * sp) { tcp_connection_t *tc = (tcp_connection_t *) conn; u32 n_segs = 0; @@ -2177,8 +1999,7 @@ tcp_session_custom_tx (void *conn, u32 max_burst_size) if (tcp_in_cong_recovery (tc) && (tc->flags & TCP_CONN_RXT_PENDING)) { tc->flags &= ~TCP_CONN_RXT_PENDING; - n_segs = tcp_do_retransmit (tc, max_burst_size); - max_burst_size -= n_segs; + n_segs = tcp_do_retransmit (tc, sp->max_burst_size); } if (!(tc->flags & TCP_CONN_SNDACK)) @@ -2190,13 +2011,13 @@ tcp_session_custom_tx (void *conn, u32 max_burst_size) if (n_segs && !tc->pending_dupacks) return n_segs; - if (!max_burst_size) + if (sp->max_burst_size <= n_segs) { tcp_program_ack (tc); - return max_burst_size; + return n_segs; } - n_segs += tcp_send_acks (tc, max_burst_size); + n_segs += tcp_send_acks (tc, sp->max_burst_size - n_segs); return n_segs; } @@ -2238,16 +2059,17 @@ static void tcp46_output_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node, u32 * to_next, u32 n_bufs) { - u32 n_trace = vlib_get_trace_count (vm, node); tcp_connection_t *tc; tcp_tx_trace_t *t; vlib_buffer_t *b; tcp_header_t *th; int i; - for (i = 0; i < clib_min (n_trace, n_bufs); i++) + for (i = 0; i < n_bufs; i++) { b = vlib_get_buffer (vm, to_next[i]); + if (!(b->flags & VLIB_BUFFER_IS_TRACED)) + continue; th = vlib_buffer_get_current (b); tc = tcp_connection_get (vnet_buffer (b)->tcp.connection_index, vm->thread_index); @@ -2261,18 +2083,16 @@ always_inline void tcp_output_push_ip (vlib_main_t * vm, vlib_buffer_t * b0, tcp_connection_t * tc0, u8 is_ip4) { - u8 __clib_unused *ih0; - tcp_header_t __clib_unused *th0 = vlib_buffer_get_current (b0); - - TCP_EVT (TCP_EVT_OUTPUT, tc0, th0->flags, b0->current_length); + TCP_EVT (TCP_EVT_OUTPUT, tc0, + ((tcp_header_t *) vlib_buffer_get_current (b0))->flags, + b0->current_length); if (is_ip4) - ih0 = vlib_buffer_push_ip4 (vm, b0, &tc0->c_lcl_ip4, &tc0->c_rmt_ip4, - IP_PROTOCOL_TCP, tcp_csum_offload (tc0)); + vlib_buffer_push_ip4 (vm, b0, &tc0->c_lcl_ip4, &tc0->c_rmt_ip4, + IP_PROTOCOL_TCP, tcp_csum_offload (tc0)); else - ih0 = vlib_buffer_push_ip6 (vm, b0, &tc0->c_lcl_ip6, &tc0->c_rmt_ip6, - IP_PROTOCOL_TCP); - + vlib_buffer_push_ip6_custom (vm, b0, &tc0->c_lcl_ip6, &tc0->c_rmt_ip6, + IP_PROTOCOL_TCP, tc0->ipv6_flow_label); } always_inline void @@ -2316,7 +2136,7 @@ tcp_output_handle_packet (tcp_connection_t * tc0, vlib_buffer_t * b0, } vnet_buffer (b0)->sw_if_index[VLIB_TX] = tc0->c_fib_index; - vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0; + vnet_buffer (b0)->sw_if_index[VLIB_RX] = tc0->sw_if_index; if (!is_ip4) { @@ -2332,9 +2152,6 @@ tcp_output_handle_packet (tcp_connection_t * tc0, vlib_buffer_t * b0, } } - if (!TCP_ALWAYS_ACK) - tcp_timer_reset (tc0, TCP_TIMER_DELACK); - tc0->segs_out += 1; } @@ -2345,13 +2162,10 @@ tcp46_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u32 n_left_from, *from, thread_index = vm->thread_index; vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; u16 nexts[VLIB_FRAME_SIZE], *next; - vlib_node_runtime_t *error_node; - - error_node = vlib_node_get_runtime (vm, tcp_node_index (output, is_ip4)); from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; - tcp_set_time_now (tcp_get_worker (thread_index)); + tcp_update_time_now (tcp_get_worker (thread_index)); if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) tcp46_output_trace_frame (vm, node, from, n_left_from); @@ -2385,8 +2199,8 @@ tcp46_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp_check_if_gso (tc0, b[0]); tcp_check_if_gso (tc1, b[1]); - tcp_output_handle_packet (tc0, b[0], error_node, &next[0], is_ip4); - tcp_output_handle_packet (tc1, b[1], error_node, &next[1], is_ip4); + tcp_output_handle_packet (tc0, b[0], node, &next[0], is_ip4); + tcp_output_handle_packet (tc1, b[1], node, &next[1], is_ip4); } else { @@ -2394,24 +2208,22 @@ tcp46_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { tcp_output_push_ip (vm, b[0], tc0, is_ip4); tcp_check_if_gso (tc0, b[0]); - tcp_output_handle_packet (tc0, b[0], error_node, &next[0], - is_ip4); + tcp_output_handle_packet (tc0, b[0], node, &next[0], is_ip4); } else { - b[0]->error = error_node->errors[TCP_ERROR_INVALID_CONNECTION]; + b[0]->error = node->errors[TCP_ERROR_INVALID_CONNECTION]; next[0] = TCP_OUTPUT_NEXT_DROP; } if (tc1 != 0) { tcp_output_push_ip (vm, b[1], tc1, is_ip4); tcp_check_if_gso (tc1, b[1]); - tcp_output_handle_packet (tc1, b[1], error_node, &next[1], - is_ip4); + tcp_output_handle_packet (tc1, b[1], node, &next[1], is_ip4); } else { - b[1]->error = error_node->errors[TCP_ERROR_INVALID_CONNECTION]; + b[1]->error = node->errors[TCP_ERROR_INVALID_CONNECTION]; next[1] = TCP_OUTPUT_NEXT_DROP; } } @@ -2437,11 +2249,11 @@ tcp46_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { tcp_output_push_ip (vm, b[0], tc0, is_ip4); tcp_check_if_gso (tc0, b[0]); - tcp_output_handle_packet (tc0, b[0], error_node, &next[0], is_ip4); + tcp_output_handle_packet (tc0, b[0], node, &next[0], is_ip4); } else { - b[0]->error = error_node->errors[TCP_ERROR_INVALID_CONNECTION]; + b[0]->error = node->errors[TCP_ERROR_INVALID_CONNECTION]; next[0] = TCP_OUTPUT_NEXT_DROP; } @@ -2476,7 +2288,7 @@ VLIB_REGISTER_NODE (tcp4_output_node) = .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, .protocol_hint = VLIB_NODE_PROTO_HINT_TCP, - .error_strings = tcp_error_strings, + .error_counters = tcp_output_error_counters, .n_next_nodes = TCP_OUTPUT_N_NEXT, .next_nodes = { #define _(s,n) [TCP_OUTPUT_NEXT_##s] = n, @@ -2496,7 +2308,7 @@ VLIB_REGISTER_NODE (tcp6_output_node) = .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, .protocol_hint = VLIB_NODE_PROTO_HINT_TCP, - .error_strings = tcp_error_strings, + .error_counters = tcp_output_error_counters, .n_next_nodes = TCP_OUTPUT_N_NEXT, .next_nodes = { #define _(s,n) [TCP_OUTPUT_NEXT_##s] = n, @@ -2527,8 +2339,8 @@ static uword tcp46_send_reset_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame, u8 is_ip4) { + u32 error0 = TCP_ERROR_RST_SENT, next0 = TCP_RESET_NEXT_IP_LOOKUP; u32 n_left_from, next_index, *from, *to_next; - u32 my_thread_index = vm->thread_index; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; @@ -2543,11 +2355,10 @@ tcp46_send_reset_inline (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_left_from > 0 && n_left_to_next > 0) { - u32 bi0; vlib_buffer_t *b0; tcp_tx_trace_t *t0; tcp_header_t *th0; - u32 error0 = TCP_ERROR_RST_SENT, next0 = TCP_RESET_NEXT_IP_LOOKUP; + u32 bi0; bi0 = from[0]; to_next[0] = bi0; @@ -2557,20 +2368,11 @@ tcp46_send_reset_inline (vlib_main_t * vm, vlib_node_runtime_t * node, n_left_to_next -= 1; b0 = vlib_get_buffer (vm, bi0); - - if (tcp_make_reset_in_place (vm, b0, vnet_buffer (b0)->tcp.flags, - my_thread_index, is_ip4)) - { - error0 = TCP_ERROR_LOOKUP_DROPS; - next0 = TCP_RESET_NEXT_DROP; - goto done; - } + tcp_make_reset_in_place (vm, b0, is_ip4); /* Prepare to send to IP lookup */ vnet_buffer (b0)->sw_if_index[VLIB_TX] = ~0; - next0 = TCP_RESET_NEXT_IP_LOOKUP; - done: b0->error = node->errors[error0]; b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) @@ -2610,7 +2412,7 @@ VLIB_REGISTER_NODE (tcp4_reset_node) = { .name = "tcp4-reset", .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, - .error_strings = tcp_error_strings, + .error_counters = tcp_output_error_counters, .n_next_nodes = TCP_RESET_N_NEXT, .next_nodes = { #define _(s,n) [TCP_RESET_NEXT_##s] = n, @@ -2626,7 +2428,7 @@ VLIB_REGISTER_NODE (tcp6_reset_node) = { .name = "tcp6-reset", .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, - .error_strings = tcp_error_strings, + .error_counters = tcp_output_error_counters, .n_next_nodes = TCP_RESET_N_NEXT, .next_nodes = { #define _(s,n) [TCP_RESET_NEXT_##s] = n,