X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_input.c;h=e75c77d0e2fa118074f44d03dde640f796852b0d;hb=ecbd20b6e9a2291908bb51a9b708a11eb86010b3;hp=c86432037fd4333c4b9e490be8b794d091063984;hpb=56318932367ecb3fa65243033f1f8978c32fd4a4;p=vpp.git diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index c86432037fd..e75c77d0e2f 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -123,7 +123,7 @@ tcp_segment_in_rcv_wnd (tcp_connection_t * tc, u32 seq, u32 end_seq) * @param to TCP options data structure to be populated * @return -1 if parsing failed */ -int +static int tcp_options_parse (tcp_header_t * th, tcp_options_t * to) { const u8 *data; @@ -135,7 +135,8 @@ tcp_options_parse (tcp_header_t * th, tcp_options_t * to) data = (const u8 *) (th + 1); /* Zero out all flags but those set in SYN */ - to->flags &= (TCP_OPTS_FLAG_SACK_PERMITTED | TCP_OPTS_FLAG_WSCALE); + to->flags &= (TCP_OPTS_FLAG_SACK_PERMITTED | TCP_OPTS_FLAG_WSCALE + | TCP_OPTS_FLAG_SACK); for (; opts_len > 0; opts_len -= opt_len, data += opt_len) { @@ -275,6 +276,14 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, vlib_buffer_t * b0, tcp_header_t * th0, u32 * next0, u32 * error0) { + /* We could get a burst of RSTs interleaved with acks */ + if (PREDICT_FALSE (tc0->state == TCP_STATE_CLOSED)) + { + tcp_send_reset (tc0); + *error0 = TCP_ERROR_CONNECTION_CLOSED; + goto drop; + } + if (PREDICT_FALSE (!tcp_ack (th0) && !tcp_rst (th0) && !tcp_syn (th0))) { *error0 = TCP_ERROR_SEGMENT_INVALID; @@ -292,13 +301,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, { *error0 = TCP_ERROR_PAWS; if (CLIB_DEBUG > 2) - { - clib_warning ("paws failed\n%U", format_tcp_connection, tc0, 2); - clib_warning ("seq %u seq_end %u ack %u", - vnet_buffer (b0)->tcp.seq_number - tc0->irs, - vnet_buffer (b0)->tcp.seq_end - tc0->irs, - vnet_buffer (b0)->tcp.ack_number - tc0->iss); - } + clib_warning ("paws failed\n%U", format_tcp_connection, tc0, 2); TCP_EVT_DBG (TCP_EVT_PAWS_FAIL, tc0, vnet_buffer (b0)->tcp.seq_number, vnet_buffer (b0)->tcp.seq_end); @@ -317,7 +320,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, if (!tcp_rst (th0)) { tcp_make_ack (tc0, b0); - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0); + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); goto error; } } @@ -329,7 +332,6 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, vnet_buffer (b0)->tcp.seq_end)) { *error0 = TCP_ERROR_RCV_WND; - /* If our window is 0 and the packet is in sequence, let it pass * through for ack processing. It should be dropped later. */ if (!(tc0->rcv_wnd == 0 @@ -339,7 +341,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, if (!tcp_rst (th0)) { tcp_make_ack (tc0, b0); - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0); + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); goto error; } goto drop; @@ -452,7 +454,11 @@ tcp_update_rtt (tcp_connection_t * tc, u32 ack) /* Karn's rule, part 1. Don't use retransmitted segments to estimate * RTT because they're ambiguous. */ if (tcp_in_cong_recovery (tc) || tc->sack_sb.sacked_bytes) - goto done; + { + if (tcp_in_recovery (tc)) + return 0; + goto done; + } if (tc->rtt_ts && seq_geq (ack, tc->rtt_seq)) { @@ -478,7 +484,7 @@ done: tc->rtt_ts = 0; /* If we got here something must've been ACKed so make sure boff is 0, - * even if mrrt is not valid since we update the rto lower */ + * even if mrtt is not valid since we update the rto lower */ tc->rto_boff = 0; tcp_update_rto (tc); @@ -533,7 +539,60 @@ tcp_ack_is_cc_event (tcp_connection_t * tc, vlib_buffer_t * b, return ((*is_dack || tcp_in_cong_recovery (tc)) && !tcp_is_lost_fin (tc)); } -void +static u32 +scoreboard_hole_index (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) +{ + ASSERT (!pool_is_free_index (sb->holes, hole - sb->holes)); + return hole - sb->holes; +} + +static u32 +scoreboard_hole_bytes (sack_scoreboard_hole_t * hole) +{ + return hole->end - hole->start; +} + +sack_scoreboard_hole_t * +scoreboard_get_hole (sack_scoreboard_t * sb, u32 index) +{ + if (index != TCP_INVALID_SACK_HOLE_INDEX) + return pool_elt_at_index (sb->holes, index); + return 0; +} + +sack_scoreboard_hole_t * +scoreboard_next_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) +{ + if (hole->next != TCP_INVALID_SACK_HOLE_INDEX) + return pool_elt_at_index (sb->holes, hole->next); + return 0; +} + +sack_scoreboard_hole_t * +scoreboard_prev_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) +{ + if (hole->prev != TCP_INVALID_SACK_HOLE_INDEX) + return pool_elt_at_index (sb->holes, hole->prev); + return 0; +} + +sack_scoreboard_hole_t * +scoreboard_first_hole (sack_scoreboard_t * sb) +{ + if (sb->head != TCP_INVALID_SACK_HOLE_INDEX) + return pool_elt_at_index (sb->holes, sb->head); + return 0; +} + +sack_scoreboard_hole_t * +scoreboard_last_hole (sack_scoreboard_t * sb) +{ + if (sb->tail != TCP_INVALID_SACK_HOLE_INDEX) + return pool_elt_at_index (sb->holes, sb->tail); + return 0; +} + +static void scoreboard_remove_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) { sack_scoreboard_hole_t *next, *prev; @@ -568,7 +627,7 @@ scoreboard_remove_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) pool_put (sb->holes, hole); } -sack_scoreboard_hole_t * +static sack_scoreboard_hole_t * scoreboard_insert_hole (sack_scoreboard_t * sb, u32 prev_index, u32 start, u32 end) { @@ -605,41 +664,44 @@ scoreboard_insert_hole (sack_scoreboard_t * sb, u32 prev_index, return hole; } -void +static void scoreboard_update_bytes (tcp_connection_t * tc, sack_scoreboard_t * sb) { - sack_scoreboard_hole_t *hole, *prev; + sack_scoreboard_hole_t *left, *right; u32 bytes = 0, blks = 0; sb->lost_bytes = 0; sb->sacked_bytes = 0; - hole = scoreboard_last_hole (sb); - if (!hole) + left = scoreboard_last_hole (sb); + if (!left) return; - if (seq_gt (sb->high_sacked, hole->end)) + if (seq_gt (sb->high_sacked, left->end)) { - bytes = sb->high_sacked - hole->end; + bytes = sb->high_sacked - left->end; blks = 1; + if (bytes > (TCP_DUPACK_THRESHOLD - 1) * tc->snd_mss + && left->prev == TCP_INVALID_SACK_HOLE_INDEX) + sb->lost_bytes += scoreboard_hole_bytes (left); } - while ((prev = scoreboard_prev_hole (sb, hole)) + right = left; + while ((left = scoreboard_prev_hole (sb, right)) && (bytes < (TCP_DUPACK_THRESHOLD - 1) * tc->snd_mss && blks < TCP_DUPACK_THRESHOLD)) { - bytes += hole->start - prev->end; + bytes += right->start - left->end; blks++; - hole = prev; + right = left; } - while (hole) + while (left) { - sb->lost_bytes += scoreboard_hole_bytes (hole); - hole->is_lost = 1; - prev = hole; - hole = scoreboard_prev_hole (sb, hole); - if (hole) - bytes += prev->start - hole->end; + bytes += right->start - left->end; + sb->lost_bytes += scoreboard_hole_bytes (left); + left->is_lost = 1; + right = left; + left = scoreboard_prev_hole (sb, left); } sb->sacked_bytes = bytes; } @@ -704,7 +766,7 @@ scoreboard_next_rxt_hole (sack_scoreboard_t * sb, return hole; } -void +static void scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 seq) { sack_scoreboard_hole_t *hole; @@ -717,18 +779,47 @@ scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 seq) sb->high_rxt = seq; } +void +scoreboard_init (sack_scoreboard_t * sb) +{ + sb->head = TCP_INVALID_SACK_HOLE_INDEX; + sb->tail = TCP_INVALID_SACK_HOLE_INDEX; + sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; +} + +void +scoreboard_clear (sack_scoreboard_t * sb) +{ + sack_scoreboard_hole_t *hole; + while ((hole = scoreboard_first_hole (sb))) + { + scoreboard_remove_hole (sb, hole); + } + ASSERT (sb->head == sb->tail && sb->head == TCP_INVALID_SACK_HOLE_INDEX); + ASSERT (pool_elts (sb->holes) == 0); + sb->sacked_bytes = 0; + sb->last_sacked_bytes = 0; + sb->last_bytes_delivered = 0; + sb->snd_una_adv = 0; + sb->high_sacked = 0; + sb->high_rxt = 0; + sb->lost_bytes = 0; + sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; +} + /** * Test that scoreboard is sane after recovery * * Returns 1 if scoreboard is empty or if first hole beyond * snd_una. */ -u8 +static u8 tcp_scoreboard_is_sane_post_recovery (tcp_connection_t * tc) { sack_scoreboard_hole_t *hole; hole = scoreboard_first_hole (&tc->sack_sb); - return (!hole || seq_geq (hole->start, tc->snd_una)); + return (!hole || (seq_geq (hole->start, tc->snd_una) + && seq_lt (hole->end, tc->snd_una_max))); } void @@ -741,14 +832,15 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) int i, j; sb->last_sacked_bytes = 0; - sb->snd_una_adv = 0; - old_sacked_bytes = sb->sacked_bytes; sb->last_bytes_delivered = 0; + sb->snd_una_adv = 0; if (!tcp_opts_sack (&tc->rcv_opts) && sb->head == TCP_INVALID_SACK_HOLE_INDEX) return; + old_sacked_bytes = sb->sacked_bytes; + /* Remove invalid blocks */ blk = tc->rcv_opts.sacks; while (blk < vec_end (tc->rcv_opts.sacks)) @@ -886,16 +978,25 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) } } + if (pool_elts (sb->holes) == 1) + { + hole = scoreboard_first_hole (sb); + if (hole->start == ack + sb->snd_una_adv + && hole->end == tc->snd_una_max) + scoreboard_remove_hole (sb, hole); + } + scoreboard_update_bytes (tc, sb); sb->last_sacked_bytes = sb->sacked_bytes - (old_sacked_bytes - sb->last_bytes_delivered); - ASSERT (sb->last_sacked_bytes <= sb->sacked_bytes); + ASSERT (sb->last_sacked_bytes <= sb->sacked_bytes || tcp_in_recovery (tc)); ASSERT (sb->sacked_bytes == 0 || sb->sacked_bytes < tc->snd_una_max - seq_max (tc->snd_una, ack)); ASSERT (sb->last_sacked_bytes + sb->lost_bytes <= tc->snd_una_max - seq_max (tc->snd_una, ack)); ASSERT (sb->head == TCP_INVALID_SACK_HOLE_INDEX || tcp_in_recovery (tc) || sb->holes[sb->head].start == ack + sb->snd_una_adv); + TCP_EVT_DBG (TCP_EVT_CC_SCOREBOARD, tc); } /** @@ -998,13 +1099,12 @@ tcp_cc_is_spurious_retransmit (tcp_connection_t * tc) && timestamp_lt (tc->rcv_opts.tsecr, tc->snd_rxt_ts)); } -int +static int tcp_cc_recover (tcp_connection_t * tc) { ASSERT (tcp_in_cong_recovery (tc)); if (tcp_cc_is_spurious_retransmit (tc)) { - clib_warning ("here"); tcp_cc_congestion_undo (tc); return 1; } @@ -1063,11 +1163,18 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) { u32 rxt_delivered; + if (tcp_in_fastrecovery (tc) && tcp_opts_sack_permitted (&tc->rcv_opts)) + { + if (tc->bytes_acked) + goto partial_ack; + tcp_fast_retransmit (tc); + return; + } /* * Duplicate ACK. Check if we should enter fast recovery, or if already in * it account for the bytes that left the network. */ - if (is_dack && !tcp_in_recovery (tc)) + else if (is_dack && !tcp_in_recovery (tc)) { TCP_EVT_DBG (TCP_EVT_DUPACK_RCVD, tc, 1); ASSERT (tc->snd_una != tc->snd_una_max @@ -1128,7 +1235,6 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) { tcp_fast_retransmit_no_sack (tc); } - return; } else if (!tc->bytes_acked @@ -1151,7 +1257,10 @@ partial_ack: * Legitimate ACK. 1) See if we can exit recovery */ /* XXX limit this only to first partial ack? */ - tcp_retransmit_timer_update (tc); + if (seq_lt (tc->snd_una, tc->snd_congestion)) + tcp_retransmit_timer_force_update (tc); + else + tcp_retransmit_timer_update (tc); if (seq_geq (tc->snd_una, tc->snd_congestion)) { @@ -1183,6 +1292,7 @@ partial_ack: { tc->cc_algo->rcv_ack (tc); tc->tsecr_last_ack = tc->rcv_opts.tsecr; + transport_add_tx_event (&tc->connection); return; } @@ -1215,13 +1325,6 @@ partial_ack: tcp_fast_retransmit (tc); } -void -tcp_cc_init (tcp_connection_t * tc) -{ - tc->cc_algo = tcp_cc_algo_get (TCP_CC_NEWRENO); - tc->cc_algo->init (tc); -} - /** * Process incoming ACK */ @@ -1237,6 +1340,17 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, /* If the ACK acks something not yet sent (SEG.ACK > SND.NXT) */ if (PREDICT_FALSE (seq_gt (vnet_buffer (b)->tcp.ack_number, tc->snd_nxt))) { + /* When we entered recovery, we reset snd_nxt to snd_una. Seems peer + * still has the data so accept the ack */ + if (tcp_in_recovery (tc) + && seq_leq (vnet_buffer (b)->tcp.ack_number, tc->snd_congestion)) + { + tc->snd_nxt = vnet_buffer (b)->tcp.ack_number; + if (seq_gt (tc->snd_nxt, tc->snd_una_max)) + tc->snd_una_max = tc->snd_nxt; + goto process_ack; + } + /* If we have outstanding data and this is within the window, accept it, * probably retransmit has timed out. Otherwise ACK segment and then * drop it */ @@ -1264,9 +1378,7 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, TCP_EVT_DBG (TCP_EVT_ACK_RCV_ERR, tc, 1, vnet_buffer (b)->tcp.ack_number); if (tcp_in_fastrecovery (tc) && tc->rcv_dupacks == TCP_DUPACK_THRESHOLD) - { - tcp_cc_handle_event (tc, 1); - } + tcp_cc_handle_event (tc, 1); /* Don't drop yet */ return 0; } @@ -1274,7 +1386,7 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, /* * Looks okay, process feedback */ - +process_ack: if (tcp_opts_sack_permitted (&tc->rcv_opts)) tcp_rcv_sacks (tc, vnet_buffer (b)->tcp.ack_number); @@ -1302,7 +1414,9 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, if (!tcp_in_cong_recovery (tc)) return 0; *error = TCP_ERROR_ACK_DUP; - return vnet_buffer (b)->tcp.data_len ? 0 : -1; + if (vnet_buffer (b)->tcp.data_len || tcp_is_fin (th)) + return 0; + return -1; } /* @@ -1390,8 +1504,17 @@ tcp_update_sack_list (tcp_connection_t * tc, u32 start, u32 end) ASSERT (tcp_sack_vector_is_sane (tc->snd_sacks)); } +u32 +tcp_sack_list_bytes (tcp_connection_t * tc) +{ + u32 bytes = 0, i; + for (i = 0; i < vec_len (tc->snd_sacks); i++) + bytes += tc->snd_sacks[i].end - tc->snd_sacks[i].start; + return bytes; +} + /** Enqueue data for delivery to application */ -always_inline int +static int tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, u16 data_len) { @@ -1416,6 +1539,7 @@ tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, /* Send ACK confirming the update */ tc->flags |= TCP_CONN_SNDACK; + TCP_EVT_DBG (TCP_EVT_CC_INPUT, tc, data_len, written); } else if (written > 0) { @@ -1445,7 +1569,7 @@ tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, } /** Enqueue out-of-order data */ -always_inline int +static int tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b, u16 data_len) { @@ -1488,6 +1612,7 @@ tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b, end = start + ooo_segment_length (s0->server_rx_fifo, newest); tcp_update_sack_list (tc, start, end); svm_fifo_newest_ooo_segment_reset (s0->server_rx_fifo); + TCP_EVT_DBG (TCP_EVT_CC_SACKS, tc); } } @@ -1508,7 +1633,7 @@ tcp_can_delack (tcp_connection_t * tc) /* constrained to send ack */ || (tc->flags & TCP_CONN_SNDACK) != 0 /* we're almost out of tx wnd */ - || tcp_available_snd_space (tc) < 4 * tc->snd_mss) + || tcp_available_cc_snd_space (tc) < 4 * tc->snd_mss) return 0; return 1; @@ -1592,7 +1717,7 @@ tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) *next0 = tcp_next_output (tc->c_is_ip4); tcp_make_ack (tc, b); vnet_buffer (b)->tcp.flags = TCP_BUF_FLAG_DUPACK; - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc); + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc, vnet_buffer (b)->tcp); goto done; } @@ -1622,7 +1747,7 @@ typedef struct tcp_connection_t tcp_connection; } tcp_rx_trace_t; -u8 * +static u8 * format_tcp_rx_trace (u8 * s, va_list * args) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); @@ -1638,7 +1763,7 @@ format_tcp_rx_trace (u8 * s, va_list * args) return s; } -u8 * +static u8 * format_tcp_rx_trace_short (u8 * s, va_list * args) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); @@ -1646,14 +1771,14 @@ format_tcp_rx_trace_short (u8 * s, va_list * args) tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *); s = format (s, "%d -> %d (%U)", - clib_net_to_host_u16 (t->tcp_header.src_port), - clib_net_to_host_u16 (t->tcp_header.dst_port), format_tcp_state, + clib_net_to_host_u16 (t->tcp_header.dst_port), + clib_net_to_host_u16 (t->tcp_header.src_port), format_tcp_state, t->tcp_connection.state); return s; } -void +static void tcp_set_rx_trace_data (tcp_rx_trace_t * t0, tcp_connection_t * tc0, tcp_header_t * th0, vlib_buffer_t * b0, u8 is_ip4) { @@ -1668,6 +1793,40 @@ tcp_set_rx_trace_data (tcp_rx_trace_t * t0, tcp_connection_t * tc0, clib_memcpy (&t0->tcp_header, th0, sizeof (t0->tcp_header)); } +static void +tcp_established_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame, u8 is_ip4) +{ + u32 *from, n_left; + + n_left = frame->n_vectors; + from = vlib_frame_vector_args (frame); + + while (n_left >= 1) + { + tcp_connection_t *tc0; + tcp_rx_trace_t *t0; + tcp_header_t *th0; + vlib_buffer_t *b0; + u32 bi0; + + bi0 = from[0]; + b0 = vlib_get_buffer (vm, bi0); + + if (b0->flags & VLIB_BUFFER_IS_TRACED) + { + t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); + tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, + vm->thread_index); + th0 = tcp_buffer_hdr (b0); + tcp_set_rx_trace_data (t0, tc0, th0, b0, is_ip4); + } + + from += 1; + n_left -= 1; + } +} + always_inline void tcp_node_inc_counter_i (vlib_main_t * vm, u32 tcp4_node, u32 tcp6_node, u8 is_ip4, u32 evt, u32 val) @@ -1708,15 +1867,18 @@ tcp_node_inc_counter_i (vlib_main_t * vm, u32 tcp4_node, u32 tcp6_node, always_inline uword tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame, int is_ip4) + vlib_frame_t * frame, int is_ip4) { - u32 my_thread_index = vm->thread_index, errors = 0; + u32 thread_index = vm->thread_index, errors = 0; u32 n_left_from, next_index, *from, *to_next; u16 err_counters[TCP_N_ERROR] = { 0 }; u8 is_fin = 0; - from = vlib_frame_vector_args (from_frame); - n_left_from = from_frame->n_vectors; + if (node->flags & VLIB_NODE_FLAG_TRACE) + tcp_established_trace_frame (vm, node, frame, is_ip4); + + from = vlib_frame_vector_args (frame); + n_left_from = frame->n_vectors; next_index = node->cached_next_index; while (n_left_from > 0) @@ -1749,7 +1911,7 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, b0 = vlib_get_buffer (vm, bi0); tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, - my_thread_index); + thread_index); if (PREDICT_FALSE (tc0 == 0)) { @@ -1773,9 +1935,7 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, &error0))) { tcp_maybe_inc_err_counter (err_counters, error0); - TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, - vnet_buffer (b0)->tcp.seq_number, - vnet_buffer (b0)->tcp.seq_end); + TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, vnet_buffer (b0)->tcp); goto done; } @@ -1814,13 +1974,6 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, done: b0->error = node->errors[error0]; - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - tcp_rx_trace_t *t0 = vlib_add_trace (vm, node, b0, - sizeof (*t0)); - tcp_set_rx_trace_data (t0, tc0, th0, b0, is_ip4); - } - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, bi0, next0); } @@ -1829,11 +1982,12 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, - my_thread_index); + thread_index); err_counters[TCP_ERROR_EVENT_FIFO_FULL] = errors; tcp_store_err_counters (established, err_counters); - tcp_flush_frame_to_output (vm, my_thread_index, is_ip4); - return from_frame->n_vectors; + tcp_flush_frame_to_output (vm, thread_index, is_ip4); + + return frame->n_vectors; } static uword @@ -2143,8 +2297,8 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (tcp_opts_wscale (&new_tc0->rcv_opts)) new_tc0->snd_wscale = new_tc0->rcv_opts.wscale; - /* RFC1323: SYN and SYN-ACK wnd not scaled */ - new_tc0->snd_wnd = clib_net_to_host_u16 (tcp0->window); + new_tc0->snd_wnd = clib_net_to_host_u16 (tcp0->window) + << new_tc0->snd_wscale; new_tc0->snd_wl1 = seq0; new_tc0->snd_wl2 = ack0; @@ -2450,7 +2604,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (tc0->flags & TCP_CONN_FINPNDG) { /* TX fifo finally drained */ - if (!stream_session_tx_fifo_max_dequeue (&tc0->connection)) + if (!session_tx_fifo_max_dequeue (&tc0->connection)) tcp_send_fin (tc0); } /* If FIN is ACKed */ @@ -2483,6 +2637,18 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp_maybe_inc_counter (rcv_process, error0, 1); goto drop; } + if (tc0->flags & TCP_CONN_FINPNDG) + { + /* TX fifo finally drained */ + if (!session_tx_fifo_max_dequeue (&tc0->connection)) + { + tcp_send_fin (tc0); + tcp_connection_timers_reset (tc0); + tc0->state = TCP_STATE_LAST_ACK; + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, + TCP_2MSL_TIME); + } + } break; case TCP_STATE_CLOSING: /* In addition to the processing for the ESTABLISHED state, if @@ -2521,13 +2687,12 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tc0->state = TCP_STATE_CLOSED; TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - tcp_connection_timers_reset (tc0); - /* Don't delete the connection/session yet. Instead, wait a - * reasonable amount of time until the pipes are cleared. In - * particular, this makes sure that we won't have dead sessions - * when processing events on the tx path */ - tcp_timer_set (tc0, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME); + /* Don't free the connection from the data path since + * we can't ensure that we have no packets already enqueued + * to output. Rely instead on the waitclose timer */ + tcp_connection_timers_reset (tc0); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, 1); goto drop; @@ -2590,6 +2755,8 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp_connection_timers_reset (tc0); tcp_make_fin (tc0, b0); tc0->snd_nxt += 1; + tc0->snd_una_max = tc0->snd_nxt; + tcp_retransmit_timer_set (tc0); next0 = tcp_next_output (tc0->c_is_ip4); stream_session_disconnect_notify (&tc0->connection); tc0->state = TCP_STATE_CLOSE_WAIT; @@ -2971,168 +3138,239 @@ typedef enum _tcp_input_next #define filter_flags (TCP_FLAG_SYN|TCP_FLAG_ACK|TCP_FLAG_RST|TCP_FLAG_FIN) -always_inline uword -tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame, int is_ip4) +static void +tcp_input_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_buffer_t ** bs, u32 n_bufs, u8 is_ip4) { - u32 n_left_from, next_index, *from, *to_next; - u32 my_thread_index = vm->thread_index; - tcp_main_t *tm = vnet_get_tcp_main (); + tcp_connection_t *tc; + tcp_header_t *tcp; + tcp_rx_trace_t *t; + int i; - from = vlib_frame_vector_args (from_frame); - n_left_from = from_frame->n_vectors; - next_index = node->cached_next_index; - tcp_set_time_now (my_thread_index); + for (i = 0; i < n_bufs; i++) + { + if (bs[i]->flags & VLIB_BUFFER_IS_TRACED) + { + t = vlib_add_trace (vm, node, bs[i], sizeof (*t)); + tc = tcp_connection_get (vnet_buffer (bs[i])->tcp.connection_index, + vm->thread_index); + tcp = vlib_buffer_get_current (bs[i]); + tcp_set_rx_trace_data (t, tc, tcp, bs[i], is_ip4); + } + } +} - while (n_left_from > 0) +static void +tcp_input_set_error_next (tcp_main_t * tm, u16 * next, u32 * error, u8 is_ip4) +{ + if (*error == TCP_ERROR_FILTERED) { - u32 n_left_to_next; + *next = TCP_INPUT_NEXT_DROP; + } + else if ((is_ip4 && tm->punt_unknown4) || (!is_ip4 && tm->punt_unknown6)) + { + *next = TCP_INPUT_NEXT_PUNT; + *error = TCP_ERROR_PUNT; + } + else + { + *next = TCP_INPUT_NEXT_RESET; + *error = TCP_ERROR_NO_LISTENER; + } +} - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); +static inline tcp_connection_t * +tcp_input_lookup_buffer (vlib_buffer_t * b, u8 thread_index, u32 * error, + u8 is_ip4) +{ + u32 fib_index = vnet_buffer (b)->ip.fib_index; + int n_advance_bytes, n_data_bytes; + transport_connection_t *tc; + tcp_header_t *tcp; + u8 is_filtered = 0; - while (n_left_from > 0 && n_left_to_next > 0) + if (is_ip4) + { + ip4_header_t *ip4 = vlib_buffer_get_current (b); + tcp = ip4_next_header (ip4); + vnet_buffer (b)->tcp.hdr_offset = (u8 *) tcp - (u8 *) ip4; + n_advance_bytes = (ip4_header_bytes (ip4) + tcp_header_bytes (tcp)); + n_data_bytes = clib_net_to_host_u16 (ip4->length) - n_advance_bytes; + + /* Length check. Checksum computed by ipx_local no need to compute again */ + if (PREDICT_FALSE (n_advance_bytes < 0)) { - int n_advance_bytes0, n_data_bytes0; - u32 bi0, fib_index0; - vlib_buffer_t *b0; - tcp_header_t *tcp0 = 0; - tcp_connection_t *tc0; - transport_connection_t *tconn; - ip4_header_t *ip40; - ip6_header_t *ip60; - u32 error0 = TCP_ERROR_NO_LISTENER, next0 = TCP_INPUT_NEXT_DROP; - u8 flags0, is_filtered = 0; + *error = TCP_ERROR_LENGTH; + return 0; + } - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; + tc = session_lookup_connection_wt4 (fib_index, &ip4->dst_address, + &ip4->src_address, tcp->dst_port, + tcp->src_port, TRANSPORT_PROTO_TCP, + thread_index, &is_filtered); + } + else + { + ip6_header_t *ip6 = vlib_buffer_get_current (b); + tcp = ip6_next_header (ip6); + vnet_buffer (b)->tcp.hdr_offset = (u8 *) tcp - (u8 *) ip6; + n_advance_bytes = tcp_header_bytes (tcp); + n_data_bytes = clib_net_to_host_u16 (ip6->payload_length) + - n_advance_bytes; + n_advance_bytes += sizeof (ip6[0]); - b0 = vlib_get_buffer (vm, bi0); - vnet_buffer (b0)->tcp.flags = 0; - fib_index0 = vnet_buffer (b0)->ip.fib_index; + if (PREDICT_FALSE (n_advance_bytes < 0)) + { + *error = TCP_ERROR_LENGTH; + return 0; + } - /* Checksum computed by ipx_local no need to compute again */ + tc = session_lookup_connection_wt6 (fib_index, &ip6->dst_address, + &ip6->src_address, tcp->dst_port, + tcp->src_port, TRANSPORT_PROTO_TCP, + thread_index, &is_filtered); + } - if (is_ip4) - { - ip40 = vlib_buffer_get_current (b0); - tcp0 = ip4_next_header (ip40); - n_advance_bytes0 = (ip4_header_bytes (ip40) - + tcp_header_bytes (tcp0)); - n_data_bytes0 = clib_net_to_host_u16 (ip40->length) - - n_advance_bytes0; - tconn = session_lookup_connection_wt4 (fib_index0, - &ip40->dst_address, - &ip40->src_address, - tcp0->dst_port, - tcp0->src_port, - TRANSPORT_PROTO_TCP, - my_thread_index, - &is_filtered); - } - else - { - ip60 = vlib_buffer_get_current (b0); - tcp0 = ip6_next_header (ip60); - n_advance_bytes0 = tcp_header_bytes (tcp0); - n_data_bytes0 = clib_net_to_host_u16 (ip60->payload_length) - - n_advance_bytes0; - n_advance_bytes0 += sizeof (ip60[0]); - tconn = session_lookup_connection_wt6 (fib_index0, - &ip60->dst_address, - &ip60->src_address, - tcp0->dst_port, - tcp0->src_port, - TRANSPORT_PROTO_TCP, - my_thread_index, - &is_filtered); - } + vnet_buffer (b)->tcp.seq_number = clib_net_to_host_u32 (tcp->seq_number); + vnet_buffer (b)->tcp.ack_number = clib_net_to_host_u32 (tcp->ack_number); + vnet_buffer (b)->tcp.data_offset = n_advance_bytes; + vnet_buffer (b)->tcp.data_len = n_data_bytes; + vnet_buffer (b)->tcp.flags = 0; - /* Length check */ - if (PREDICT_FALSE (n_advance_bytes0 < 0)) - { - error0 = TCP_ERROR_LENGTH; - goto done; - } + *error = is_filtered ? TCP_ERROR_FILTERED : *error; - vnet_buffer (b0)->tcp.hdr_offset = (u8 *) tcp0 - - (u8 *) vlib_buffer_get_current (b0); + return tcp_get_connection_from_transport (tc); +} - /* Session exists */ - if (PREDICT_TRUE (0 != tconn)) - { - tc0 = tcp_get_connection_from_transport (tconn); - ASSERT (tcp_lookup_is_valid (tc0, tcp0)); +static inline void +tcp_input_dispatch_buffer (tcp_main_t * tm, tcp_connection_t * tc, + vlib_buffer_t * b, u16 * next, u32 * error) +{ + tcp_header_t *tcp; + u8 flags; - /* Save connection index */ - vnet_buffer (b0)->tcp.connection_index = tc0->c_c_index; - vnet_buffer (b0)->tcp.seq_number = - clib_net_to_host_u32 (tcp0->seq_number); - vnet_buffer (b0)->tcp.ack_number = - clib_net_to_host_u32 (tcp0->ack_number); + tcp = tcp_buffer_hdr (b); + flags = tcp->flags & filter_flags; + *next = tm->dispatch_table[tc->state][flags].next; + *error = tm->dispatch_table[tc->state][flags].error; - vnet_buffer (b0)->tcp.data_offset = n_advance_bytes0; - vnet_buffer (b0)->tcp.data_len = n_data_bytes0; + if (PREDICT_FALSE (*error == TCP_ERROR_DISPATCH + || *next == TCP_INPUT_NEXT_RESET)) + { + /* Overload tcp flags to store state */ + tcp_state_t state = tc->state; + vnet_buffer (b)->tcp.flags = tc->state; - flags0 = tcp0->flags & filter_flags; - next0 = tm->dispatch_table[tc0->state][flags0].next; - error0 = tm->dispatch_table[tc0->state][flags0].error; + if (*error == TCP_ERROR_DISPATCH) + clib_warning ("disp error state %U flags %U", format_tcp_state, + state, format_tcp_flags, (int) flags); + } +} - if (PREDICT_FALSE (error0 == TCP_ERROR_DISPATCH - || next0 == TCP_INPUT_NEXT_RESET)) - { - /* Overload tcp flags to store state */ - tcp_state_t state0 = tc0->state; - vnet_buffer (b0)->tcp.flags = tc0->state; - - if (error0 == TCP_ERROR_DISPATCH) - clib_warning ("disp error state %U flags %U", - format_tcp_state, state0, format_tcp_flags, - (int) flags0); - } +always_inline uword +tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame, int is_ip4) +{ + u32 n_left_from, *from, thread_index = vm->thread_index; + tcp_main_t *tm = vnet_get_tcp_main (); + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; + u16 nexts[VLIB_FRAME_SIZE], *next; + + tcp_set_time_now (thread_index); + + from = vlib_frame_vector_args (frame); + n_left_from = frame->n_vectors; + vlib_get_buffers (vm, from, bufs, n_left_from); + + b = bufs; + next = nexts; + + while (n_left_from >= 4) + { + u32 error0 = TCP_ERROR_NO_LISTENER, error1 = TCP_ERROR_NO_LISTENER; + tcp_connection_t *tc0, *tc1; + + { + vlib_prefetch_buffer_header (b[2], STORE); + CLIB_PREFETCH (b[2]->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD); + + vlib_prefetch_buffer_header (b[3], STORE); + CLIB_PREFETCH (b[3]->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD); + } + + next[0] = next[1] = TCP_INPUT_NEXT_DROP; + + tc0 = tcp_input_lookup_buffer (b[0], thread_index, &error0, is_ip4); + tc1 = tcp_input_lookup_buffer (b[1], thread_index, &error1, is_ip4); + + if (PREDICT_TRUE (!tc0 + !tc1 == 0)) + { + ASSERT (tcp_lookup_is_valid (tc0, tcp_buffer_hdr (b[0]))); + ASSERT (tcp_lookup_is_valid (tc1, tcp_buffer_hdr (b[1]))); + + vnet_buffer (b[0])->tcp.connection_index = tc0->c_c_index; + vnet_buffer (b[1])->tcp.connection_index = tc1->c_c_index; + + tcp_input_dispatch_buffer (tm, tc0, b[0], &next[0], &error0); + tcp_input_dispatch_buffer (tm, tc1, b[1], &next[1], &error1); + } + else + { + if (PREDICT_TRUE (tc0 != 0)) + { + ASSERT (tcp_lookup_is_valid (tc0, tcp_buffer_hdr (b[0]))); + vnet_buffer (b[0])->tcp.connection_index = tc0->c_c_index; + tcp_input_dispatch_buffer (tm, tc0, b[0], &next[0], &error0); } else + tcp_input_set_error_next (tm, &next[0], &error0, is_ip4); + + if (PREDICT_TRUE (tc1 != 0)) { - if (is_filtered) - { - next0 = TCP_INPUT_NEXT_DROP; - error0 = TCP_ERROR_FILTERED; - } - else if ((is_ip4 && tm->punt_unknown4) || - (!is_ip4 && tm->punt_unknown6)) - { - next0 = TCP_INPUT_NEXT_PUNT; - error0 = TCP_ERROR_PUNT; - } - else - { - /* Send reset */ - next0 = TCP_INPUT_NEXT_RESET; - error0 = TCP_ERROR_NO_LISTENER; - } - tc0 = 0; + ASSERT (tcp_lookup_is_valid (tc1, tcp_buffer_hdr (b[1]))); + vnet_buffer (b[1])->tcp.connection_index = tc1->c_c_index; + tcp_input_dispatch_buffer (tm, tc1, b[1], &next[1], &error1); } + else + tcp_input_set_error_next (tm, &next[1], &error1, is_ip4); + } - done: - b0->error = error0 ? node->errors[error0] : 0; + b += 2; + next += 2; + n_left_from -= 2; + } + while (n_left_from > 0) + { + tcp_connection_t *tc0; + u32 error0 = TCP_ERROR_NO_LISTENER; - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - tcp_rx_trace_t *t0; - t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); - tcp_set_rx_trace_data (t0, tc0, tcp0, b0, is_ip4); - } - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); + if (n_left_from > 1) + { + vlib_prefetch_buffer_header (b[1], STORE); + CLIB_PREFETCH (b[1]->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD); } - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + next[0] = TCP_INPUT_NEXT_DROP; + tc0 = tcp_input_lookup_buffer (b[0], thread_index, &error0, is_ip4); + if (PREDICT_TRUE (tc0 != 0)) + { + ASSERT (tcp_lookup_is_valid (tc0, tcp_buffer_hdr (b[0]))); + vnet_buffer (b[0])->tcp.connection_index = tc0->c_c_index; + tcp_input_dispatch_buffer (tm, tc0, b[0], &next[0], &error0); + } + else + tcp_input_set_error_next (tm, &next[0], &error0, is_ip4); + + b += 1; + next += 1; + n_left_from -= 1; } - return from_frame->n_vectors; + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) + tcp_input_trace_frame (vm, node, bufs, frame->n_vectors, is_ip4); + + vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors); + return frame->n_vectors; } static uword @@ -3221,7 +3459,11 @@ do { \ /* ACK for for a SYN-ACK -> tcp-rcv-process. */ _(SYN_RCVD, TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(SYN_RCVD, TCP_FLAG_RST, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); + _(SYN_RCVD, TCP_FLAG_RST | TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, + TCP_ERROR_NONE); _(SYN_RCVD, TCP_FLAG_SYN, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); + _(SYN_RCVD, TCP_FLAG_FIN | TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, + TCP_ERROR_NONE); /* SYN-ACK for a SYN */ _(SYN_SENT, TCP_FLAG_SYN | TCP_FLAG_ACK, TCP_INPUT_NEXT_SYN_SENT, TCP_ERROR_NONE); @@ -3262,6 +3504,7 @@ do { \ _(LAST_ACK, TCP_FLAG_FIN | TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(LAST_ACK, TCP_FLAG_RST, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); + _(LAST_ACK, TCP_FLAG_SYN, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(TIME_WAIT, TCP_FLAG_FIN, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(TIME_WAIT, TCP_FLAG_FIN | TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); @@ -3274,7 +3517,7 @@ do { \ #undef _ } -clib_error_t * +static clib_error_t * tcp_input_init (vlib_main_t * vm) { clib_error_t *error = 0;