X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_input.c;h=9c303eb01a5fb58f31fedc4a2338853914b3e607;hb=7ac053b27fee8f9e437cf7b61357943356381061;hp=e6c12f07ad299331a3e6f10b30ecff2df3c13627;hpb=c01c4451c5c6285fbfb086fb46557234804f86ee;p=vpp.git diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index e6c12f07ad2..9c303eb01a5 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -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) { @@ -257,7 +258,7 @@ tcp_update_timestamp (tcp_connection_t * tc, u32 seq, u32 seq_end) { ASSERT (timestamp_leq (tc->tsval_recent, tc->rcv_opts.tsval)); tc->tsval_recent = tc->rcv_opts.tsval; - tc->tsval_recent_age = tcp_time_now (); + tc->tsval_recent_age = tcp_time_now_w_thread (tc->c_thread_index); } } @@ -271,29 +272,28 @@ tcp_update_timestamp (tcp_connection_t * tc, u32 seq, u32 seq_end) * @return 0 if segments passes validation. */ static int -tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, - vlib_buffer_t * b0, tcp_header_t * th0, - u32 * next0, u32 * error0) +tcp_segment_validate (tcp_worker_ctx_t * wrk, tcp_connection_t * tc0, + vlib_buffer_t * b0, tcp_header_t * th0, 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; + goto error; } if (PREDICT_FALSE (!tcp_ack (th0) && !tcp_rst (th0) && !tcp_syn (th0))) { *error0 = TCP_ERROR_SEGMENT_INVALID; - goto drop; + goto error; } if (PREDICT_FALSE (tcp_options_parse (th0, &tc0->rcv_opts))) { clib_warning ("options parse error"); *error0 = TCP_ERROR_OPTIONS; - goto drop; + goto error; } if (PREDICT_FALSE (tcp_segment_check_paws (tc0))) @@ -307,7 +307,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, /* If it just so happens that a segment updates tsval_recent for a * segment over 24 days old, invalidate tsval_recent. */ if (timestamp_lt (tc0->tsval_recent_age + TCP_PAWS_IDLE, - tcp_time_now ())) + tcp_time_now_w_thread (tc0->c_thread_index))) { /* Age isn't reset until we get a valid tsval (bsd inspired) */ tc0->tsval_recent = 0; @@ -318,12 +318,11 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, /* Drop after ack if not rst */ if (!tcp_rst (th0)) { - tcp_make_ack (tc0, b0); + tcp_program_ack (wrk, tc0); TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); - goto error; } } - goto drop; + goto error; } /* 1st: check sequence number */ @@ -339,11 +338,10 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, /* If not RST, send dup ack */ if (!tcp_rst (th0)) { - tcp_make_ack (tc0, b0); + tcp_program_dupack (wrk, tc0); TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); - goto error; } - goto drop; + goto error; } } @@ -352,7 +350,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, { tcp_connection_reset (tc0); *error0 = TCP_ERROR_RST_RCVD; - goto drop; + goto error; } /* 3rd: check security and precedence (skip) */ @@ -363,12 +361,12 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, /* TODO implement RFC 5961 */ if (tc0->state == TCP_STATE_SYN_RCVD) { - tcp_make_synack (tc0, b0); + tcp_send_synack (tc0); TCP_EVT_DBG (TCP_EVT_SYN_RCVD, tc0, 0); } else { - tcp_make_ack (tc0, b0); + tcp_program_ack (wrk, tc0); TCP_EVT_DBG (TCP_EVT_SYNACK_RCVD, tc0); } goto error; @@ -379,11 +377,7 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, vnet_buffer (b0)->tcp.seq_end); return 0; -drop: - *next0 = tcp_next_drop (tc0->c_is_ip4); - return -1; error: - *next0 = tcp_next_output (tc0->c_is_ip4); return -1; } @@ -461,14 +455,16 @@ tcp_update_rtt (tcp_connection_t * tc, u32 ack) if (tc->rtt_ts && seq_geq (ack, tc->rtt_seq)) { - mrtt = tcp_time_now () - tc->rtt_ts; + tc->mrtt_us = tcp_time_now_us (tc->c_thread_index) - tc->rtt_ts; + mrtt = clib_max ((u32) (tc->mrtt_us * THZ), 1); } /* As per RFC7323 TSecr can be used for RTTM only if the segment advances * snd_una, i.e., the left side of the send window: * seq_lt (tc->snd_una, ack). This is a condition for calling update_rtt */ else if (tcp_opts_tstamp (&tc->rcv_opts) && tc->rcv_opts.tsecr) { - mrtt = tcp_time_now () - tc->rcv_opts.tsecr; + u32 now = tcp_time_now_w_thread (tc->c_thread_index); + mrtt = clib_max (now - tc->rcv_opts.tsecr, 1); } /* Ignore dubious measurements */ @@ -491,23 +487,46 @@ done: } /** - * Dequeue bytes that have been acked and while at it update RTT estimates. + * Dequeue bytes for connections that have received acks in last burst */ static void -tcp_dequeue_acked (tcp_connection_t * tc, u32 ack) +tcp_handle_postponed_dequeues (tcp_worker_ctx_t * wrk) { - /* Dequeue the newly ACKed add SACKed bytes */ - stream_session_dequeue_drop (&tc->connection, - tc->bytes_acked + tc->sack_sb.snd_una_adv); + u32 thread_index = wrk->vm->thread_index; + u32 *pending_deq_acked; + tcp_connection_t *tc; + int i; - tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + if (!vec_len (wrk->pending_deq_acked)) + return; - /* Update rtt and rto */ - tcp_update_rtt (tc, ack); + pending_deq_acked = wrk->pending_deq_acked; + for (i = 0; i < vec_len (pending_deq_acked); i++) + { + tc = tcp_connection_get (pending_deq_acked[i], thread_index); + tc->flags &= ~TCP_CONN_DEQ_PENDING; - /* If everything has been acked, stop retransmit timer - * otherwise update. */ - tcp_retransmit_timer_update (tc); + /* Dequeue the newly ACKed bytes */ + stream_session_dequeue_drop (&tc->connection, tc->burst_acked); + tc->burst_acked = 0; + tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + + /* If everything has been acked, stop retransmit timer + * otherwise update. */ + tcp_retransmit_timer_update (tc); + } + _vec_len (wrk->pending_deq_acked) = 0; +} + +static void +tcp_program_dequeue (tcp_worker_ctx_t * wrk, tcp_connection_t * tc) +{ + if (!(tc->flags & TCP_CONN_DEQ_PENDING)) + { + vec_add1 (wrk->pending_deq_acked, tc->c_c_index); + tc->flags |= TCP_CONN_DEQ_PENDING; + } + tc->burst_acked += tc->bytes_acked + tc->sack_sb.snd_una_adv; } /** @@ -621,7 +640,7 @@ scoreboard_remove_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) /* Poison the entry */ if (CLIB_DEBUG > 0) - memset (hole, 0xfe, sizeof (*hole)); + clib_memset (hole, 0xfe, sizeof (*hole)); pool_put (sb->holes, hole); } @@ -634,7 +653,7 @@ scoreboard_insert_hole (sack_scoreboard_t * sb, u32 prev_index, u32 hole_index; pool_get (sb->holes, hole); - memset (hole, 0, sizeof (*hole)); + clib_memset (hole, 0, sizeof (*hole)); hole->start = start; hole->end = end; @@ -666,39 +685,45 @@ scoreboard_insert_hole (sack_scoreboard_t * sb, u32 prev_index, 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; } - while ((prev = scoreboard_prev_hole (sb, hole)) - && (bytes < (TCP_DUPACK_THRESHOLD - 1) * tc->snd_mss - && blks < TCP_DUPACK_THRESHOLD)) + while ((right = left) + && bytes < (TCP_DUPACK_THRESHOLD - 1) * tc->snd_mss + && blks < TCP_DUPACK_THRESHOLD + /* left not updated if above conditions fail */ + && (left = scoreboard_prev_hole (sb, right))) { - bytes += hole->start - prev->end; + bytes += right->start - left->end; blks++; - hole = prev; } - while (hole) + /* left is first lost */ + if (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; + do + { + sb->lost_bytes += scoreboard_hole_bytes (right); + left->is_lost = 1; + left = scoreboard_prev_hole (sb, right); + if (left) + bytes += right->start - left->end; + } + while ((right = left)); } + sb->sacked_bytes = bytes; } @@ -710,8 +735,7 @@ scoreboard_update_bytes (tcp_connection_t * tc, sack_scoreboard_t * sb) sack_scoreboard_hole_t * scoreboard_next_rxt_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * start, - u8 have_sent_1_smss, - u8 * can_rescue, u8 * snd_limited) + u8 have_unsent, u8 * can_rescue, u8 * snd_limited) { sack_scoreboard_hole_t *hole = 0; @@ -733,16 +757,16 @@ scoreboard_next_rxt_hole (sack_scoreboard_t * sb, } else { - /* Rule (2): output takes care of transmitting new data */ - if (!have_sent_1_smss) + /* Rule (2): available unsent data */ + if (have_unsent) { - hole = 0; sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; + return 0; } /* Rule (3): if hole not lost */ else if (seq_lt (hole->start, sb->high_sacked)) { - *snd_limited = 1; + *snd_limited = 0; sb->cur_rxt_hole = scoreboard_hole_index (sb, hole); } /* Rule (4): if hole beyond high_sacked */ @@ -763,16 +787,17 @@ scoreboard_next_rxt_hole (sack_scoreboard_t * sb, } static void -scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 seq) +scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 snd_una) { sack_scoreboard_hole_t *hole; hole = scoreboard_first_hole (sb); if (hole) { - seq = seq_gt (seq, hole->start) ? seq : hole->start; + snd_una = seq_gt (snd_una, hole->start) ? snd_una : hole->start; sb->cur_rxt_hole = sb->head; } - sb->high_rxt = seq; + sb->high_rxt = snd_una; + sb->rescue_rxt = snd_una - 1; } void @@ -814,7 +839,8 @@ 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 @@ -973,14 +999,22 @@ 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 || tcp_in_recovery (tc)); - ASSERT (sb->sacked_bytes == 0 + ASSERT (sb->sacked_bytes == 0 || tcp_in_recovery (tc) || 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)); + - seq_max (tc->snd_una, ack) || tcp_in_recovery (tc)); 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); @@ -1005,7 +1039,7 @@ tcp_update_snd_wnd (tcp_connection_t * tc, u32 seq, u32 ack, u32 snd_wnd) tc->snd_wl2 = ack; TCP_EVT_DBG (TCP_EVT_SND_WND, tc); - if (tc->snd_wnd < tc->snd_mss) + if (PREDICT_FALSE (tc->snd_wnd < tc->snd_mss)) { /* Set persist timer if not set and we just got 0 wnd */ if (!tcp_timer_is_active (tc, TCP_TIMER_PERSIST) @@ -1015,7 +1049,7 @@ tcp_update_snd_wnd (tcp_connection_t * tc, u32 seq, u32 ack, u32 snd_wnd) else { tcp_persist_timer_reset (tc); - if (!tcp_in_recovery (tc) && tc->rto_boff > 0) + if (PREDICT_FALSE (!tcp_in_recovery (tc) && tc->rto_boff > 0)) { tc->rto_boff = 0; tcp_update_rto (tc); @@ -1036,6 +1070,9 @@ tcp_cc_init_congestion (tcp_connection_t * tc) tcp_fastrecovery_on (tc); tc->snd_congestion = tc->snd_una_max; tc->cwnd_acc_bytes = 0; + tc->snd_rxt_bytes = 0; + tc->prev_ssthresh = tc->ssthresh; + tc->prev_cwnd = tc->cwnd; tc->cc_algo->congestion (tc); TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 4); } @@ -1058,8 +1095,12 @@ tcp_cc_fastrecovery_exit (tcp_connection_t * tc) tc->snd_rxt_bytes = 0; tc->rcv_dupacks = 0; tc->snd_nxt = tc->snd_una_max; + tc->snd_rxt_bytes = 0; + tcp_fastrecovery_off (tc); tcp_fastrecovery_1_smss_off (tc); + tcp_fastrecovery_first_off (tc); + TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 3); } @@ -1072,13 +1113,14 @@ tcp_cc_congestion_undo (tcp_connection_t * tc) tc->rcv_dupacks = 0; if (tcp_in_recovery (tc)) tcp_cc_recovery_exit (tc); + else if (tcp_in_fastrecovery (tc)) + tcp_cc_fastrecovery_exit (tc); ASSERT (tc->rto_boff == 0); TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 5); - /* TODO extend for fastrecovery */ } -static u8 -tcp_cc_is_spurious_retransmit (tcp_connection_t * tc) +static inline u8 +tcp_cc_is_spurious_timeout_rxt (tcp_connection_t * tc) { return (tcp_in_recovery (tc) && tc->rto_boff == 1 && tc->snd_rxt_ts @@ -1086,6 +1128,20 @@ tcp_cc_is_spurious_retransmit (tcp_connection_t * tc) && timestamp_lt (tc->rcv_opts.tsecr, tc->snd_rxt_ts)); } +static inline u8 +tcp_cc_is_spurious_fast_rxt (tcp_connection_t * tc) +{ + return (tcp_in_fastrecovery (tc) + && tc->cwnd > tc->ssthresh + 3 * tc->snd_mss); +} + +static u8 +tcp_cc_is_spurious_retransmit (tcp_connection_t * tc) +{ + return (tcp_cc_is_spurious_timeout_rxt (tc) + || tcp_cc_is_spurious_fast_rxt (tc)); +} + static int tcp_cc_recover (tcp_connection_t * tc) { @@ -1113,8 +1169,7 @@ tcp_cc_update (tcp_connection_t * tc, vlib_buffer_t * b) ASSERT (!tcp_in_cong_recovery (tc) || tcp_is_lost_fin (tc)); /* Congestion avoidance */ - tc->cc_algo->rcv_ack (tc); - tc->tsecr_last_ack = tc->rcv_opts.tsecr; + tcp_cc_rcv_ack (tc); /* If a cumulative ack, make sure dupacks is 0 */ tc->rcv_dupacks = 0; @@ -1142,6 +1197,75 @@ tcp_should_fastrecover (tcp_connection_t * tc) || tcp_should_fastrecover_sack (tc)); } +void +tcp_program_fastretransmit (tcp_worker_ctx_t * wrk, tcp_connection_t * tc) +{ + if (!(tc->flags & TCP_CONN_FRXT_PENDING)) + { + vec_add1 (wrk->pending_fast_rxt, tc->c_c_index); + tc->flags |= TCP_CONN_FRXT_PENDING; + } +} + +void +tcp_do_fastretransmits (tcp_worker_ctx_t * wrk) +{ + u32 *ongoing_fast_rxt, burst_bytes, sent_bytes, thread_index; + u32 max_burst_size, burst_size, n_segs = 0, n_segs_now; + tcp_connection_t *tc; + u64 last_cpu_time; + int i; + + if (vec_len (wrk->pending_fast_rxt) == 0 + && vec_len (wrk->postponed_fast_rxt) == 0) + return; + + thread_index = wrk->vm->thread_index; + last_cpu_time = wrk->vm->clib_time.last_cpu_time; + ongoing_fast_rxt = wrk->ongoing_fast_rxt; + vec_append (ongoing_fast_rxt, wrk->postponed_fast_rxt); + vec_append (ongoing_fast_rxt, wrk->pending_fast_rxt); + + _vec_len (wrk->postponed_fast_rxt) = 0; + _vec_len (wrk->pending_fast_rxt) = 0; + + max_burst_size = VLIB_FRAME_SIZE / vec_len (ongoing_fast_rxt); + max_burst_size = clib_max (max_burst_size, 1); + + for (i = 0; i < vec_len (ongoing_fast_rxt); i++) + { + if (n_segs >= VLIB_FRAME_SIZE) + { + vec_add1 (wrk->postponed_fast_rxt, ongoing_fast_rxt[i]); + continue; + } + + tc = tcp_connection_get (ongoing_fast_rxt[i], thread_index); + tc->flags &= ~TCP_CONN_FRXT_PENDING; + + if (!tcp_in_fastrecovery (tc)) + continue; + + burst_size = clib_min (max_burst_size, VLIB_FRAME_SIZE - n_segs); + burst_bytes = transport_connection_tx_pacer_burst (&tc->connection, + last_cpu_time); + burst_size = clib_min (burst_size, burst_bytes / tc->snd_mss); + if (!burst_size) + { + tcp_program_fastretransmit (wrk, tc); + continue; + } + + n_segs_now = tcp_fast_retransmit (wrk, tc, burst_size); + sent_bytes = clib_min (n_segs_now * tc->snd_mss, burst_bytes); + transport_connection_tx_pacer_update_bytes (&tc->connection, + sent_bytes); + n_segs += n_segs_now; + } + _vec_len (ongoing_fast_rxt) = 0; + wrk->ongoing_fast_rxt = ongoing_fast_rxt; +} + /** * One function to rule them all ... and in the darkness bind them */ @@ -1154,7 +1278,7 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) { if (tc->bytes_acked) goto partial_ack; - tcp_fast_retransmit (tc); + tcp_program_fastretransmit (tcp_get_worker (tc->c_thread_index), tc); return; } /* @@ -1178,22 +1302,14 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) } else if (tcp_should_fastrecover (tc)) { + u32 pacer_wnd; + ASSERT (!tcp_in_fastrecovery (tc)); - /* If of of the two conditions lower hold, reset dupacks because - * we're probably after timeout (RFC6582 heuristics). - * If Cumulative ack does not cover more than congestion threshold, - * and: - * 1) The following doesn't hold: The congestion window is greater - * than SMSS bytes and the difference between highest_ack - * and prev_highest_ack is at most 4*SMSS bytes - * 2) Echoed timestamp in the last non-dup ack does not equal the - * stored timestamp - */ - if (seq_leq (tc->snd_una, tc->snd_congestion) - && ((!(tc->cwnd > tc->snd_mss - && tc->bytes_acked <= 4 * tc->snd_mss)) - || (tc->rcv_opts.tsecr != tc->tsecr_last_ack))) + /* Heuristic to catch potential late dupacks + * after fast retransmit exits */ + if (is_dack && tc->snd_una == tc->snd_congestion + && timestamp_leq (tc->rcv_opts.tsecr, tc->tsecr_last_ack)) { tc->rcv_dupacks = 0; return; @@ -1202,26 +1318,25 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) tcp_cc_init_congestion (tc); tc->cc_algo->rcv_cong_ack (tc, TCP_CC_DUPACK); - /* The first segment MUST be retransmitted */ - tcp_retransmit_first_unacked (tc); - - /* Post retransmit update cwnd to ssthresh and account for the - * three segments that have left the network and should've been - * buffered at the receiver XXX */ - tc->cwnd = tc->ssthresh + tc->rcv_dupacks * tc->snd_mss; - ASSERT (tc->cwnd >= tc->snd_mss); - - /* If cwnd allows, send more data */ if (tcp_opts_sack_permitted (&tc->rcv_opts)) { - scoreboard_init_high_rxt (&tc->sack_sb, - tc->snd_una + tc->snd_mss); - tcp_fast_retransmit_sack (tc); + tc->cwnd = tc->ssthresh; + scoreboard_init_high_rxt (&tc->sack_sb, tc->snd_una); } else { - tcp_fast_retransmit_no_sack (tc); + /* Post retransmit update cwnd to ssthresh and account for the + * three segments that have left the network and should've been + * buffered at the receiver XXX */ + tc->cwnd = tc->ssthresh + 3 * tc->snd_mss; } + + /* Constrain rate until we get a partial ack */ + pacer_wnd = clib_max (0.1 * tc->cwnd, 2 * tc->snd_mss); + tcp_connection_tx_pacer_reset (tc, pacer_wnd, + 0 /* start bucket */ ); + tcp_program_fastretransmit (tcp_get_worker (tc->c_thread_index), + tc); return; } else if (!tc->bytes_acked @@ -1233,6 +1348,28 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) else goto partial_ack; } + /* Don't allow entry in fast recovery if still in recovery, for now */ + else if (0 && is_dack && tcp_in_recovery (tc)) + { + /* If of of the two conditions lower hold, reset dupacks because + * we're probably after timeout (RFC6582 heuristics). + * If Cumulative ack does not cover more than congestion threshold, + * and: + * 1) The following doesn't hold: The congestion window is greater + * than SMSS bytes and the difference between highest_ack + * and prev_highest_ack is at most 4*SMSS bytes + * 2) Echoed timestamp in the last non-dup ack does not equal the + * stored timestamp + */ + if (seq_leq (tc->snd_una, tc->snd_congestion) + && ((!(tc->cwnd > tc->snd_mss + && tc->bytes_acked <= 4 * tc->snd_mss)) + || (tc->rcv_opts.tsecr != tc->tsecr_last_ack))) + { + tc->rcv_dupacks = 0; + return; + } + } if (!tc->bytes_acked) return; @@ -1243,14 +1380,11 @@ partial_ack: /* * Legitimate ACK. 1) See if we can exit recovery */ - /* XXX limit this only to first partial ack? */ - 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)) { + tcp_retransmit_timer_update (tc); + /* If spurious return, we've already updated everything */ if (tcp_cc_recover (tc)) { @@ -1261,8 +1395,7 @@ partial_ack: tc->snd_nxt = tc->snd_una_max; /* Treat as congestion avoidance ack */ - tc->cc_algo->rcv_ack (tc); - tc->tsecr_last_ack = tc->rcv_opts.tsecr; + tcp_cc_rcv_ack (tc); return; } @@ -1270,6 +1403,13 @@ partial_ack: * Legitimate ACK. 2) If PARTIAL ACK try to retransmit */ + /* Update the pacing rate. For the first partial ack we move from + * the artificially constrained rate to the one after congestion */ + tcp_connection_tx_pacer_update (tc); + + /* XXX limit this only to first partial ack? */ + tcp_retransmit_timer_force_update (tc); + /* RFC6675: If the incoming ACK is a cumulative acknowledgment, * reset dupacks to 0. Also needed if in congestion recovery */ tc->rcv_dupacks = 0; @@ -1277,31 +1417,43 @@ partial_ack: /* Post RTO timeout don't try anything fancy */ if (tcp_in_recovery (tc)) { - tc->cc_algo->rcv_ack (tc); - tc->tsecr_last_ack = tc->rcv_opts.tsecr; + tcp_cc_rcv_ack (tc); transport_add_tx_event (&tc->connection); return; } /* Remove retransmitted bytes that have been delivered */ - ASSERT (tc->bytes_acked + tc->sack_sb.snd_una_adv - >= tc->sack_sb.last_bytes_delivered - || (tc->flags & TCP_CONN_FINSNT)); - - if (seq_lt (tc->snd_una, tc->sack_sb.high_rxt)) + if (tcp_opts_sack_permitted (&tc->rcv_opts)) { + ASSERT (tc->bytes_acked + tc->sack_sb.snd_una_adv + >= tc->sack_sb.last_bytes_delivered + || (tc->flags & TCP_CONN_FINSNT)); + /* If we have sacks and we haven't gotten an ack beyond high_rxt, * remove sacked bytes delivered */ - rxt_delivered = tc->bytes_acked + tc->sack_sb.snd_una_adv - - tc->sack_sb.last_bytes_delivered; - ASSERT (tc->snd_rxt_bytes >= rxt_delivered); - tc->snd_rxt_bytes -= rxt_delivered; + if (seq_lt (tc->snd_una, tc->sack_sb.high_rxt)) + { + rxt_delivered = tc->bytes_acked + tc->sack_sb.snd_una_adv + - tc->sack_sb.last_bytes_delivered; + ASSERT (tc->snd_rxt_bytes >= rxt_delivered); + tc->snd_rxt_bytes -= rxt_delivered; + } + else + { + /* Apparently all retransmitted holes have been acked */ + tc->snd_rxt_bytes = 0; + tc->sack_sb.high_rxt = tc->snd_una; + } } else { - /* Either all retransmitted holes have been acked, or we're - * "in the blind" and retransmitting segment by segment */ - tc->snd_rxt_bytes = 0; + tcp_fastrecovery_first_on (tc); + /* Reuse last bytes delivered to track total bytes acked */ + tc->sack_sb.last_bytes_delivered += tc->bytes_acked; + if (tc->snd_rxt_bytes > tc->bytes_acked) + tc->snd_rxt_bytes -= tc->bytes_acked; + else + tc->snd_rxt_bytes = 0; } tc->cc_algo->rcv_cong_ack (tc, TCP_CC_PARTIALACK); @@ -1309,15 +1461,15 @@ partial_ack: /* * Since this was a partial ack, try to retransmit some more data */ - tcp_fast_retransmit (tc); + tcp_program_fastretransmit (tcp_get_worker (tc->c_thread_index), tc); } /** * Process incoming ACK */ static int -tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, - tcp_header_t * th, u32 * next, u32 * error) +tcp_rcv_ack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, vlib_buffer_t * b, + tcp_header_t * th, u32 * error) { u32 prev_snd_wnd, prev_snd_una; u8 is_dack; @@ -1343,9 +1495,8 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, * drop it */ if (seq_gt (vnet_buffer (b)->tcp.ack_number, tc->snd_una_max)) { - tcp_make_ack (tc, b); - *next = tcp_next_output (tc->c_is_ip4); - *error = TCP_ERROR_ACK_INVALID; + tcp_program_ack (wrk, tc); + *error = TCP_ERROR_ACK_FUTURE; TCP_EVT_DBG (TCP_EVT_ACK_RCV_ERR, tc, 0, vnet_buffer (b)->tcp.ack_number); return -1; @@ -1355,7 +1506,6 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, vnet_buffer (b)->tcp.ack_number); tc->snd_nxt = vnet_buffer (b)->tcp.ack_number; - *error = TCP_ERROR_ACK_FUTURE; } /* If old ACK, probably it's an old dupack */ @@ -1387,7 +1537,10 @@ process_ack: tcp_validate_txf_size (tc, tc->bytes_acked); if (tc->bytes_acked) - tcp_dequeue_acked (tc, vnet_buffer (b)->tcp.ack_number); + { + tcp_program_dequeue (wrk, tc); + tcp_update_rtt (tc, vnet_buffer (b)->tcp.ack_number); + } TCP_EVT_DBG (TCP_EVT_ACK_RCVD, tc); @@ -1401,7 +1554,9 @@ process_ack: 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; } /* @@ -1521,25 +1676,16 @@ tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, else if (written > data_len) { tc->rcv_nxt += written; - - /* 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) { /* We've written something but FIFO is probably full now */ tc->rcv_nxt += written; - - /* Depending on how fast the app is, all remaining buffers in burst will - * not be enqueued. Inform peer */ - tc->flags |= TCP_CONN_SNDACK; - error = TCP_ERROR_PARTIALLY_ENQUEUED; } else { - tc->flags |= TCP_CONN_SNDACK; return TCP_ERROR_FIFO_FULL; } @@ -1658,7 +1804,8 @@ tcp_buffer_discard_bytes (vlib_buffer_t * b, u32 n_bytes_to_drop) * It handles both in order or out-of-order data. */ static int -tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) +tcp_segment_rcv (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, + vlib_buffer_t * b) { u32 error, n_bytes_to_drop, n_data_bytes; @@ -1677,9 +1824,8 @@ tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) * retransmissions since we may not have any data to send */ if (seq_leq (vnet_buffer (b)->tcp.seq_end, tc->rcv_nxt)) { - tcp_make_ack (tc, b); + tcp_program_ack (wrk, tc); error = TCP_ERROR_SEGMENT_OLD; - *next0 = tcp_next_output (tc->c_is_ip4); goto done; } @@ -1691,7 +1837,6 @@ tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) if (tcp_buffer_discard_bytes (b, n_bytes_to_drop)) { error = TCP_ERROR_SEGMENT_OLD; - *next0 = tcp_next_drop (tc->c_is_ip4); goto done; } goto in_order; @@ -1699,9 +1844,7 @@ tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) /* RFC2581: Enqueue and send DUPACK for fast retransmit */ error = tcp_session_enqueue_ooo (tc, b, n_data_bytes); - *next0 = tcp_next_output (tc->c_is_ip4); - tcp_make_ack (tc, b); - vnet_buffer (b)->tcp.flags = TCP_BUF_FLAG_DUPACK; + tcp_program_dupack (wrk, tc); TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc, vnet_buffer (b)->tcp); goto done; } @@ -1713,14 +1856,12 @@ in_order: error = tcp_session_enqueue_data (tc, b, n_data_bytes); if (tcp_can_delack (tc)) { - *next0 = tcp_next_drop (tc->c_is_ip4); if (!tcp_timer_is_active (tc, TCP_TIMER_DELACK)) tcp_timer_set (tc, TCP_TIMER_DELACK, TCP_DELACK_TIME); goto done; } - *next0 = tcp_next_output (tc->c_is_ip4); - tcp_make_ack (tc, b); + tcp_program_ack (wrk, tc); done: return error; @@ -1855,122 +1996,100 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame, int is_ip4) { u32 thread_index = vm->thread_index, errors = 0; - u32 n_left_from, next_index, *from, *to_next; + tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + u32 n_left_from, *from, *first_buffer; u16 err_counters[TCP_N_ERROR] = { 0 }; u8 is_fin = 0; if (node->flags & VLIB_NODE_FLAG_TRACE) tcp_established_trace_frame (vm, node, frame, is_ip4); - from = vlib_frame_vector_args (frame); + first_buffer = from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; - next_index = node->cached_next_index; while (n_left_from > 0) { - u32 n_left_to_next; + u32 bi0, error0 = TCP_ERROR_ACK_OK; + vlib_buffer_t *b0; + tcp_header_t *th0 = 0; + tcp_connection_t *tc0; - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); - while (n_left_from > 0 && n_left_to_next > 0) + if (n_left_from > 1) { - u32 bi0; - vlib_buffer_t *b0; - tcp_header_t *th0 = 0; - tcp_connection_t *tc0; - u32 next0 = tcp_next_drop (is_ip4), error0 = TCP_ERROR_ACK_OK; - - if (n_left_from > 1) - { - vlib_buffer_t *pb; - pb = vlib_get_buffer (vm, from[1]); - vlib_prefetch_buffer_header (pb, LOAD); - CLIB_PREFETCH (pb->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD); - } - - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; + vlib_buffer_t *pb; + pb = vlib_get_buffer (vm, from[1]); + vlib_prefetch_buffer_header (pb, LOAD); + CLIB_PREFETCH (pb->data, 2 * CLIB_CACHE_LINE_BYTES, LOAD); + } - b0 = vlib_get_buffer (vm, bi0); - tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, - thread_index); + bi0 = from[0]; + from += 1; + n_left_from -= 1; - if (PREDICT_FALSE (tc0 == 0)) - { - error0 = TCP_ERROR_INVALID_CONNECTION; - goto done; - } + b0 = vlib_get_buffer (vm, bi0); + tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, + thread_index); - th0 = tcp_buffer_hdr (b0); - /* N.B. buffer is rewritten if segment is ooo. Thus, th0 becomes a - * dangling reference. */ - is_fin = tcp_is_fin (th0); + if (PREDICT_FALSE (tc0 == 0)) + { + error0 = TCP_ERROR_INVALID_CONNECTION; + goto done; + } - /* SYNs, FINs and data consume sequence numbers */ - vnet_buffer (b0)->tcp.seq_end = vnet_buffer (b0)->tcp.seq_number - + tcp_is_syn (th0) + is_fin + vnet_buffer (b0)->tcp.data_len; + th0 = tcp_buffer_hdr (b0); + /* N.B. buffer is rewritten if segment is ooo. Thus, th0 becomes a + * dangling reference. */ + is_fin = tcp_is_fin (th0); - /* TODO header prediction fast path */ + /* SYNs, FINs and data consume sequence numbers */ + vnet_buffer (b0)->tcp.seq_end = vnet_buffer (b0)->tcp.seq_number + + tcp_is_syn (th0) + is_fin + vnet_buffer (b0)->tcp.data_len; - /* 1-4: check SEQ, RST, SYN */ - if (PREDICT_FALSE (tcp_segment_validate (vm, tc0, b0, th0, &next0, - &error0))) - { - tcp_maybe_inc_err_counter (err_counters, error0); - TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, vnet_buffer (b0)->tcp); - goto done; - } + /* TODO header prediction fast path */ - /* 5: check the ACK field */ - if (PREDICT_FALSE (tcp_rcv_ack (tc0, b0, th0, &next0, &error0))) - { - tcp_maybe_inc_err_counter (err_counters, error0); - goto done; - } + /* 1-4: check SEQ, RST, SYN */ + if (PREDICT_FALSE (tcp_segment_validate (wrk, tc0, b0, th0, &error0))) + { + TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, vnet_buffer (b0)->tcp); + goto done; + } - /* 6: check the URG bit TODO */ + /* 5: check the ACK field */ + if (PREDICT_FALSE (tcp_rcv_ack (wrk, tc0, b0, th0, &error0))) + goto done; - /* 7: process the segment text */ - if (vnet_buffer (b0)->tcp.data_len) - { - error0 = tcp_segment_rcv (tc0, b0, &next0); - tcp_maybe_inc_err_counter (err_counters, error0); - } + /* 6: check the URG bit TODO */ - /* 8: check the FIN bit */ - if (PREDICT_FALSE (is_fin)) - { - /* Enter CLOSE-WAIT and notify session. To avoid lingering - * in CLOSE-WAIT, set timer (reuse WAITCLOSE). */ - /* Account for the FIN if nothing else was received */ - if (vnet_buffer (b0)->tcp.data_len == 0) - tc0->rcv_nxt += 1; - tcp_make_ack (tc0, b0); - next0 = tcp_next_output (tc0->c_is_ip4); - tc0->state = TCP_STATE_CLOSE_WAIT; - stream_session_disconnect_notify (&tc0->connection); - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_CLOSEWAIT_TIME); - TCP_EVT_DBG (TCP_EVT_FIN_RCVD, tc0); - tcp_inc_err_counter (err_counters, TCP_ERROR_FIN_RCVD, 1); - } + /* 7: process the segment text */ + if (vnet_buffer (b0)->tcp.data_len) + error0 = tcp_segment_rcv (wrk, tc0, b0); - done: - b0->error = node->errors[error0]; - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); + /* 8: check the FIN bit */ + if (PREDICT_FALSE (is_fin)) + { + /* Enter CLOSE-WAIT and notify session. To avoid lingering + * in CLOSE-WAIT, set timer (reuse WAITCLOSE). */ + /* Account for the FIN if nothing else was received */ + if (vnet_buffer (b0)->tcp.data_len == 0) + tc0->rcv_nxt += 1; + tcp_program_ack (wrk, tc0); + tc0->state = TCP_STATE_CLOSE_WAIT; + stream_session_disconnect_notify (&tc0->connection); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_CLOSEWAIT_TIME); + TCP_EVT_DBG (TCP_EVT_FIN_RCVD, tc0); + error0 = TCP_ERROR_FIN_RCVD; } - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + done: + tcp_inc_err_counter (err_counters, error0, 1); } errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, thread_index); err_counters[TCP_ERROR_EVENT_FIFO_FULL] = errors; tcp_store_err_counters (established, err_counters); - tcp_flush_frame_to_output (vm, thread_index, is_ip4); + tcp_handle_postponed_dequeues (wrk); + vlib_buffer_free (vm, first_buffer, frame->n_vectors); return frame->n_vectors; } @@ -2121,262 +2240,247 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame, int is_ip4) { tcp_main_t *tm = vnet_get_tcp_main (); - u32 n_left_from, next_index, *from, *to_next; - u32 my_thread_index = vm->thread_index, errors = 0; + u32 n_left_from, *from, *first_buffer, errors = 0; + u32 my_thread_index = vm->thread_index; + tcp_worker_ctx_t *wrk = tcp_get_worker (my_thread_index); - from = vlib_frame_vector_args (from_frame); + from = first_buffer = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; - next_index = node->cached_next_index; - while (n_left_from > 0) { - u32 n_left_to_next; + u32 bi0, ack0, seq0, error0 = TCP_ERROR_NONE; + tcp_connection_t *tc0, *new_tc0; + tcp_header_t *tcp0 = 0; + tcp_rx_trace_t *t0; + vlib_buffer_t *b0; - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + bi0 = from[0]; + from += 1; + n_left_from -= 1; - while (n_left_from > 0 && n_left_to_next > 0) + b0 = vlib_get_buffer (vm, bi0); + tc0 = + tcp_half_open_connection_get (vnet_buffer (b0)->tcp.connection_index); + if (PREDICT_FALSE (tc0 == 0)) { - u32 bi0, ack0, seq0; - vlib_buffer_t *b0; - tcp_rx_trace_t *t0; - tcp_header_t *tcp0 = 0; - tcp_connection_t *tc0; - tcp_connection_t *new_tc0; - u32 next0 = tcp_next_drop (is_ip4), error0 = TCP_ERROR_ENQUEUED; - - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; - - b0 = vlib_get_buffer (vm, bi0); - tc0 = - tcp_half_open_connection_get (vnet_buffer (b0)-> - tcp.connection_index); - if (PREDICT_FALSE (tc0 == 0)) - { - error0 = TCP_ERROR_INVALID_CONNECTION; - goto drop; - } - - /* Half-open completed recently but the connection was't removed - * yet by the owning thread */ - if (PREDICT_FALSE (tc0->flags & TCP_CONN_HALF_OPEN_DONE)) - { - /* Make sure the connection actually exists */ - ASSERT (tcp_lookup_connection (tc0->c_fib_index, b0, - my_thread_index, is_ip4)); - goto drop; - } - - ack0 = vnet_buffer (b0)->tcp.ack_number; - seq0 = vnet_buffer (b0)->tcp.seq_number; - tcp0 = tcp_buffer_hdr (b0); - - /* Crude check to see if the connection handle does not match - * the packet. Probably connection just switched to established */ - if (PREDICT_FALSE (tcp0->dst_port != tc0->c_lcl_port - || tcp0->src_port != tc0->c_rmt_port)) - goto drop; - - if (PREDICT_FALSE - (!tcp_ack (tcp0) && !tcp_rst (tcp0) && !tcp_syn (tcp0))) - goto drop; - - /* SYNs, FINs and data consume sequence numbers */ - vnet_buffer (b0)->tcp.seq_end = seq0 + tcp_is_syn (tcp0) - + tcp_is_fin (tcp0) + vnet_buffer (b0)->tcp.data_len; - - /* - * 1. check the ACK bit - */ - - /* - * If the ACK bit is set - * If SEG.ACK =< ISS, or SEG.ACK > SND.NXT, send a reset (unless - * the RST bit is set, if so drop the segment and return) - * - * and discard the segment. Return. - * If SND.UNA =< SEG.ACK =< SND.NXT then the ACK is acceptable. - */ - if (tcp_ack (tcp0)) - { - if (seq_leq (ack0, tc0->iss) || seq_gt (ack0, tc0->snd_nxt)) - { - clib_warning ("ack not in rcv wnd"); - if (!tcp_rst (tcp0)) - tcp_send_reset_w_pkt (tc0, b0, is_ip4); - goto drop; - } - - /* Make sure ACK is valid */ - if (seq_gt (tc0->snd_una, ack0)) - { - clib_warning ("ack invalid"); - goto drop; - } - } + error0 = TCP_ERROR_INVALID_CONNECTION; + goto drop; + } - /* - * 2. check the RST bit - */ + /* Half-open completed recently but the connection was't removed + * yet by the owning thread */ + if (PREDICT_FALSE (tc0->flags & TCP_CONN_HALF_OPEN_DONE)) + { + /* Make sure the connection actually exists */ + ASSERT (tcp_lookup_connection (tc0->c_fib_index, b0, + my_thread_index, is_ip4)); + goto drop; + } - if (tcp_rst (tcp0)) - { - /* If ACK is acceptable, signal client that peer is not - * willing to accept connection and drop connection*/ - if (tcp_ack (tcp0)) - tcp_connection_reset (tc0); - goto drop; - } + ack0 = vnet_buffer (b0)->tcp.ack_number; + seq0 = vnet_buffer (b0)->tcp.seq_number; + tcp0 = tcp_buffer_hdr (b0); - /* - * 3. check the security and precedence (skipped) - */ + /* Crude check to see if the connection handle does not match + * the packet. Probably connection just switched to established */ + if (PREDICT_FALSE (tcp0->dst_port != tc0->c_lcl_port + || tcp0->src_port != tc0->c_rmt_port)) + { + error0 = TCP_ERROR_INVALID_CONNECTION; + goto drop; + } - /* - * 4. check the SYN bit - */ + if (PREDICT_FALSE (!tcp_ack (tcp0) && !tcp_rst (tcp0) + && !tcp_syn (tcp0))) + { + error0 = TCP_ERROR_SEGMENT_INVALID; + goto drop; + } - /* No SYN flag. Drop. */ - if (!tcp_syn (tcp0)) + /* SYNs, FINs and data consume sequence numbers */ + vnet_buffer (b0)->tcp.seq_end = + seq0 + tcp_is_syn (tcp0) + tcp_is_fin (tcp0) + + vnet_buffer (b0)->tcp.data_len; + + /* + * 1. check the ACK bit + */ + + /* + * If the ACK bit is set + * If SEG.ACK =< ISS, or SEG.ACK > SND.NXT, send a reset (unless + * the RST bit is set, if so drop the segment and return) + * + * and discard the segment. Return. + * If SND.UNA =< SEG.ACK =< SND.NXT then the ACK is acceptable. + */ + if (tcp_ack (tcp0)) + { + if (seq_leq (ack0, tc0->iss) || seq_gt (ack0, tc0->snd_nxt)) { - clib_warning ("not synack"); + if (!tcp_rst (tcp0)) + tcp_send_reset_w_pkt (tc0, b0, is_ip4); + error0 = TCP_ERROR_RCV_WND; goto drop; } - /* Parse options */ - if (tcp_options_parse (tcp0, &tc0->rcv_opts)) + /* Make sure ACK is valid */ + if (seq_gt (tc0->snd_una, ack0)) { - clib_warning ("options parse fail"); + error0 = TCP_ERROR_ACK_INVALID; goto drop; } + } - /* Valid SYN or SYN-ACK. Move connection from half-open pool to - * current thread pool. */ - pool_get (tm->connections[my_thread_index], new_tc0); - clib_memcpy (new_tc0, tc0, sizeof (*new_tc0)); - new_tc0->c_c_index = new_tc0 - tm->connections[my_thread_index]; - new_tc0->c_thread_index = my_thread_index; - new_tc0->rcv_nxt = vnet_buffer (b0)->tcp.seq_end; - new_tc0->irs = seq0; - new_tc0->timers[TCP_TIMER_ESTABLISH] = TCP_TIMER_HANDLE_INVALID; - new_tc0->timers[TCP_TIMER_RETRANSMIT_SYN] = - TCP_TIMER_HANDLE_INVALID; - new_tc0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - - /* If this is not the owning thread, wait for syn retransmit to - * expire and cleanup then */ - if (tcp_half_open_connection_cleanup (tc0)) - tc0->flags |= TCP_CONN_HALF_OPEN_DONE; - - if (tcp_opts_tstamp (&new_tc0->rcv_opts)) - { - new_tc0->tsval_recent = new_tc0->rcv_opts.tsval; - new_tc0->tsval_recent_age = tcp_time_now (); - } + /* + * 2. check the RST bit + */ - if (tcp_opts_wscale (&new_tc0->rcv_opts)) - new_tc0->snd_wscale = new_tc0->rcv_opts.wscale; + if (tcp_rst (tcp0)) + { + /* If ACK is acceptable, signal client that peer is not + * willing to accept connection and drop connection*/ + if (tcp_ack (tcp0)) + tcp_connection_reset (tc0); + error0 = TCP_ERROR_RST_RCVD; + goto drop; + } - /* RFC1323: SYN and SYN-ACK wnd not scaled */ - new_tc0->snd_wnd = clib_net_to_host_u16 (tcp0->window); - new_tc0->snd_wl1 = seq0; - new_tc0->snd_wl2 = ack0; + /* + * 3. check the security and precedence (skipped) + */ - tcp_connection_init_vars (new_tc0); + /* + * 4. check the SYN bit + */ - /* SYN-ACK: See if we can switch to ESTABLISHED state */ - if (PREDICT_TRUE (tcp_ack (tcp0))) - { - /* Our SYN is ACKed: we have iss < ack = snd_una */ + /* No SYN flag. Drop. */ + if (!tcp_syn (tcp0)) + { + clib_warning ("not synack"); + error0 = TCP_ERROR_SEGMENT_INVALID; + goto drop; + } - /* TODO Dequeue acknowledged segments if we support Fast Open */ - new_tc0->snd_una = ack0; - new_tc0->state = TCP_STATE_ESTABLISHED; + /* Parse options */ + if (tcp_options_parse (tcp0, &tc0->rcv_opts)) + { + clib_warning ("options parse fail"); + error0 = TCP_ERROR_OPTIONS; + goto drop; + } - /* Make sure las is initialized for the wnd computation */ - new_tc0->rcv_las = new_tc0->rcv_nxt; + /* Valid SYN or SYN-ACK. Move connection from half-open pool to + * current thread pool. */ + pool_get (tm->connections[my_thread_index], new_tc0); + clib_memcpy (new_tc0, tc0, sizeof (*new_tc0)); + new_tc0->c_c_index = new_tc0 - tm->connections[my_thread_index]; + new_tc0->c_thread_index = my_thread_index; + new_tc0->rcv_nxt = vnet_buffer (b0)->tcp.seq_end; + new_tc0->irs = seq0; + new_tc0->timers[TCP_TIMER_ESTABLISH] = TCP_TIMER_HANDLE_INVALID; + new_tc0->timers[TCP_TIMER_RETRANSMIT_SYN] = TCP_TIMER_HANDLE_INVALID; + new_tc0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + + /* If this is not the owning thread, wait for syn retransmit to + * expire and cleanup then */ + if (tcp_half_open_connection_cleanup (tc0)) + tc0->flags |= TCP_CONN_HALF_OPEN_DONE; + + if (tcp_opts_tstamp (&new_tc0->rcv_opts)) + { + new_tc0->tsval_recent = new_tc0->rcv_opts.tsval; + new_tc0->tsval_recent_age = tcp_time_now (); + } - /* Notify app that we have connection. If session layer can't - * allocate session send reset */ - if (session_stream_connect_notify (&new_tc0->connection, 0)) - { - clib_warning ("connect notify fail"); - tcp_send_reset_w_pkt (new_tc0, b0, is_ip4); - tcp_connection_cleanup (new_tc0); - goto drop; - } + if (tcp_opts_wscale (&new_tc0->rcv_opts)) + new_tc0->snd_wscale = new_tc0->rcv_opts.wscale; - /* Make sure after data segment processing ACK is sent */ - new_tc0->flags |= TCP_CONN_SNDACK; + 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; - /* Update rtt with the syn-ack sample */ - tcp_update_rtt (new_tc0, vnet_buffer (b0)->tcp.ack_number); - TCP_EVT_DBG (TCP_EVT_SYNACK_RCVD, new_tc0); - } - /* SYN: Simultaneous open. Change state to SYN-RCVD and send SYN-ACK */ - else - { - new_tc0->state = TCP_STATE_SYN_RCVD; + tcp_connection_init_vars (new_tc0); - /* Notify app that we have connection */ - if (session_stream_connect_notify (&new_tc0->connection, 0)) - { - tcp_connection_cleanup (new_tc0); - tcp_send_reset_w_pkt (tc0, b0, is_ip4); - TCP_EVT_DBG (TCP_EVT_RST_SENT, tc0); - goto drop; - } + /* SYN-ACK: See if we can switch to ESTABLISHED state */ + if (PREDICT_TRUE (tcp_ack (tcp0))) + { + /* Our SYN is ACKed: we have iss < ack = snd_una */ - tc0->rtt_ts = 0; - tcp_init_snd_vars (tc0); - tcp_make_synack (new_tc0, b0); - next0 = tcp_next_output (is_ip4); + /* TODO Dequeue acknowledged segments if we support Fast Open */ + new_tc0->snd_una = ack0; + new_tc0->state = TCP_STATE_ESTABLISHED; - goto drop; - } + /* Make sure las is initialized for the wnd computation */ + new_tc0->rcv_las = new_tc0->rcv_nxt; - /* Read data, if any */ - if (PREDICT_FALSE (vnet_buffer (b0)->tcp.data_len)) - { - clib_warning ("rcvd data in syn-sent"); - error0 = tcp_segment_rcv (new_tc0, b0, &next0); - if (error0 == TCP_ERROR_ACK_OK) - error0 = TCP_ERROR_SYN_ACKS_RCVD; - tcp_maybe_inc_counter (syn_sent, error0, 1); - } - else + /* Notify app that we have connection. If session layer can't + * allocate session send reset */ + if (session_stream_connect_notify (&new_tc0->connection, 0)) { - tcp_make_ack (new_tc0, b0); - next0 = tcp_next_output (new_tc0->c_is_ip4); + clib_warning ("connect notify fail"); + tcp_send_reset_w_pkt (new_tc0, b0, is_ip4); + tcp_connection_cleanup (new_tc0); + goto drop; } - drop: + /* Update rtt with the syn-ack sample */ + tcp_update_rtt (new_tc0, vnet_buffer (b0)->tcp.ack_number); + TCP_EVT_DBG (TCP_EVT_SYNACK_RCVD, new_tc0); + error0 = TCP_ERROR_SYN_ACKS_RCVD; + } + /* SYN: Simultaneous open. Change state to SYN-RCVD and send SYN-ACK */ + else + { + new_tc0->state = TCP_STATE_SYN_RCVD; - b0->error = error0 ? node->errors[error0] : 0; - if (PREDICT_FALSE - ((b0->flags & VLIB_BUFFER_IS_TRACED) && tcp0 != 0)) + /* Notify app that we have connection */ + if (session_stream_connect_notify (&new_tc0->connection, 0)) { - t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); - clib_memcpy (&t0->tcp_header, tcp0, sizeof (t0->tcp_header)); - clib_memcpy (&t0->tcp_connection, tc0, - sizeof (t0->tcp_connection)); + tcp_connection_cleanup (new_tc0); + tcp_send_reset_w_pkt (tc0, b0, is_ip4); + TCP_EVT_DBG (TCP_EVT_RST_SENT, tc0); + goto drop; } - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); + tc0->rtt_ts = 0; + tcp_init_snd_vars (tc0); + tcp_send_synack (new_tc0); + error0 = TCP_ERROR_SYNS_RCVD; + goto drop; } - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + /* Read data, if any */ + if (PREDICT_FALSE (vnet_buffer (b0)->tcp.data_len)) + { + clib_warning ("rcvd data in syn-sent"); + error0 = tcp_segment_rcv (wrk, new_tc0, b0); + if (error0 == TCP_ERROR_ACK_OK) + error0 = TCP_ERROR_SYN_ACKS_RCVD; + } + else + { + tcp_program_ack (wrk, new_tc0); + } + + drop: + + tcp_inc_counter (syn_sent, error0, 1); + if (PREDICT_FALSE ((b0->flags & VLIB_BUFFER_IS_TRACED) && tcp0 != 0)) + { + t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); + clib_memcpy (&t0->tcp_header, tcp0, sizeof (t0->tcp_header)); + clib_memcpy (&t0->tcp_connection, tc0, sizeof (t0->tcp_connection)); + } } errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, my_thread_index); tcp_inc_counter (syn_sent, TCP_ERROR_EVENT_FIFO_FULL, errors); + vlib_buffer_free (vm, first_buffer, from_frame->n_vectors); + return from_frame->n_vectors; } @@ -2449,354 +2553,310 @@ always_inline uword tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame, int is_ip4) { - u32 n_left_from, next_index, *from, *to_next, n_fins = 0; - u32 my_thread_index = vm->thread_index, errors = 0; + u32 thread_index = vm->thread_index, errors = 0, *first_buffer; + tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + u32 n_left_from, *from; - from = vlib_frame_vector_args (from_frame); + from = first_buffer = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; - next_index = node->cached_next_index; while (n_left_from > 0) { - u32 n_left_to_next; + u32 bi0, error0 = TCP_ERROR_NONE; + tcp_header_t *tcp0 = 0; + tcp_connection_t *tc0; + vlib_buffer_t *b0; + u8 is_fin0; - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + bi0 = from[0]; + from += 1; + n_left_from -= 1; - while (n_left_from > 0 && n_left_to_next > 0) + b0 = vlib_get_buffer (vm, bi0); + tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, + thread_index); + if (PREDICT_FALSE (tc0 == 0)) { - u32 bi0; - vlib_buffer_t *b0; - tcp_header_t *tcp0 = 0; - tcp_connection_t *tc0; - u32 next0 = tcp_next_drop (is_ip4), error0 = TCP_ERROR_NONE; - u8 is_fin0; + error0 = TCP_ERROR_INVALID_CONNECTION; + goto drop; + } - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; + tcp0 = tcp_buffer_hdr (b0); + is_fin0 = tcp_is_fin (tcp0); - b0 = vlib_get_buffer (vm, bi0); - tc0 = tcp_connection_get (vnet_buffer (b0)->tcp.connection_index, - my_thread_index); - if (PREDICT_FALSE (tc0 == 0)) + /* SYNs, FINs and data consume sequence numbers */ + vnet_buffer (b0)->tcp.seq_end = vnet_buffer (b0)->tcp.seq_number + + tcp_is_syn (tcp0) + is_fin0 + vnet_buffer (b0)->tcp.data_len; + + if (CLIB_DEBUG) + { + tcp_connection_t *tmp; + tmp = tcp_lookup_connection (tc0->c_fib_index, b0, thread_index, + is_ip4); + if (tmp->state != tc0->state) { - error0 = TCP_ERROR_INVALID_CONNECTION; + clib_warning ("state changed"); goto drop; } + } - tcp0 = tcp_buffer_hdr (b0); - is_fin0 = tcp_is_fin (tcp0); + /* + * Special treatment for CLOSED + */ + if (PREDICT_FALSE (tc0->state == TCP_STATE_CLOSED)) + { + error0 = TCP_ERROR_CONNECTION_CLOSED; + goto drop; + } - /* SYNs, FINs and data consume sequence numbers */ - vnet_buffer (b0)->tcp.seq_end = vnet_buffer (b0)->tcp.seq_number - + tcp_is_syn (tcp0) + is_fin0 + vnet_buffer (b0)->tcp.data_len; + /* + * For all other states (except LISTEN) + */ - if (CLIB_DEBUG) - { - tcp_connection_t *tmp; - tmp = tcp_lookup_connection (tc0->c_fib_index, b0, - my_thread_index, is_ip4); - if (tmp->state != tc0->state) - { - clib_warning ("state changed"); - goto drop; - } - } + /* 1-4: check SEQ, RST, SYN */ + if (PREDICT_FALSE (tcp_segment_validate (wrk, tc0, b0, tcp0, &error0))) + goto drop; + /* 5: check the ACK field */ + switch (tc0->state) + { + case TCP_STATE_SYN_RCVD: /* - * Special treatment for CLOSED + * If the segment acknowledgment is not acceptable, form a + * reset segment, + * + * and send it. */ - if (PREDICT_FALSE (tc0->state == TCP_STATE_CLOSED)) + if (!tcp_rcv_ack_is_acceptable (tc0, b0)) { - error0 = TCP_ERROR_CONNECTION_CLOSED; + TCP_DBG ("connection not accepted"); + tcp_send_reset_w_pkt (tc0, b0, is_ip4); + error0 = TCP_ERROR_ACK_INVALID; goto drop; } - /* - * For all other states (except LISTEN) - */ + /* Update rtt and rto */ + tcp_update_rtt (tc0, vnet_buffer (b0)->tcp.ack_number); + + /* Switch state to ESTABLISHED */ + tc0->state = TCP_STATE_ESTABLISHED; + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + + /* Initialize session variables */ + tc0->snd_una = vnet_buffer (b0)->tcp.ack_number; + tc0->snd_wnd = clib_net_to_host_u16 (tcp0->window) + << tc0->rcv_opts.wscale; + tc0->snd_wl1 = vnet_buffer (b0)->tcp.seq_number; + tc0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; + + /* Reset SYN-ACK retransmit and SYN_RCV establish timers */ + tcp_retransmit_timer_reset (tc0); + tcp_timer_reset (tc0, TCP_TIMER_ESTABLISH); + stream_session_accept_notify (&tc0->connection); + error0 = TCP_ERROR_ACK_OK; + break; + case TCP_STATE_ESTABLISHED: + /* We can get packets in established state here because they + * were enqueued before state change */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; + + break; + case TCP_STATE_FIN_WAIT_1: + /* In addition to the processing for the ESTABLISHED state, if + * our FIN is now acknowledged then enter FIN-WAIT-2 and + * continue processing in that state. */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; - /* 1-4: check SEQ, RST, SYN */ - if (PREDICT_FALSE (tcp_segment_validate (vm, tc0, b0, tcp0, - &next0, &error0))) + /* Still have to send the FIN */ + if (tc0->flags & TCP_CONN_FINPNDG) { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; + /* TX fifo finally drained */ + if (!session_tx_fifo_max_dequeue (&tc0->connection)) + tcp_send_fin (tc0); } - - /* 5: check the ACK field */ - switch (tc0->state) + /* If FIN is ACKed */ + else if (tc0->snd_una == tc0->snd_una_max) { - case TCP_STATE_SYN_RCVD: - /* - * If the segment acknowledgment is not acceptable, form a - * reset segment, - * - * and send it. - */ - if (!tcp_rcv_ack_is_acceptable (tc0, b0)) - { - TCP_DBG ("connection not accepted"); - tcp_send_reset_w_pkt (tc0, b0, is_ip4); - error0 = TCP_ERROR_ACK_INVALID; - goto drop; - } - - /* Update rtt and rto */ - tcp_update_rtt (tc0, vnet_buffer (b0)->tcp.ack_number); - - /* Switch state to ESTABLISHED */ - tc0->state = TCP_STATE_ESTABLISHED; + tc0->state = TCP_STATE_FIN_WAIT_2; TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - /* Initialize session variables */ - tc0->snd_una = vnet_buffer (b0)->tcp.ack_number; - tc0->snd_wnd = clib_net_to_host_u16 (tcp0->window) - << tc0->rcv_opts.wscale; - tc0->snd_wl1 = vnet_buffer (b0)->tcp.seq_number; - tc0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; - - /* Reset SYN-ACK retransmit and SYN_RCV establish timers */ - tcp_retransmit_timer_reset (tc0); - tcp_timer_reset (tc0, TCP_TIMER_ESTABLISH); - stream_session_accept_notify (&tc0->connection); - error0 = TCP_ERROR_ACK_OK; - break; - case TCP_STATE_ESTABLISHED: - /* We can get packets in established state here because they - * were enqueued before state change */ - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; - } - - break; - case TCP_STATE_FIN_WAIT_1: - /* In addition to the processing for the ESTABLISHED state, if - * our FIN is now acknowledged then enter FIN-WAIT-2 and - * continue processing in that state. */ - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; - } + /* Stop all retransmit timers because we have nothing more + * to send. Enable waitclose though because we're willing to + * wait for peer's FIN but not indefinitely. */ + tcp_connection_timers_reset (tc0); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_2MSL_TIME); + } + break; + case TCP_STATE_FIN_WAIT_2: + /* In addition to the processing for the ESTABLISHED state, if + * the retransmission queue is empty, the user's CLOSE can be + * acknowledged ("ok") but do not delete the TCB. */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; + break; + case TCP_STATE_CLOSE_WAIT: + /* Do the same processing as for the ESTABLISHED state. */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; - /* Still have to send the FIN */ - if (tc0->flags & TCP_CONN_FINPNDG) - { - /* TX fifo finally drained */ - if (!session_tx_fifo_max_dequeue (&tc0->connection)) - tcp_send_fin (tc0); - } - /* If FIN is ACKed */ - else if (tc0->snd_una == tc0->snd_una_max) + if (tc0->flags & TCP_CONN_FINPNDG) + { + /* TX fifo finally drained */ + if (!session_tx_fifo_max_dequeue (&tc0->connection)) { - tc0->state = TCP_STATE_FIN_WAIT_2; - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - - /* Stop all retransmit timers because we have nothing more - * to send. Enable waitclose though because we're willing to - * wait for peer's FIN but not indefinitely. */ + 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_FIN_WAIT_2: - /* In addition to the processing for the ESTABLISHED state, if - * the retransmission queue is empty, the user's CLOSE can be - * acknowledged ("ok") but do not delete the TCB. */ - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; - } - break; - case TCP_STATE_CLOSE_WAIT: - /* Do the same processing as for the ESTABLISHED state. */ - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - 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 - * the ACK acknowledges our FIN then enter the TIME-WAIT state, - * otherwise ignore the segment. */ - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; - } - - tc0->state = TCP_STATE_TIME_WAIT; - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); - goto drop; - - break; - case TCP_STATE_LAST_ACK: - /* The only thing that [should] arrive in this state is an - * acknowledgment of our FIN. If our FIN is now acknowledged, - * delete the TCB, enter the CLOSED state, and return. */ + } + break; + case TCP_STATE_CLOSING: + /* In addition to the processing for the ESTABLISHED state, if + * the ACK acknowledges our FIN then enter the TIME-WAIT state, + * otherwise ignore the segment. */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; - if (!tcp_rcv_ack_is_acceptable (tc0, b0)) - { - error0 = TCP_ERROR_ACK_INVALID; - goto drop; - } - error0 = TCP_ERROR_ACK_OK; - tc0->snd_una = vnet_buffer (b0)->tcp.ack_number; - /* Apparently our ACK for the peer's FIN was lost */ - if (is_fin0 && tc0->snd_una != tc0->snd_una_max) - { - tcp_send_fin (tc0); - goto drop; - } + tc0->state = TCP_STATE_TIME_WAIT; + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); + goto drop; - tc0->state = TCP_STATE_CLOSED; - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - /* Delete the connection/session since the pipes should be - * clear by now */ - tcp_connection_del (tc0); + break; + case TCP_STATE_LAST_ACK: + /* The only thing that [should] arrive in this state is an + * acknowledgment of our FIN. If our FIN is now acknowledged, + * delete the TCB, enter the CLOSED state, and return. */ + if (!tcp_rcv_ack_is_acceptable (tc0, b0)) + { + error0 = TCP_ERROR_ACK_INVALID; + goto drop; + } + error0 = TCP_ERROR_ACK_OK; + tc0->snd_una = vnet_buffer (b0)->tcp.ack_number; + /* Apparently our ACK for the peer's FIN was lost */ + if (is_fin0 && tc0->snd_una != tc0->snd_una_max) + { + tcp_send_fin (tc0); goto drop; + } - break; - case TCP_STATE_TIME_WAIT: - /* The only thing that can arrive in this state is a - * retransmission of the remote FIN. Acknowledge it, and restart - * the 2 MSL timeout. */ + tc0->state = TCP_STATE_CLOSED; + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - { - tcp_maybe_inc_counter (rcv_process, error0, 1); - goto drop; - } + /* 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); - tcp_make_ack (tc0, b0); - next0 = tcp_next_output (is_ip4); - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); - goto drop; + goto drop; - break; - default: - ASSERT (0); - } + break; + case TCP_STATE_TIME_WAIT: + /* The only thing that can arrive in this state is a + * retransmission of the remote FIN. Acknowledge it, and restart + * the 2 MSL timeout. */ - /* 6: check the URG bit TODO */ + if (tcp_rcv_ack (wrk, tc0, b0, tcp0, &error0)) + goto drop; - /* 7: process the segment text */ - switch (tc0->state) - { - case TCP_STATE_ESTABLISHED: - case TCP_STATE_FIN_WAIT_1: - case TCP_STATE_FIN_WAIT_2: - if (vnet_buffer (b0)->tcp.data_len) - { - error0 = tcp_segment_rcv (tc0, b0, &next0); - tcp_maybe_inc_counter (rcv_process, error0, 1); - } - else if (is_fin0) - tc0->rcv_nxt += 1; - break; - case TCP_STATE_CLOSE_WAIT: - case TCP_STATE_CLOSING: - case TCP_STATE_LAST_ACK: - case TCP_STATE_TIME_WAIT: - /* This should not occur, since a FIN has been received from the - * remote side. Ignore the segment text. */ - break; - } + tcp_program_ack (wrk, tc0); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); + goto drop; - /* 8: check the FIN bit */ - if (!is_fin0) - goto drop; + break; + default: + ASSERT (0); + } - switch (tc0->state) - { - case TCP_STATE_ESTABLISHED: - case TCP_STATE_SYN_RCVD: - /* Send FIN-ACK notify app and enter CLOSE-WAIT */ - 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; - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - break; - case TCP_STATE_CLOSE_WAIT: - case TCP_STATE_CLOSING: - case TCP_STATE_LAST_ACK: - /* move along .. */ - break; - case TCP_STATE_FIN_WAIT_1: - tc0->state = TCP_STATE_CLOSING; - tcp_make_ack (tc0, b0); - next0 = tcp_next_output (is_ip4); - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - /* Wait for ACK but not forever */ - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_2MSL_TIME); - break; - case TCP_STATE_FIN_WAIT_2: - /* Got FIN, send ACK! Be more aggressive with resource cleanup */ - tc0->state = TCP_STATE_TIME_WAIT; - tcp_connection_timers_reset (tc0); - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); - tcp_make_ack (tc0, b0); - next0 = tcp_next_output (is_ip4); - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); - break; - case TCP_STATE_TIME_WAIT: - /* Remain in the TIME-WAIT state. Restart the time-wait - * timeout. - */ - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); - break; - } - TCP_EVT_DBG (TCP_EVT_FIN_RCVD, tc0); - n_fins += 1; + /* 6: check the URG bit TODO */ - drop: - b0->error = error0 ? node->errors[error0] : 0; + /* 7: process the segment text */ + switch (tc0->state) + { + case TCP_STATE_ESTABLISHED: + case TCP_STATE_FIN_WAIT_1: + case TCP_STATE_FIN_WAIT_2: + if (vnet_buffer (b0)->tcp.data_len) + error0 = tcp_segment_rcv (wrk, tc0, b0); + else if (is_fin0) + tc0->rcv_nxt += 1; + break; + case TCP_STATE_CLOSE_WAIT: + case TCP_STATE_CLOSING: + case TCP_STATE_LAST_ACK: + case TCP_STATE_TIME_WAIT: + /* This should not occur, since a FIN has been received from the + * remote side. Ignore the segment text. */ + break; + } - 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, tcp0, b0, is_ip4); - } + /* 8: check the FIN bit */ + if (!is_fin0) + goto drop; - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); + switch (tc0->state) + { + case TCP_STATE_ESTABLISHED: + case TCP_STATE_SYN_RCVD: + /* Send FIN-ACK notify app and enter CLOSE-WAIT */ + tcp_connection_timers_reset (tc0); + tcp_send_fin (tc0); + stream_session_disconnect_notify (&tc0->connection); + tc0->state = TCP_STATE_CLOSE_WAIT; + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + break; + case TCP_STATE_CLOSE_WAIT: + case TCP_STATE_CLOSING: + case TCP_STATE_LAST_ACK: + /* move along .. */ + break; + case TCP_STATE_FIN_WAIT_1: + tc0->state = TCP_STATE_CLOSING; + tcp_program_ack (wrk, tc0); + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + /* Wait for ACK but not forever */ + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_2MSL_TIME); + break; + case TCP_STATE_FIN_WAIT_2: + /* Got FIN, send ACK! Be more aggressive with resource cleanup */ + tc0->state = TCP_STATE_TIME_WAIT; + tcp_connection_timers_reset (tc0); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); + tcp_program_ack (wrk, tc0); + TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + break; + case TCP_STATE_TIME_WAIT: + /* Remain in the TIME-WAIT state. Restart the time-wait + * timeout. + */ + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); + break; } + error0 = TCP_ERROR_FIN_RCVD; + TCP_EVT_DBG (TCP_EVT_FIN_RCVD, tc0); + + drop: - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + tcp_inc_counter (rcv_process, error0, 1); + 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, tcp0, b0, is_ip4); + } } errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, - my_thread_index); + thread_index); tcp_inc_counter (rcv_process, TCP_ERROR_EVENT_FIFO_FULL, errors); - tcp_inc_counter (rcv_process, TCP_ERROR_FIN_RCVD, n_fins); + tcp_handle_postponed_dequeues (wrk); + vlib_buffer_free (vm, first_buffer, from_frame->n_vectors); + return from_frame->n_vectors; } @@ -2868,162 +2928,146 @@ always_inline uword tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame, int is_ip4) { - u32 n_left_from, next_index, *from, *to_next, n_syns = 0; + u32 n_left_from, *from, n_syns = 0, *first_buffer; u32 my_thread_index = vm->thread_index; - from = vlib_frame_vector_args (from_frame); + from = first_buffer = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; - next_index = node->cached_next_index; - while (n_left_from > 0) { - u32 n_left_to_next; - - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); - - while (n_left_from > 0 && n_left_to_next > 0) - { - u32 bi0; - vlib_buffer_t *b0; - tcp_rx_trace_t *t0; - tcp_header_t *th0 = 0; - tcp_connection_t *lc0; - ip4_header_t *ip40; - ip6_header_t *ip60; - tcp_connection_t *child0; - u32 error0 = TCP_ERROR_NONE, next0 = tcp_next_drop (is_ip4); - - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; + u32 bi0; + vlib_buffer_t *b0; + tcp_rx_trace_t *t0; + tcp_header_t *th0 = 0; + tcp_connection_t *lc0; + ip4_header_t *ip40; + ip6_header_t *ip60; + tcp_connection_t *child0; + u32 error0 = TCP_ERROR_NONE; - b0 = vlib_get_buffer (vm, bi0); - lc0 = tcp_listener_get (vnet_buffer (b0)->tcp.connection_index); + bi0 = from[0]; + from += 1; + n_left_from -= 1; - if (is_ip4) - { - ip40 = vlib_buffer_get_current (b0); - th0 = ip4_next_header (ip40); - } - else - { - ip60 = vlib_buffer_get_current (b0); - th0 = ip6_next_header (ip60); - } + b0 = vlib_get_buffer (vm, bi0); + lc0 = tcp_listener_get (vnet_buffer (b0)->tcp.connection_index); - /* Create child session. For syn-flood protection use filter */ + if (is_ip4) + { + ip40 = vlib_buffer_get_current (b0); + th0 = ip4_next_header (ip40); + } + else + { + ip60 = vlib_buffer_get_current (b0); + th0 = ip6_next_header (ip60); + } - /* 1. first check for an RST: handled in dispatch */ - /* if (tcp_rst (th0)) - goto drop; */ + /* Create child session. For syn-flood protection use filter */ - /* 2. second check for an ACK: handled in dispatch */ - /* if (tcp_ack (th0)) - { - tcp_send_reset (b0, is_ip4); - goto drop; - } */ + /* 1. first check for an RST: handled in dispatch */ + /* if (tcp_rst (th0)) + goto drop; + */ - /* 3. check for a SYN (did that already) */ + /* 2. second check for an ACK: handled in dispatch */ + /* if (tcp_ack (th0)) + { + tcp_send_reset (b0, is_ip4); + goto drop; + } + */ - /* Make sure connection wasn't just created */ - child0 = tcp_lookup_connection (lc0->c_fib_index, b0, - my_thread_index, is_ip4); - if (PREDICT_FALSE (child0->state != TCP_STATE_LISTEN)) - { - error0 = TCP_ERROR_CREATE_EXISTS; - goto drop; - } + /* 3. check for a SYN (did that already) */ - /* Create child session and send SYN-ACK */ - child0 = tcp_connection_new (my_thread_index); - child0->c_lcl_port = th0->dst_port; - child0->c_rmt_port = th0->src_port; - child0->c_is_ip4 = is_ip4; - child0->state = TCP_STATE_SYN_RCVD; - child0->c_fib_index = lc0->c_fib_index; + /* Make sure connection wasn't just created */ + child0 = tcp_lookup_connection (lc0->c_fib_index, b0, my_thread_index, + is_ip4); + if (PREDICT_FALSE (child0->state != TCP_STATE_LISTEN)) + { + error0 = TCP_ERROR_CREATE_EXISTS; + goto drop; + } - if (is_ip4) - { - child0->c_lcl_ip4.as_u32 = ip40->dst_address.as_u32; - child0->c_rmt_ip4.as_u32 = ip40->src_address.as_u32; - } - else - { - clib_memcpy (&child0->c_lcl_ip6, &ip60->dst_address, - sizeof (ip6_address_t)); - clib_memcpy (&child0->c_rmt_ip6, &ip60->src_address, - sizeof (ip6_address_t)); - } + /* Create child session and send SYN-ACK */ + child0 = tcp_connection_new (my_thread_index); + child0->c_lcl_port = th0->dst_port; + child0->c_rmt_port = th0->src_port; + child0->c_is_ip4 = is_ip4; + child0->state = TCP_STATE_SYN_RCVD; + child0->c_fib_index = lc0->c_fib_index; - if (tcp_options_parse (th0, &child0->rcv_opts)) - { - clib_warning ("options parse fail"); - goto drop; - } + if (is_ip4) + { + child0->c_lcl_ip4.as_u32 = ip40->dst_address.as_u32; + child0->c_rmt_ip4.as_u32 = ip40->src_address.as_u32; + } + else + { + clib_memcpy (&child0->c_lcl_ip6, &ip60->dst_address, + sizeof (ip6_address_t)); + clib_memcpy (&child0->c_rmt_ip6, &ip60->src_address, + sizeof (ip6_address_t)); + } - child0->irs = vnet_buffer (b0)->tcp.seq_number; - child0->rcv_nxt = vnet_buffer (b0)->tcp.seq_number + 1; - child0->rcv_las = child0->rcv_nxt; - child0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + if (tcp_options_parse (th0, &child0->rcv_opts)) + { + clib_warning ("options parse fail"); + goto drop; + } - /* RFC1323: TSval timestamps sent on {SYN} and {SYN,ACK} - * segments are used to initialize PAWS. */ - if (tcp_opts_tstamp (&child0->rcv_opts)) - { - child0->tsval_recent = child0->rcv_opts.tsval; - child0->tsval_recent_age = tcp_time_now (); - } + child0->irs = vnet_buffer (b0)->tcp.seq_number; + child0->rcv_nxt = vnet_buffer (b0)->tcp.seq_number + 1; + child0->rcv_las = child0->rcv_nxt; + child0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - if (tcp_opts_wscale (&child0->rcv_opts)) - child0->snd_wscale = child0->rcv_opts.wscale; + /* RFC1323: TSval timestamps sent on {SYN} and {SYN,ACK} + * segments are used to initialize PAWS. */ + if (tcp_opts_tstamp (&child0->rcv_opts)) + { + child0->tsval_recent = child0->rcv_opts.tsval; + child0->tsval_recent_age = tcp_time_now (); + } - child0->snd_wnd = clib_net_to_host_u16 (th0->window) - << child0->snd_wscale; - child0->snd_wl1 = vnet_buffer (b0)->tcp.seq_number; - child0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; + if (tcp_opts_wscale (&child0->rcv_opts)) + child0->snd_wscale = child0->rcv_opts.wscale; - tcp_connection_init_vars (child0); - TCP_EVT_DBG (TCP_EVT_SYN_RCVD, child0, 1); + child0->snd_wnd = clib_net_to_host_u16 (th0->window) + << child0->snd_wscale; + child0->snd_wl1 = vnet_buffer (b0)->tcp.seq_number; + child0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; - if (stream_session_accept (&child0->connection, lc0->c_s_index, - 0 /* notify */ )) - { - clib_warning ("session accept fail"); - tcp_connection_cleanup (child0); - error0 = TCP_ERROR_CREATE_SESSION_FAIL; - goto drop; - } + tcp_connection_init_vars (child0); + TCP_EVT_DBG (TCP_EVT_SYN_RCVD, child0, 1); - /* Reuse buffer to make syn-ack and send */ - tcp_make_synack (child0, b0); - next0 = tcp_next_output (is_ip4); - tcp_timer_set (child0, TCP_TIMER_ESTABLISH, TCP_SYN_RCVD_TIME); + if (stream_session_accept (&child0->connection, lc0->c_s_index, + 0 /* notify */ )) + { + clib_warning ("session accept fail"); + tcp_connection_cleanup (child0); + error0 = TCP_ERROR_CREATE_SESSION_FAIL; + goto drop; + } - drop: - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); - clib_memcpy (&t0->tcp_header, th0, sizeof (t0->tcp_header)); - clib_memcpy (&t0->tcp_connection, lc0, - sizeof (t0->tcp_connection)); - } + tcp_send_synack (child0); + tcp_timer_set (child0, TCP_TIMER_ESTABLISH, TCP_SYN_RCVD_TIME); - n_syns += (error0 == TCP_ERROR_NONE); - b0->error = node->errors[error0]; + drop: - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); + if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) + { + t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); + clib_memcpy (&t0->tcp_header, th0, sizeof (t0->tcp_header)); + clib_memcpy (&t0->tcp_connection, lc0, sizeof (t0->tcp_connection)); } - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + n_syns += (error0 == TCP_ERROR_NONE); } tcp_inc_counter (listen, TCP_ERROR_SYNS_RCVD, n_syns); + vlib_buffer_free (vm, first_buffer, from_frame->n_vectors); + return from_frame->n_vectors; } @@ -3258,7 +3302,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; u16 nexts[VLIB_FRAME_SIZE], *next; - tcp_set_time_now (thread_index); + tcp_set_time_now (tcp_get_worker (thread_index)); from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; @@ -3441,6 +3485,8 @@ 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); @@ -3484,6 +3530,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);