X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_input.c;h=497b709bec03cf50708a16bfe8612206ead52ee3;hb=c1a448b3ad16f4ae78527220420fe5c1e41a4ab9;hp=73642df8ca92a629e417a43dd609029e81d6f573;hpb=3cbc04bea02fc60471dfe0c671ede3ca42c118c3;p=vpp.git diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 73642df8ca9..497b709bec0 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,19 +272,25 @@ 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) { 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); @@ -307,48 +317,47 @@ 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; + 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); + 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 +370,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 @@ -926,6 +941,7 @@ 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); } @@ -1292,7 +1308,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; } @@ -1381,13 +1397,7 @@ 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; - } - + ASSERT (data_len); written = session_enqueue_stream_connection (&tc->connection, b, 0, 1 /* queue event */ , 1); @@ -1442,12 +1452,7 @@ 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 = session_enqueue_stream_connection (&tc->connection, b, @@ -1485,7 +1490,7 @@ tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b, } } - return TCP_ERROR_ENQUEUED; + return TCP_ERROR_ENQUEUED_OOO; } /** @@ -1536,11 +1541,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; @@ -1553,45 +1562,35 @@ 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_make_ack (tc, b); + vnet_buffer (b)->tcp.flags = TCP_BUF_FLAG_DUPACK; TCP_EVT_DBG (TCP_EVT_DUPACK_SENT, tc); goto done; } @@ -1601,10 +1600,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; @@ -1670,30 +1668,54 @@ tcp_set_rx_trace_data (tcp_rx_trace_t * t0, tcp_connection_t * tc0, } always_inline void -tcp_node_inc_counter (vlib_main_t * vm, u32 tcp4_node, u32 tcp6_node, - 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_node, evt, val); else 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) @@ -1707,7 +1729,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; @@ -1738,9 +1768,10 @@ 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_maybe_inc_err_counter (err_counters, error0); TCP_EVT_DBG (TCP_EVT_SEG_INVALID, tc0, vnet_buffer (b0)->tcp.seq_number, vnet_buffer (b0)->tcp.seq_end); @@ -1748,14 +1779,20 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } /* 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)) @@ -1771,14 +1808,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); } @@ -1791,11 +1829,9 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, my_thread_index); - tcp_node_inc_counter (vm, is_ip4, tcp4_established_node.index, - tcp6_established_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); + 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; } @@ -1870,6 +1906,10 @@ tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr) 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)); @@ -1902,6 +1942,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index, tcp_header_t *tcp; transport_connection_t *tconn; tcp_connection_t *tc; + u8 is_filtered = 0; if (is_ip4) { ip4_header_t *ip4; @@ -1913,7 +1954,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index, tcp->dst_port, tcp->src_port, TRANSPORT_PROTO_TCP, - thread_index); + thread_index, &is_filtered); tc = tcp_get_connection_from_transport (tconn); ASSERT (tcp_lookup_is_valid (tc, tcp)); } @@ -1928,7 +1969,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index, tcp->dst_port, tcp->src_port, TRANSPORT_PROTO_TCP, - thread_index); + thread_index, &is_filtered); tc = tcp_get_connection_from_transport (tconn); ASSERT (tcp_lookup_is_valid (tc, tcp)); } @@ -1962,7 +2003,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; @@ -2161,10 +2202,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 { @@ -2193,9 +2235,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, my_thread_index); - tcp_node_inc_counter (vm, is_ip4, tcp4_syn_sent_node.index, - tcp6_syn_sent_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); + tcp_inc_counter (syn_sent, TCP_ERROR_EVENT_FIFO_FULL, errors); return from_frame->n_vectors; } @@ -2268,13 +2308,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) @@ -2289,7 +2327,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]; @@ -2318,13 +2356,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 (tc0->c_fib_index, 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; } } @@ -2332,11 +2368,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; } /* @@ -2345,9 +2380,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; } @@ -2365,6 +2400,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { TCP_DBG ("connection not accepted"); tcp_send_reset_w_pkt (tc0, b0, is_ip4); + error0 = TCP_ERROR_ACK_INVALID; goto drop; } @@ -2373,6 +2409,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; @@ -2380,18 +2417,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: @@ -2399,7 +2439,10 @@ 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) @@ -2426,19 +2469,28 @@ 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; + } 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); @@ -2456,7 +2508,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, 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) @@ -2484,12 +2536,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); next0 = tcp_next_output (is_ip4); tcp_timer_update (tc0, TCP_TIMER_WAITCLOSE, TCP_TIMEWAIT_TIME); - goto drop; break; @@ -2506,7 +2560,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; @@ -2566,6 +2623,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; @@ -2586,10 +2644,8 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP, my_thread_index); - tcp_node_inc_counter (vm, is_ip4, tcp4_rcv_process_node.index, - tcp6_rcv_process_node.index, - TCP_ERROR_EVENT_FIFO_FULL, errors); - + 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; } @@ -2661,7 +2717,7 @@ 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; from = vlib_frame_vector_args (from_frame); @@ -2685,7 +2741,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; @@ -2724,9 +2780,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 (lc0->c_fib_index, 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; @@ -2735,10 +2790,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) { @@ -2753,15 +2809,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, - 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"); @@ -2791,6 +2838,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); @@ -2805,6 +2861,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, @@ -2813,6 +2870,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; } @@ -2890,22 +2949,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) @@ -2939,7 +2998,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; @@ -2968,9 +3027,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp0->dst_port, tcp0->src_port, TRANSPORT_PROTO_TCP, - my_thread_index); - tc0 = tcp_get_connection_from_transport (tconn); - ASSERT (tcp_lookup_is_valid (tc0, tcp0)); + my_thread_index, + &is_filtered); } else { @@ -2986,9 +3044,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, tcp0->dst_port, tcp0->src_port, TRANSPORT_PROTO_TCP, - my_thread_index); - tc0 = tcp_get_connection_from_transport (tconn); - ASSERT (tcp_lookup_is_valid (tc0, tcp0)); + my_thread_index, + &is_filtered); } /* Length check */ @@ -2998,9 +3055,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 = @@ -3008,8 +3071,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; @@ -3032,8 +3093,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; @@ -3044,6 +3110,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: @@ -3051,8 +3118,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, @@ -3145,7 +3212,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. */