X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_input.c;h=f77d4845da2aaf84c46716625e4f40603e399a6c;hb=25579b4acd449e1bae30d2a20a44b77741c8e1fd;hp=63d6fd8785bdaa26cad244fc3258a8770d4f9f22;hpb=879ace3d3b238ec8db80f52ebfd556aa6f12b4c7;p=vpp.git diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 63d6fd8785b..f77d4845da2 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -27,7 +27,8 @@ static char *tcp_error_strings[] = { /* All TCP nodes have the same outgoing arcs */ #define foreach_tcp_state_next \ - _ (DROP, "error-drop") \ + _ (DROP4, "ip4-drop") \ + _ (DROP6, "ip6-drop") \ _ (TCP4_OUTPUT, "tcp4-output") \ _ (TCP6_OUTPUT, "tcp6-output") @@ -75,6 +76,9 @@ typedef enum _tcp_state_next #define tcp_next_output(is_ip4) (is_ip4 ? TCP_NEXT_TCP4_OUTPUT \ : TCP_NEXT_TCP6_OUTPUT) +#define tcp_next_drop(is_ip4) (is_ip4 ? TCP_NEXT_DROP4 \ + : TCP_NEXT_DROP6) + vlib_node_registration_t tcp4_established_node; vlib_node_registration_t tcp6_established_node; @@ -268,27 +272,35 @@ tcp_update_timestamp (tcp_connection_t * tc, u32 seq, u32 seq_end) */ static int tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, - vlib_buffer_t * b0, tcp_header_t * th0, u32 * next0) + 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))) - return -1; + { + *error0 = TCP_ERROR_SEGMENT_INVALID; + goto drop; + } if (PREDICT_FALSE (tcp_options_parse (th0, &tc0->rcv_opts))) { clib_warning ("options parse error"); - return -1; + *error0 = TCP_ERROR_OPTIONS; + goto drop; } - if (tcp_segment_check_paws (tc0)) + if (PREDICT_FALSE (tcp_segment_check_paws (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); @@ -307,48 +319,46 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, if (!tcp_rst (th0)) { tcp_make_ack (tc0, b0); - *next0 = tcp_next_output (tc0->c_is_ip4); - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0); - return -1; + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); + goto error; } } + goto drop; } /* 1st: check sequence number */ if (!tcp_segment_in_rcv_wnd (tc0, vnet_buffer (b0)->tcp.seq_number, 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 - && tc0->rcv_nxt == vnet_buffer (b0)->tcp.seq_number) - { - /* TODO Should segment be tagged? */ - } - else + * through for ack processing. It should be dropped later. */ + if (!(tc0->rcv_wnd == 0 + && tc0->rcv_nxt == vnet_buffer (b0)->tcp.seq_number)) { /* If not RST, send dup ack */ if (!tcp_rst (th0)) { tcp_make_ack (tc0, b0); - *next0 = tcp_next_output (tc0->c_is_ip4); - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0); + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc0, vnet_buffer (b0)->tcp); + goto error; } - return -1; + goto drop; } } /* 2nd: check the RST bit */ - if (tcp_rst (th0)) + if (PREDICT_FALSE (tcp_rst (th0))) { tcp_connection_reset (tc0); - return -1; + *error0 = TCP_ERROR_RST_RCVD; + goto drop; } /* 3rd: check security and precedence (skip) */ /* 4th: check the SYN bit */ - if (tcp_syn (th0)) + if (PREDICT_FALSE (tcp_syn (th0))) { /* TODO implement RFC 5961 */ if (tc0->state == TCP_STATE_SYN_RCVD) @@ -361,14 +371,20 @@ tcp_segment_validate (vlib_main_t * vm, tcp_connection_t * tc0, tcp_make_ack (tc0, b0); TCP_EVT_DBG (TCP_EVT_SYNACK_RCVD, tc0); } - *next0 = tcp_next_output (tc0->c_is_ip4); - return -1; + goto error; } /* If segment in window, save timestamp */ tcp_update_timestamp (tc0, vnet_buffer (b0)->tcp.seq_number, 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; } always_inline int @@ -874,13 +890,14 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) 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); } /** @@ -921,11 +938,18 @@ tcp_update_snd_wnd (tcp_connection_t * tc, u32 seq, u32 ack, u32 snd_wnd) } } +/** + * Init loss recovery/fast recovery. + * + * Triggered by dup acks as opposed to timer timeout. Note that cwnd is + * updated in @ref tcp_cc_handle_event after fast retransmit + */ void 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->cc_algo->congestion (tc); TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 4); } @@ -933,7 +957,6 @@ tcp_cc_init_congestion (tcp_connection_t * tc) static void tcp_cc_recovery_exit (tcp_connection_t * tc) { - /* Deflate rto */ tc->rto_boff = 0; tcp_update_rto (tc); tc->snd_rxt_ts = 0; @@ -1041,32 +1064,35 @@ 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) + 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 || tc->sack_sb.last_sacked_bytes); tc->rcv_dupacks++; + /* Pure duplicate ack. If some data got acked, it's handled lower */ if (tc->rcv_dupacks > TCP_DUPACK_THRESHOLD && !tc->bytes_acked) { ASSERT (tcp_in_fastrecovery (tc)); - /* Pure duplicate ack. If some data got acked, it's handled lower */ tc->cc_algo->rcv_cong_ack (tc, TCP_CC_DUPACK); return; } else if (tcp_should_fastrecover (tc)) { - /* Things are already bad */ - if (tcp_in_cong_recovery (tc)) - { - tc->rcv_dupacks = 0; - goto partial_ack_test; - } + ASSERT (!tcp_in_fastrecovery (tc)); /* If of of the two conditions lower hold, reset dupacks because * we're probably after timeout (RFC6582 heuristics). @@ -1110,7 +1136,6 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) { tcp_fast_retransmit_no_sack (tc); } - return; } else if (!tc->bytes_acked @@ -1123,12 +1148,12 @@ tcp_cc_handle_event (tcp_connection_t * tc, u32 is_dack) goto partial_ack; } -partial_ack_test: - if (!tc->bytes_acked) return; partial_ack: + TCP_EVT_DBG (TCP_EVT_CC_PACK, tc); + /* * Legitimate ACK. 1) See if we can exit recovery */ @@ -1155,17 +1180,18 @@ partial_ack: /* * Legitimate ACK. 2) If PARTIAL ACK try to retransmit */ - TCP_EVT_DBG (TCP_EVT_CC_PACK, tc); /* RFC6675: If the incoming ACK is a cumulative acknowledgment, - * reset dupacks to 0 */ + * reset dupacks to 0. Also needed if in congestion recovery */ tc->rcv_dupacks = 0; - tcp_retransmit_first_unacked (tc); - /* Post RTO timeout don't try anything fancy */ if (tcp_in_recovery (tc)) - return; + { + tc->cc_algo->rcv_ack (tc); + tc->tsecr_last_ack = tc->rcv_opts.tsecr; + return; + } /* Remove retransmitted bytes that have been delivered */ ASSERT (tc->bytes_acked + tc->sack_sb.snd_una_adv @@ -1218,6 +1244,16 @@ 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) + && seq_geq (vnet_buffer (b)->tcp.ack_number, tc->snd_una)) + { + tc->snd_una_max = tc->snd_nxt = vnet_buffer (b)->tcp.ack_number; + 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 */ @@ -1245,10 +1281,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_EVT_DBG (TCP_EVT_DUPACK_RCVD, tc); - tcp_cc_handle_event (tc, 1); - } + tcp_cc_handle_event (tc, 1); /* Don't drop yet */ return 0; } @@ -1256,7 +1289,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); @@ -1284,7 +1317,6 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, if (!tcp_in_cong_recovery (tc)) return 0; *error = TCP_ERROR_ACK_DUP; - TCP_EVT_DBG (TCP_EVT_DUPACK_RCVD, tc, 1); return vnet_buffer (b)->tcp.data_len ? 0 : -1; } @@ -1292,7 +1324,7 @@ tcp_rcv_ack (tcp_connection_t * tc, vlib_buffer_t * b, * Update congestion control (slow start/congestion avoidance) */ tcp_cc_update (tc, b); - + *error = TCP_ERROR_ACK_OK; return 0; } @@ -1373,6 +1405,15 @@ 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 tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, @@ -1381,15 +1422,9 @@ tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b, int written, error = TCP_ERROR_ENQUEUED; ASSERT (seq_geq (vnet_buffer (b)->tcp.seq_number, tc->rcv_nxt)); - - /* Pure ACK. Update rcv_nxt and be done. */ - if (PREDICT_FALSE (data_len == 0)) - { - return TCP_ERROR_PURE_ACK; - } - - written = stream_session_enqueue_data (&tc->connection, b, 0, - 1 /* queue event */ , 1); + ASSERT (data_len); + written = session_enqueue_stream_connection (&tc->connection, b, 0, + 1 /* queue event */ , 1); TCP_EVT_DBG (TCP_EVT_INPUT, tc, 0, data_len, written); @@ -1405,6 +1440,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) { @@ -1442,17 +1478,13 @@ tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b, int rv, offset; ASSERT (seq_gt (vnet_buffer (b)->tcp.seq_number, tc->rcv_nxt)); - - /* Pure ACK. Do nothing */ - if (PREDICT_FALSE (data_len == 0)) - { - return TCP_ERROR_PURE_ACK; - } + ASSERT (data_len); /* Enqueue out-of-order data with relative offset */ - rv = stream_session_enqueue_data (&tc->connection, b, - vnet_buffer (b)->tcp.seq_number - - tc->rcv_nxt, 0 /* queue event */ , 0); + rv = session_enqueue_stream_connection (&tc->connection, b, + vnet_buffer (b)->tcp.seq_number - + tc->rcv_nxt, 0 /* queue event */ , + 0); /* Nothing written */ if (rv) @@ -1469,7 +1501,7 @@ tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b, ooo_segment_t *newest; u32 start, end; - s0 = stream_session_get (tc->c_s_index, tc->c_thread_index); + s0 = session_get (tc->c_s_index, tc->c_thread_index); /* Get the newest segment from the fifo */ newest = svm_fifo_newest_ooo_segment (s0->server_rx_fifo); @@ -1481,10 +1513,11 @@ 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); } } - return TCP_ERROR_ENQUEUED; + return TCP_ERROR_ENQUEUED_OOO; } /** @@ -1501,7 +1534,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; @@ -1535,11 +1568,15 @@ tcp_buffer_discard_bytes (vlib_buffer_t * b, u32 n_bytes_to_drop) return 0; } +/** + * Receive buffer for connection and handle acks + * + * It handles both in order or out-of-order data. + */ static int -tcp_segment_rcv (tcp_main_t * tm, tcp_connection_t * tc, vlib_buffer_t * b, - u32 * next0) +tcp_segment_rcv (tcp_connection_t * tc, vlib_buffer_t * b, u32 * next0) { - u32 error = 0, n_bytes_to_drop, n_data_bytes; + u32 error, n_bytes_to_drop, n_data_bytes; vlib_buffer_advance (b, vnet_buffer (b)->tcp.data_offset); n_data_bytes = vnet_buffer (b)->tcp.data_len; @@ -1552,46 +1589,36 @@ tcp_segment_rcv (tcp_main_t * tm, tcp_connection_t * tc, vlib_buffer_t * b, * the rx window */ if (seq_lt (vnet_buffer (b)->tcp.seq_number, tc->rcv_nxt)) { - error = TCP_ERROR_SEGMENT_OLD; - *next0 = TCP_NEXT_DROP; - - /* Completely in the past (possible retransmit) */ + /* Completely in the past (possible retransmit). Ack + * retransmissions since we may not have any data to send */ if (seq_leq (vnet_buffer (b)->tcp.seq_end, tc->rcv_nxt)) { - /* Ack retransmissions since we may not have any data to send */ tcp_make_ack (tc, b); + error = TCP_ERROR_SEGMENT_OLD; *next0 = tcp_next_output (tc->c_is_ip4); goto done; } - /* Chop off the bytes in the past */ + /* Chop off the bytes in the past and see if what is left + * can be enqueued in order */ n_bytes_to_drop = tc->rcv_nxt - vnet_buffer (b)->tcp.seq_number; n_data_bytes -= n_bytes_to_drop; vnet_buffer (b)->tcp.seq_number = tc->rcv_nxt; if (tcp_buffer_discard_bytes (b, n_bytes_to_drop)) - goto done; - + { + error = TCP_ERROR_SEGMENT_OLD; + *next0 = tcp_next_drop (tc->c_is_ip4); + goto done; + } goto in_order; } + /* RFC2581: Enqueue and send DUPACK for fast retransmit */ error = tcp_session_enqueue_ooo (tc, b, n_data_bytes); - - /* N.B. Should not filter burst of dupacks. Two issues 1) dupacks open - * cwnd on remote peer when congested 2) acks leaving should have the - * latest rcv_wnd since the burst may eaten up all of it, so only the - * old ones could be filtered. - */ - - /* RFC2581: Send DUPACK for fast retransmit */ - tcp_make_ack (tc, b); *next0 = tcp_next_output (tc->c_is_ip4); - - /* Mark as DUPACK. We may filter these in output if - * the burst fills the holes. */ - if (n_data_bytes) - vnet_buffer (b)->tcp.flags = TCP_BUF_FLAG_DUPACK; - - TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc); + tcp_make_ack (tc, b); + vnet_buffer (b)->tcp.flags = TCP_BUF_FLAG_DUPACK; + TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc, vnet_buffer (b)->tcp); goto done; } @@ -1600,10 +1627,9 @@ in_order: /* In order data, enqueue. Fifo figures out by itself if any out-of-order * segments can be enqueued after fifo tail offset changes. */ error = tcp_session_enqueue_data (tc, b, n_data_bytes); - - /* Check if ACK can be delayed */ 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; @@ -1628,7 +1654,7 @@ format_tcp_rx_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U\n%U%U", format_tcp_header, &t->tcp_header, 128, @@ -1669,29 +1695,54 @@ tcp_set_rx_trace_data (tcp_rx_trace_t * t0, tcp_connection_t * tc0, } always_inline void -tcp_established_inc_counter (vlib_main_t * vm, u8 is_ip4, u8 evt, u8 val) +tcp_node_inc_counter_i (vlib_main_t * vm, u32 tcp4_node, u32 tcp6_node, + u8 is_ip4, u32 evt, u32 val) { - if (PREDICT_TRUE (!val)) - return; - if (is_ip4) - vlib_node_increment_counter (vm, tcp4_established_node.index, evt, val); + vlib_node_increment_counter (vm, tcp4_node, evt, val); else - vlib_node_increment_counter (vm, tcp6_established_node.index, evt, val); + vlib_node_increment_counter (vm, tcp6_node, evt, val); +} + +#define tcp_maybe_inc_counter(node_id, err, count) \ +{ \ + if (next0 != tcp_next_drop (is_ip4)) \ + tcp_node_inc_counter_i (vm, tcp4_##node_id##_node.index, \ + tcp6_##node_id##_node.index, is_ip4, err, \ + 1); \ +} +#define tcp_inc_counter(node_id, err, count) \ + tcp_node_inc_counter_i (vm, tcp4_##node_id##_node.index, \ + tcp6_##node_id##_node.index, is_ip4, \ + err, count) +#define tcp_maybe_inc_err_counter(cnts, err) \ +{ \ + cnts[err] += (next0 != tcp_next_drop (is_ip4)); \ +} +#define tcp_inc_err_counter(cnts, err, val) \ +{ \ + cnts[err] += val; \ } +#define tcp_store_err_counters(node_id, cnts) \ +{ \ + int i; \ + for (i = 0; i < TCP_N_ERROR; i++) \ + if (cnts[i]) \ + tcp_inc_counter(node_id, i, cnts[i]); \ +} + always_inline uword tcp46_established_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; u32 my_thread_index = vm->thread_index, errors = 0; - tcp_main_t *tm = vnet_get_tcp_main (); + 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; - next_index = node->cached_next_index; while (n_left_from > 0) @@ -1705,7 +1756,15 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_t *b0; tcp_header_t *th0 = 0; tcp_connection_t *tc0; - u32 next0 = TCP_ESTABLISHED_NEXT_DROP, error0 = TCP_ERROR_ENQUEUED; + 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; @@ -1736,24 +1795,29 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* TODO header prediction fast path */ /* 1-4: check SEQ, RST, SYN */ - if (PREDICT_FALSE (tcp_segment_validate (vm, tc0, b0, th0, &next0))) + if (PREDICT_FALSE (tcp_segment_validate (vm, tc0, b0, th0, &next0, + &error0))) { - error0 = TCP_ERROR_SEGMENT_INVALID; - TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, - vnet_buffer (b0)->tcp.seq_number, - vnet_buffer (b0)->tcp.seq_end); + tcp_maybe_inc_err_counter (err_counters, error0); + TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, vnet_buffer (b0)->tcp); goto done; } /* 5: check the ACK field */ - if (tcp_rcv_ack (tc0, b0, th0, &next0, &error0)) - goto done; + if (PREDICT_FALSE (tcp_rcv_ack (tc0, b0, th0, &next0, &error0))) + { + tcp_maybe_inc_err_counter (err_counters, error0); + goto done; + } /* 6: check the URG bit TODO */ /* 7: process the segment text */ if (vnet_buffer (b0)->tcp.data_len) - error0 = tcp_segment_rcv (tm, tc0, b0, &next0); + { + error0 = tcp_segment_rcv (tc0, b0, &next0); + tcp_maybe_inc_err_counter (err_counters, error0); + } /* 8: check the FIN bit */ if (PREDICT_FALSE (is_fin)) @@ -1769,14 +1833,15 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, 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); } 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_rx_trace_t *t0 = vlib_add_trace (vm, node, b0, + sizeof (*t0)); tcp_set_rx_trace_data (t0, tc0, th0, b0, is_ip4); } @@ -1787,10 +1852,11 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - errors = session_manager_flush_enqueue_events (my_thread_index); - tcp_established_inc_counter (vm, is_ip4, TCP_ERROR_EVENT_FIFO_FULL, errors); + errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, + my_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; } @@ -1859,25 +1925,32 @@ vlib_node_registration_t tcp6_syn_sent_node; static u8 tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr) { - transport_connection_t *tmp; + transport_connection_t *tmp = 0; + u64 handle; + if (!tc) return 1; + /* Proxy case */ + if (tc->c_lcl_port == 0 && tc->state == TCP_STATE_LISTEN) + return 1; + u8 is_valid = (tc->c_lcl_port == hdr->dst_port && (tc->state == TCP_STATE_LISTEN || tc->c_rmt_port == hdr->src_port)); if (!is_valid) { - if ((tmp = - stream_session_half_open_lookup (&tc->c_lcl_ip, &tc->c_rmt_ip, - tc->c_lcl_port, tc->c_rmt_port, - tc->c_transport_proto))) + handle = session_lookup_half_open_handle (&tc->connection); + tmp = session_lookup_half_open_connection (handle & 0xFFFFFFFF, + tc->c_proto, tc->c_is_ip4); + + if (tmp) { if (tmp->lcl_port == hdr->dst_port && tmp->rmt_port == hdr->src_port) { - clib_warning ("half-open is valid!"); + TCP_DBG ("half-open is valid!"); } } } @@ -1888,22 +1961,25 @@ tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr) * Lookup transport connection */ static tcp_connection_t * -tcp_lookup_connection (vlib_buffer_t * b, u8 thread_index, u8 is_ip4) +tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index, + u8 is_ip4) { tcp_header_t *tcp; transport_connection_t *tconn; tcp_connection_t *tc; + u8 is_filtered = 0; if (is_ip4) { ip4_header_t *ip4; ip4 = vlib_buffer_get_current (b); tcp = ip4_next_header (ip4); - tconn = stream_session_lookup_transport_wt4 (&ip4->dst_address, - &ip4->src_address, - tcp->dst_port, - tcp->src_port, - SESSION_TYPE_IP4_TCP, - thread_index); + tconn = 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); tc = tcp_get_connection_from_transport (tconn); ASSERT (tcp_lookup_is_valid (tc, tcp)); } @@ -1912,12 +1988,13 @@ tcp_lookup_connection (vlib_buffer_t * b, u8 thread_index, u8 is_ip4) ip6_header_t *ip6; ip6 = vlib_buffer_get_current (b); tcp = ip6_next_header (ip6); - tconn = stream_session_lookup_transport_wt6 (&ip6->dst_address, - &ip6->src_address, - tcp->dst_port, - tcp->src_port, - SESSION_TYPE_IP6_TCP, - thread_index); + tconn = 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); tc = tcp_get_connection_from_transport (tconn); ASSERT (tcp_lookup_is_valid (tc, tcp)); } @@ -1951,7 +2028,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp_header_t *tcp0 = 0; tcp_connection_t *tc0; tcp_connection_t *new_tc0; - u32 next0 = TCP_SYN_SENT_NEXT_DROP, error0 = TCP_ERROR_ENQUEUED; + u32 next0 = tcp_next_drop (is_ip4), error0 = TCP_ERROR_ENQUEUED; bi0 = from[0]; to_next[0] = bi0; @@ -1975,7 +2052,8 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE (tc0->flags & TCP_CONN_HALF_OPEN_DONE)) { /* Make sure the connection actually exists */ - ASSERT (tcp_lookup_connection (b0, my_thread_index, is_ip4)); + ASSERT (tcp_lookup_connection (tc0->c_fib_index, b0, + my_thread_index, is_ip4)); goto drop; } @@ -2073,6 +2151,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, 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 */ @@ -2109,7 +2188,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* Notify app that we have connection. If session layer can't * allocate session send reset */ - if (stream_session_connect_notify (&new_tc0->connection, 0)) + if (session_stream_connect_notify (&new_tc0->connection, 0)) { clib_warning ("connect notify fail"); tcp_send_reset_w_pkt (new_tc0, b0, is_ip4); @@ -2130,7 +2209,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, new_tc0->state = TCP_STATE_SYN_RCVD; /* Notify app that we have connection */ - if (stream_session_connect_notify (&new_tc0->connection, 0)) + if (session_stream_connect_notify (&new_tc0->connection, 0)) { tcp_connection_cleanup (new_tc0); tcp_send_reset_w_pkt (tc0, b0, is_ip4); @@ -2149,10 +2228,11 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* Read data, if any */ if (PREDICT_FALSE (vnet_buffer (b0)->tcp.data_len)) { - ASSERT (0); - error0 = tcp_segment_rcv (tm, new_tc0, b0, &next0); - if (error0 == TCP_ERROR_PURE_ACK) + 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 { @@ -2179,17 +2259,9 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - errors = session_manager_flush_enqueue_events (my_thread_index); - if (errors) - { - if (is_ip4) - vlib_node_increment_counter (vm, tcp4_established_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); - else - vlib_node_increment_counter (vm, tcp6_established_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); - } - + errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, + my_thread_index); + tcp_inc_counter (syn_sent, TCP_ERROR_EVENT_FIFO_FULL, errors); return from_frame->n_vectors; } @@ -2251,6 +2323,9 @@ VLIB_REGISTER_NODE (tcp6_syn_sent_node) = VLIB_NODE_FUNCTION_MULTIARCH (tcp6_syn_sent_node, tcp6_syn_sent_rcv); +vlib_node_registration_t tcp4_rcv_process_node; +vlib_node_registration_t tcp6_rcv_process_node; + /** * Handles reception for all states except LISTEN, SYN-SENT and ESTABLISHED * as per RFC793 p. 64 @@ -2259,13 +2334,11 @@ always_inline uword tcp46_rcv_process_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 n_left_from, next_index, *from, *to_next, n_fins = 0; u32 my_thread_index = vm->thread_index, errors = 0; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; - next_index = node->cached_next_index; while (n_left_from > 0) @@ -2280,7 +2353,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_t *b0; tcp_header_t *tcp0 = 0; tcp_connection_t *tc0; - u32 next0 = TCP_RCV_PROCESS_NEXT_DROP, error0 = TCP_ERROR_ENQUEUED; + u32 next0 = tcp_next_drop (is_ip4), error0 = TCP_ERROR_NONE; u8 is_fin0; bi0 = from[0]; @@ -2309,11 +2382,11 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (CLIB_DEBUG) { tcp_connection_t *tmp; - tmp = tcp_lookup_connection (b0, my_thread_index, is_ip4); + tmp = tcp_lookup_connection (tc0->c_fib_index, b0, + my_thread_index, is_ip4); if (tmp->state != tc0->state) { clib_warning ("state changed"); - ASSERT (0); goto drop; } } @@ -2321,11 +2394,10 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* * Special treatment for CLOSED */ - switch (tc0->state) + if (PREDICT_FALSE (tc0->state == TCP_STATE_CLOSED)) { - case TCP_STATE_CLOSED: + error0 = TCP_ERROR_CONNECTION_CLOSED; goto drop; - break; } /* @@ -2334,9 +2406,9 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* 1-4: check SEQ, RST, SYN */ if (PREDICT_FALSE (tcp_segment_validate (vm, tc0, b0, tcp0, - &next0))) + &next0, &error0))) { - error0 = TCP_ERROR_SEGMENT_INVALID; + tcp_maybe_inc_counter (rcv_process, error0, 1); goto drop; } @@ -2352,8 +2424,9 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, */ if (!tcp_rcv_ack_is_acceptable (tc0, b0)) { - clib_warning ("connection not accepted"); + TCP_DBG ("connection not accepted"); tcp_send_reset_w_pkt (tc0, b0, is_ip4); + error0 = TCP_ERROR_ACK_INVALID; goto drop; } @@ -2362,6 +2435,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* 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; @@ -2369,18 +2443,21 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, << tc0->rcv_opts.wscale; tc0->snd_wl1 = vnet_buffer (b0)->tcp.seq_number; tc0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; - stream_session_accept_notify (&tc0->connection); /* Reset SYN-ACK retransmit and SYN_RCV establish timers */ tcp_retransmit_timer_reset (tc0); tcp_timer_reset (tc0, TCP_TIMER_ESTABLISH); - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc0); + 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)) - goto drop; + { + tcp_maybe_inc_counter (rcv_process, error0, 1); + goto drop; + } break; case TCP_STATE_FIN_WAIT_1: @@ -2388,13 +2465,16 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, * 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)) - goto drop; + { + tcp_maybe_inc_counter (rcv_process, error0, 1); + goto drop; + } /* Still have to send the FIN */ 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 */ @@ -2415,23 +2495,44 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, * 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)) - goto drop; + { + 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)) - goto drop; + { + 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)) - goto drop; + { + 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_2MSL_TIME); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); goto drop; break; @@ -2441,11 +2542,14 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, * delete the TCB, enter the CLOSED state, and return. */ if (!tcp_rcv_ack_is_acceptable (tc0, b0)) - goto drop; - + { + error0 = TCP_ERROR_ACK_INVALID; + goto drop; + } + error0 = TCP_ERROR_ACK_OK; tc0->snd_una = vnet_buffer (b0)->tcp.ack_number; - /* Apparently our FIN was lost */ - if (is_fin0) + /* 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; @@ -2453,13 +2557,9 @@ 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); - - /* 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_update (tc0, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME); - tcp_retransmit_timer_reset (tc0); + /* Delete the connection/session since the pipes should be + * clear by now */ + tcp_connection_del (tc0); goto drop; @@ -2470,11 +2570,14 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, * the 2 MSL timeout. */ if (tcp_rcv_ack (tc0, b0, tcp0, &next0, &error0)) - goto drop; + { + tcp_maybe_inc_counter (rcv_process, error0, 1); + goto drop; + } tcp_make_ack (tc0, b0); - tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_2MSL_TIME); - + next0 = tcp_next_output (is_ip4); + tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); goto drop; break; @@ -2491,7 +2594,10 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, case TCP_STATE_FIN_WAIT_1: case TCP_STATE_FIN_WAIT_2: if (vnet_buffer (b0)->tcp.data_len) - error0 = tcp_segment_rcv (tm, tc0, b0, &next0); + { + error0 = tcp_segment_rcv (tc0, b0, &next0); + tcp_maybe_inc_counter (rcv_process, error0, 1); + } else if (is_fin0) tc0->rcv_nxt += 1; break; @@ -2551,6 +2657,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, break; } TCP_EVT_DBG (TCP_EVT_FIN_RCVD, tc0); + n_fins += 1; drop: b0->error = error0 ? node->errors[error0] : 0; @@ -2569,17 +2676,10 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - errors = session_manager_flush_enqueue_events (my_thread_index); - if (errors) - { - if (is_ip4) - vlib_node_increment_counter (vm, tcp4_established_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); - else - vlib_node_increment_counter (vm, tcp6_established_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); - } - + errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, + my_thread_index); + tcp_inc_counter (rcv_process, TCP_ERROR_EVENT_FIFO_FULL, errors); + tcp_inc_counter (rcv_process, TCP_ERROR_FIN_RCVD, n_fins); return from_frame->n_vectors; } @@ -2651,9 +2751,8 @@ 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; + u32 n_left_from, next_index, *from, *to_next, n_syns = 0; u32 my_thread_index = vm->thread_index; - u8 sst = is_ip4 ? SESSION_TYPE_IP4_TCP : SESSION_TYPE_IP6_TCP; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; @@ -2676,7 +2775,7 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_header_t *ip40; ip6_header_t *ip60; tcp_connection_t *child0; - u32 error0 = TCP_ERROR_SYNS_RCVD, next0 = TCP_LISTEN_NEXT_DROP; + u32 error0 = TCP_ERROR_NONE, next0 = tcp_next_drop (is_ip4); bi0 = from[0]; to_next[0] = bi0; @@ -2715,7 +2814,8 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* 3. check for a SYN (did that already) */ /* Make sure connection wasn't just created */ - child0 = tcp_lookup_connection (b0, my_thread_index, is_ip4); + 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; @@ -2724,10 +2824,11 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, /* Create child session and send SYN-ACK */ child0 = tcp_connection_new (my_thread_index); - child0->c_lcl_port = lc0->c_lcl_port; + 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 (is_ip4) { @@ -2742,15 +2843,6 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, sizeof (ip6_address_t)); } - if (stream_session_accept (&child0->connection, lc0->c_s_index, sst, - 0 /* notify */ )) - { - clib_warning ("session accept fail"); - tcp_connection_cleanup (child0); - error0 = TCP_ERROR_CREATE_SESSION_FAIL; - goto drop; - } - if (tcp_options_parse (th0, &child0->rcv_opts)) { clib_warning ("options parse fail"); @@ -2760,6 +2852,7 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, 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]; /* RFC1323: TSval timestamps sent on {SYN} and {SYN,ACK} * segments are used to initialize PAWS. */ @@ -2780,6 +2873,15 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp_connection_init_vars (child0); TCP_EVT_DBG (TCP_EVT_SYN_RCVD, child0, 1); + 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; + } + /* Reuse buffer to make syn-ack and send */ tcp_make_synack (child0, b0); next0 = tcp_next_output (is_ip4); @@ -2794,6 +2896,7 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, sizeof (t0->tcp_connection)); } + n_syns += (error0 == TCP_ERROR_NONE); b0->error = node->errors[error0]; vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, @@ -2802,6 +2905,8 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } + + tcp_inc_counter (listen, TCP_ERROR_SYNS_RCVD, n_syns); return from_frame->n_vectors; } @@ -2879,22 +2984,22 @@ typedef enum _tcp_input_next } tcp_input_next_t; #define foreach_tcp4_input_next \ - _ (DROP, "error-drop") \ + _ (DROP, "ip4-drop") \ _ (LISTEN, "tcp4-listen") \ _ (RCV_PROCESS, "tcp4-rcv-process") \ _ (SYN_SENT, "tcp4-syn-sent") \ _ (ESTABLISHED, "tcp4-established") \ _ (RESET, "tcp4-reset") \ - _ (PUNT, "error-punt") + _ (PUNT, "ip4-punt") #define foreach_tcp6_input_next \ - _ (DROP, "error-drop") \ + _ (DROP, "ip6-drop") \ _ (LISTEN, "tcp6-listen") \ _ (RCV_PROCESS, "tcp6-rcv-process") \ _ (SYN_SENT, "tcp6-syn-sent") \ _ (ESTABLISHED, "tcp6-established") \ _ (RESET, "tcp6-reset") \ - _ (PUNT, "error-punt") + _ (PUNT, "ip6-punt") #define filter_flags (TCP_FLAG_SYN|TCP_FLAG_ACK|TCP_FLAG_RST|TCP_FLAG_FIN) @@ -2920,7 +3025,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_left_from > 0 && n_left_to_next > 0) { int n_advance_bytes0, n_data_bytes0; - u32 bi0; + u32 bi0, fib_index0; vlib_buffer_t *b0; tcp_header_t *tcp0 = 0; tcp_connection_t *tc0; @@ -2928,7 +3033,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_header_t *ip40; ip6_header_t *ip60; u32 error0 = TCP_ERROR_NO_LISTENER, next0 = TCP_INPUT_NEXT_DROP; - u8 flags0; + u8 flags0, is_filtered = 0; bi0 = from[0]; to_next[0] = bi0; @@ -2939,6 +3044,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, b0 = vlib_get_buffer (vm, bi0); vnet_buffer (b0)->tcp.flags = 0; + fib_index0 = vnet_buffer (b0)->ip.fib_index; /* Checksum computed by ipx_local no need to compute again */ @@ -2950,14 +3056,14 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, + tcp_header_bytes (tcp0)); n_data_bytes0 = clib_net_to_host_u16 (ip40->length) - n_advance_bytes0; - tconn = stream_session_lookup_transport_wt4 (&ip40->dst_address, - &ip40->src_address, - tcp0->dst_port, - tcp0->src_port, - SESSION_TYPE_IP4_TCP, - my_thread_index); - tc0 = tcp_get_connection_from_transport (tconn); - ASSERT (tcp_lookup_is_valid (tc0, tcp0)); + 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 { @@ -2967,14 +3073,14 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, n_data_bytes0 = clib_net_to_host_u16 (ip60->payload_length) - n_advance_bytes0; n_advance_bytes0 += sizeof (ip60[0]); - tconn = stream_session_lookup_transport_wt6 (&ip60->dst_address, - &ip60->src_address, - tcp0->dst_port, - tcp0->src_port, - SESSION_TYPE_IP6_TCP, - my_thread_index); - tc0 = tcp_get_connection_from_transport (tconn); - ASSERT (tcp_lookup_is_valid (tc0, tcp0)); + 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); } /* Length check */ @@ -2984,9 +3090,15 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, goto done; } + vnet_buffer (b0)->tcp.hdr_offset = (u8 *) tcp0 + - (u8 *) vlib_buffer_get_current (b0); + /* Session exists */ - if (PREDICT_TRUE (0 != tc0)) + if (PREDICT_TRUE (0 != tconn)) { + tc0 = tcp_get_connection_from_transport (tconn); + ASSERT (tcp_lookup_is_valid (tc0, tcp0)); + /* Save connection index */ vnet_buffer (b0)->tcp.connection_index = tc0->c_c_index; vnet_buffer (b0)->tcp.seq_number = @@ -2994,8 +3106,6 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vnet_buffer (b0)->tcp.ack_number = clib_net_to_host_u32 (tcp0->ack_number); - vnet_buffer (b0)->tcp.hdr_offset = (u8 *) tcp0 - - (u8 *) vlib_buffer_get_current (b0); vnet_buffer (b0)->tcp.data_offset = n_advance_bytes0; vnet_buffer (b0)->tcp.data_len = n_data_bytes0; @@ -3018,8 +3128,13 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } else { - if ((is_ip4 && tm->punt_unknown4) || - (!is_ip4 && tm->punt_unknown6)) + 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; @@ -3030,6 +3145,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, next0 = TCP_INPUT_NEXT_RESET; error0 = TCP_ERROR_NO_LISTENER; } + tc0 = 0; } done: @@ -3037,8 +3153,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) { - tcp_rx_trace_t *t0 = - vlib_add_trace (vm, node, b0, sizeof (*t0)); + 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, @@ -3131,7 +3247,7 @@ do { \ /* SYNs for new connections -> tcp-listen. */ _(LISTEN, TCP_FLAG_SYN, TCP_INPUT_NEXT_LISTEN, TCP_ERROR_NONE); _(LISTEN, TCP_FLAG_ACK, TCP_INPUT_NEXT_RESET, TCP_ERROR_NONE); - _(LISTEN, TCP_FLAG_RST, TCP_INPUT_NEXT_DROP, TCP_ERROR_NONE); + _(LISTEN, TCP_FLAG_RST, TCP_INPUT_NEXT_DROP, TCP_ERROR_RST_RCVD); _(LISTEN, TCP_FLAG_FIN | TCP_FLAG_ACK, TCP_INPUT_NEXT_RESET, TCP_ERROR_NONE); /* ACK for for a SYN-ACK -> tcp-rcv-process. */ @@ -3164,6 +3280,7 @@ do { \ /* FIN in reply to our FIN from the other side */ _(FIN_WAIT_1, TCP_FLAG_FIN, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(FIN_WAIT_1, TCP_FLAG_RST, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); + _(CLOSING, TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); /* FIN confirming that the peer (app) has closed */ _(FIN_WAIT_2, TCP_FLAG_FIN, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE); _(FIN_WAIT_2, TCP_FLAG_ACK, TCP_INPUT_NEXT_RCV_PROCESS, TCP_ERROR_NONE);