X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp.h;h=165659b6d9f3d7f5a61cb41a1e17465c14676a3d;hb=45ca73f6af1584a44886d5a13702885be58df1b6;hp=9e4660b86e61eb2f5d6060aa6197c20064c9749e;hpb=1f152cd6faf96b524b6b7071b5cffe1916f9c5cc;p=vpp.git diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 9e4660b86e6..165659b6d9f 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -32,7 +32,7 @@ #define TCP_MAX_OPTION_SPACE 40 #define TCP_DUPACK_THRESHOLD 3 -#define TCP_MAX_RX_FIFO_SIZE 4 << 20 +#define TCP_MAX_RX_FIFO_SIZE 32 << 20 #define TCP_MIN_RX_FIFO_SIZE 4 << 10 #define TCP_IW_N_SEGMENTS 10 #define TCP_ALWAYS_ACK 1 /**< On/off delayed acks */ @@ -97,10 +97,11 @@ extern timer_expiration_handler tcp_timer_retransmit_syn_handler; * ticks to timer units */ #define TCP_DELACK_TIME 1 /* 0.1s */ #define TCP_ESTABLISH_TIME 750 /* 75s */ -#define TCP_SYN_RCVD_TIME 100 /* 10s */ +#define TCP_SYN_RCVD_TIME 600 /* 60s */ #define TCP_2MSL_TIME 300 /* 30s */ -#define TCP_CLOSEWAIT_TIME 20 /* 0.1s */ -#define TCP_CLEANUP_TIME 5 /* 0.5s Time to wait before cleanup */ +#define TCP_CLOSEWAIT_TIME 20 /* 2s */ +#define TCP_TIMEWAIT_TIME 100 /* 10s */ +#define TCP_CLEANUP_TIME 10 /* 1s Time to wait before cleanup */ #define TCP_TIMER_PERSIST_MIN 2 /* 0.2s */ #define TCP_RTO_MAX 60 * THZ /* Min max RTO (60s) as per RFC6298 */ @@ -113,12 +114,12 @@ extern timer_expiration_handler tcp_timer_retransmit_syn_handler; #define foreach_tcp_connection_flag \ _(SNDACK, "Send ACK") \ _(FINSNT, "FIN sent") \ - _(SENT_RCV_WND0, "Sent 0 receive window") \ - _(RECOVERY, "Recovery on") \ - _(FAST_RECOVERY, "Fast Recovery on") \ + _(SENT_RCV_WND0, "Sent 0 rcv_wnd") \ + _(RECOVERY, "Recovery") \ + _(FAST_RECOVERY, "Fast Recovery") \ _(FR_1_SMSS, "Sent 1 SMSS") \ _(HALF_OPEN_DONE, "Half-open completed") \ - _(FINPNDG, "FIN pending") + _(FINPNDG, "FIN pending") \ typedef enum _tcp_connection_flag_bits { @@ -224,6 +225,24 @@ typedef struct _sack_scoreboard #define tcp_scoreboard_trace_add(_tc, _ack) #endif +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); +sack_scoreboard_hole_t *scoreboard_get_hole (sack_scoreboard_t * sb, + u32 index); + +sack_scoreboard_hole_t *scoreboard_next_hole (sack_scoreboard_t * sb, + sack_scoreboard_hole_t * hole); +sack_scoreboard_hole_t *scoreboard_prev_hole (sack_scoreboard_t * sb, + sack_scoreboard_hole_t * hole); +sack_scoreboard_hole_t *scoreboard_first_hole (sack_scoreboard_t * sb); +sack_scoreboard_hole_t *scoreboard_last_hole (sack_scoreboard_t * sb); +void scoreboard_clear (sack_scoreboard_t * sb); +void scoreboard_init (sack_scoreboard_t * sb); +u8 *format_tcp_scoreboard (u8 * s, va_list * args); + typedef enum _tcp_cc_algorithm_type { TCP_CC_NEWRENO, @@ -266,13 +285,13 @@ typedef struct _tcp_connection u32 irs; /**< initial remote sequence */ /* Options */ - tcp_options_t rcv_opts; /**< Rx options for connection */ - tcp_options_t snd_opts; /**< Tx options for connection */ u8 snd_opts_len; /**< Tx options len */ - u8 rcv_wscale; /**< Window scale to advertise to peer */ - u8 snd_wscale; /**< Window scale to use when sending */ - u32 tsval_recent; /**< Last timestamp received */ - u32 tsval_recent_age; /**< When last updated tstamp_recent*/ + u8 rcv_wscale; /**< Window scale to advertise to peer */ + u8 snd_wscale; /**< Window scale to use when sending */ + u32 tsval_recent; /**< Last timestamp received */ + u32 tsval_recent_age; /**< When last updated tstamp_recent*/ + tcp_options_t snd_opts; /**< Tx options for connection */ + tcp_options_t rcv_opts; /**< Rx options for connection */ sack_block_t *snd_sacks; /**< Vector of SACKs to send. XXX Fixed size? */ sack_scoreboard_t sack_sb; /**< SACK "scoreboard" that tracks holes */ @@ -282,6 +301,7 @@ typedef struct _tcp_connection /* Congestion control */ u32 cwnd; /**< Congestion window */ + u32 cwnd_acc_bytes; /**< Bytes accumulated for cwnd increment */ u32 ssthresh; /**< Slow-start threshold */ u32 prev_ssthresh; /**< ssthresh before congestion */ u32 prev_cwnd; /**< ssthresh before congestion */ @@ -303,6 +323,7 @@ typedef struct _tcp_connection u16 mss; /**< Our max seg size that includes options */ u32 limited_transmit; /**< snd_nxt when limited transmit starts */ u32 last_fib_check; /**< Last time we checked fib route for peer */ + u32 sw_if_index; /**< Interface for the connection */ } tcp_connection_t; struct _tcp_cc_algorithm @@ -335,13 +356,6 @@ tcp_cong_recovery_off (tcp_connection_t * tc) tcp_fastrecovery_1_smss_off (tc); } -typedef enum -{ - TCP_IP4, - TCP_IP6, - TCP_N_AF, -} tcp_af_t; - typedef enum _tcp_error { #define tcp_error(n,s) TCP_ERROR_##n, @@ -355,6 +369,21 @@ typedef struct _tcp_lookup_dispatch u8 next, error; } tcp_lookup_dispatch_t; +typedef struct tcp_worker_ctx_ +{ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + u32 time_now; /**< worker time */ + tw_timer_wheel_16t_2w_512sl_t timer_wheel; /**< worker timer wheel */ + u32 *tx_buffers; /**< tx buffer free list */ + vlib_frame_t *tx_frames[2]; /**< tx frames for tcp 4/6 + output nodes */ + vlib_frame_t *ip_lookup_tx_frames[2]; /**< tx frames for ip 4/6 + lookup nodes */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); + u8 cached_opts[40]; /**< cached 'on the wire' + options for bursts */ +} tcp_worker_ctx_t; + typedef struct _tcp_main { /* Per-worker thread tcp connection pools */ @@ -368,33 +397,31 @@ typedef struct _tcp_main u8 log2_tstamp_clocks_per_tick; f64 tstamp_ticks_per_clock; - u32 *time_now; - - /** per-worker tx buffer free lists */ - u32 **tx_buffers; - /** per-worker tx frames to 4/6 output nodes */ - vlib_frame_t **tx_frames[2]; - /* Per worker-thread timer wheel for connections timers */ - tw_timer_wheel_16t_2w_512sl_t *timer_wheels; + /** per-worker context */ + tcp_worker_ctx_t *wrk_ctx; /* Pool of half-open connections on which we've sent a SYN */ tcp_connection_t *half_open_connections; clib_spinlock_t half_open_lock; - /* Pool of local TCP endpoints */ - transport_endpoint_t *local_endpoints; - - /* Local endpoints lookup table */ - transport_endpoint_table_t local_endpoints_table; - clib_spinlock_t local_endpoints_lock; - /* Congestion control algorithms registered */ tcp_cc_algorithm_t *cc_algos; + /** vlib buffer size */ + u32 bytes_per_buffer; + + /* + * Configuration + */ + /* Flag that indicates if stack is on or off */ u8 is_enabled; + /** Max rx fifo size for a session. It is used in to compute the + * rfc 7323 window scaling factor */ + u32 max_rx_fifo; + /** Number of preallocated connections */ u32 preallocated_connections; u32 preallocated_half_open_connections; @@ -405,11 +432,11 @@ typedef struct _tcp_main u32 last_v6_address_rotor; ip6_address_t *ip6_src_addresses; - /** Port allocator random number generator seed */ - u32 port_allocator_seed; + u8 punt_unknown4; + u8 punt_unknown6; - /** vlib buffer size */ - u32 bytes_per_buffer; + /** fault-injection */ + f64 buffer_fail_fraction; } tcp_main_t; extern tcp_main_t tcp_main; @@ -432,8 +459,19 @@ tcp_buffer_hdr (vlib_buffer_t * b) + vnet_buffer (b)->tcp.hdr_offset); } +#if (VLIB_BUFFER_TRACE_TRAJECTORY) +#define tcp_trajectory_add_start(b, start) \ +{ \ + (*vlib_buffer_trace_trajectory_cb) (b, start); \ +} +#else +#define tcp_trajectory_add_start(b, start) +#endif + clib_error_t *vnet_tcp_enable_disable (vlib_main_t * vm, u8 is_en); +void tcp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add); + always_inline tcp_connection_t * tcp_connection_get (u32 conn_index, u32 thread_index) { @@ -472,11 +510,7 @@ int tcp_configure_v6_source_address_range (vlib_main_t * vm, ip6_address_t * start, ip6_address_t * end, u32 table_id); void tcp_api_reference (void); -u8 *format_tcp_connection_id (u8 * s, va_list * args); u8 *format_tcp_connection (u8 * s, va_list * args); -u8 *format_tcp_scoreboard (u8 * s, va_list * args); - -u8 *tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose); always_inline tcp_connection_t * tcp_listener_get (u32 tli) @@ -504,7 +538,7 @@ void tcp_send_reset (tcp_connection_t * tc); void tcp_send_syn (tcp_connection_t * tc); void tcp_send_fin (tcp_connection_t * tc); void tcp_init_mss (tcp_connection_t * tc); -void tcp_update_snd_mss (tcp_connection_t * tc); +void tcp_update_burst_snd_vars (tcp_connection_t * tc); void tcp_update_rto (tcp_connection_t * tc); void tcp_flush_frame_to_output (vlib_main_t * vm, u8 thread_index, u8 is_ip4); void tcp_flush_frames_to_output (u8 thread_index); @@ -605,7 +639,7 @@ tcp_available_output_snd_space (const tcp_connection_t * tc) * Estimate of how many bytes we can still push into the network */ always_inline u32 -tcp_available_snd_space (const tcp_connection_t * tc) +tcp_available_cc_snd_space (const tcp_connection_t * tc) { u32 available_wnd = tcp_available_snd_wnd (tc); u32 flight_size = tcp_flight_size (tc); @@ -624,54 +658,39 @@ tcp_is_lost_fin (tcp_connection_t * tc) return 0; } -i32 tcp_rcv_wnd_available (tcp_connection_t * tc); u32 tcp_snd_space (tcp_connection_t * tc); -void tcp_update_rcv_wnd (tcp_connection_t * tc); - void tcp_retransmit_first_unacked (tcp_connection_t * tc); void tcp_fast_retransmit_no_sack (tcp_connection_t * tc); void tcp_fast_retransmit_sack (tcp_connection_t * tc); void tcp_fast_retransmit (tcp_connection_t * tc); void tcp_cc_init_congestion (tcp_connection_t * tc); -int tcp_cc_recover (tcp_connection_t * tc); void tcp_cc_fastrecovery_exit (tcp_connection_t * tc); fib_node_index_t tcp_lookup_rmt_in_fib (tcp_connection_t * tc); /* Made public for unit testing only */ void tcp_update_sack_list (tcp_connection_t * tc, u32 start, u32 end); +u32 tcp_sack_list_bytes (tcp_connection_t * tc); always_inline u32 tcp_time_now (void) { - return tcp_main.time_now[vlib_get_thread_index ()]; + return tcp_main.wrk_ctx[vlib_get_thread_index ()].time_now; } always_inline u32 tcp_set_time_now (u32 thread_index) { - tcp_main.time_now[thread_index] = clib_cpu_time_now () + tcp_main.wrk_ctx[thread_index].time_now = clib_cpu_time_now () * tcp_main.tstamp_ticks_per_clock; - return tcp_main.time_now[thread_index]; -} - -always_inline void -tcp_update_time (f64 now, u32 thread_index) -{ - tcp_set_time_now (thread_index); - tw_timer_expire_timers_16t_2w_512sl (&tcp_main.timer_wheels[thread_index], - now); - tcp_flush_frames_to_output (thread_index); + return tcp_main.wrk_ctx[thread_index].time_now; } -u32 tcp_push_header (transport_connection_t * tconn, vlib_buffer_t * b); - -u32 -tcp_prepare_retransmit_segment (tcp_connection_t * tc, u32 offset, - u32 max_bytes, vlib_buffer_t ** b); +u32 tcp_push_header (tcp_connection_t * tconn, vlib_buffer_t * b); void tcp_connection_timers_init (tcp_connection_t * tc); void tcp_connection_timers_reset (tcp_connection_t * tc); +void tcp_init_snd_vars (tcp_connection_t * tc); void tcp_connection_init_vars (tcp_connection_t * tc); always_inline void @@ -686,9 +705,11 @@ always_inline void tcp_timer_set (tcp_connection_t * tc, u8 timer_id, u32 interval) { ASSERT (tc->c_thread_index == vlib_get_thread_index ()); - tc->timers[timer_id] - = tw_timer_start_16t_2w_512sl (&tcp_main.timer_wheels[tc->c_thread_index], - tc->c_c_index, timer_id, interval); + ASSERT (tc->timers[timer_id] == TCP_TIMER_HANDLE_INVALID); + tc->timers[timer_id] = + tw_timer_start_16t_2w_512sl (&tcp_main. + wrk_ctx[tc->c_thread_index].timer_wheel, + tc->c_c_index, timer_id, interval); } always_inline void @@ -698,7 +719,8 @@ tcp_timer_reset (tcp_connection_t * tc, u8 timer_id) if (tc->timers[timer_id] == TCP_TIMER_HANDLE_INVALID) return; - tw_timer_stop_16t_2w_512sl (&tcp_main.timer_wheels[tc->c_thread_index], + tw_timer_stop_16t_2w_512sl (&tcp_main. + wrk_ctx[tc->c_thread_index].timer_wheel, tc->timers[timer_id]); tc->timers[timer_id] = TCP_TIMER_HANDLE_INVALID; } @@ -708,16 +730,20 @@ tcp_timer_update (tcp_connection_t * tc, u8 timer_id, u32 interval) { ASSERT (tc->c_thread_index == vlib_get_thread_index ()); if (tc->timers[timer_id] != TCP_TIMER_HANDLE_INVALID) - tw_timer_stop_16t_2w_512sl (&tcp_main.timer_wheels[tc->c_thread_index], - tc->timers[timer_id]); - tc->timers[timer_id] = - tw_timer_start_16t_2w_512sl (&tcp_main.timer_wheels[tc->c_thread_index], - tc->c_c_index, timer_id, interval); + tw_timer_update_16t_2w_512sl (&tcp_main. + wrk_ctx[tc->c_thread_index].timer_wheel, + tc->timers[timer_id], interval); + else + tc->timers[timer_id] = + tw_timer_start_16t_2w_512sl (&tcp_main. + wrk_ctx[tc->c_thread_index].timer_wheel, + tc->c_c_index, timer_id, interval); } always_inline void tcp_retransmit_timer_set (tcp_connection_t * tc) { + ASSERT (tc->snd_una != tc->snd_una_max); tcp_timer_set (tc, TCP_TIMER_RETRANSMIT, clib_max (tc->rto * TCP_TO_TIMER_TICK, 1)); } @@ -765,7 +791,7 @@ tcp_retransmit_timer_update (tcp_connection_t * tc) { tcp_retransmit_timer_reset (tc); if (tc->snd_wnd < tc->snd_mss) - tcp_persist_timer_set (tc); + tcp_persist_timer_update (tc); } else tcp_timer_update (tc, TCP_TIMER_RETRANSMIT, @@ -780,123 +806,15 @@ tcp_timer_is_active (tcp_connection_t * tc, tcp_timers_e timer) #define tcp_validate_txf_size(_tc, _a) \ ASSERT(_tc->state != TCP_STATE_ESTABLISHED \ - || stream_session_tx_fifo_max_dequeue (&_tc->connection) >= _a) - -void -scoreboard_remove_hole (sack_scoreboard_t * sb, - sack_scoreboard_hole_t * hole); -void scoreboard_update_lost (tcp_connection_t * tc, sack_scoreboard_t * sb); -sack_scoreboard_hole_t *scoreboard_insert_hole (sack_scoreboard_t * sb, - u32 prev_index, u32 start, - u32 end); -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); -void scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 seq); - -always_inline sack_scoreboard_hole_t * -scoreboard_get_hole (sack_scoreboard_t * sb, u32 index) -{ - if (index != TCP_INVALID_SACK_HOLE_INDEX) - return pool_elt_at_index (sb->holes, index); - return 0; -} - -always_inline sack_scoreboard_hole_t * -scoreboard_next_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) -{ - if (hole->next != TCP_INVALID_SACK_HOLE_INDEX) - return pool_elt_at_index (sb->holes, hole->next); - return 0; -} - -always_inline sack_scoreboard_hole_t * -scoreboard_prev_hole (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) -{ - if (hole->prev != TCP_INVALID_SACK_HOLE_INDEX) - return pool_elt_at_index (sb->holes, hole->prev); - return 0; -} - -always_inline sack_scoreboard_hole_t * -scoreboard_first_hole (sack_scoreboard_t * sb) -{ - if (sb->head != TCP_INVALID_SACK_HOLE_INDEX) - return pool_elt_at_index (sb->holes, sb->head); - return 0; -} - -always_inline sack_scoreboard_hole_t * -scoreboard_last_hole (sack_scoreboard_t * sb) -{ - if (sb->tail != TCP_INVALID_SACK_HOLE_INDEX) - return pool_elt_at_index (sb->holes, sb->tail); - return 0; -} - -always_inline void -scoreboard_clear (sack_scoreboard_t * sb) -{ - sack_scoreboard_hole_t *hole; - while ((hole = scoreboard_first_hole (sb))) - { - scoreboard_remove_hole (sb, hole); - } - ASSERT (sb->head == sb->tail && sb->head == TCP_INVALID_SACK_HOLE_INDEX); - ASSERT (pool_elts (sb->holes) == 0); - sb->sacked_bytes = 0; - sb->last_sacked_bytes = 0; - sb->last_bytes_delivered = 0; - sb->snd_una_adv = 0; - sb->high_sacked = 0; - sb->high_rxt = 0; - sb->lost_bytes = 0; - sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; -} - -always_inline u32 -scoreboard_hole_bytes (sack_scoreboard_hole_t * hole) -{ - return hole->end - hole->start; -} - -always_inline u32 -scoreboard_hole_index (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) -{ - ASSERT (!pool_is_free_index (sb->holes, hole - sb->holes)); - return hole - sb->holes; -} - -always_inline void -scoreboard_init (sack_scoreboard_t * sb) -{ - sb->head = TCP_INVALID_SACK_HOLE_INDEX; - sb->tail = TCP_INVALID_SACK_HOLE_INDEX; - sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; -} + || session_tx_fifo_max_dequeue (&_tc->connection) >= _a) void tcp_rcv_sacks (tcp_connection_t * tc, u32 ack); +u8 *tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose); -always_inline void -tcp_cc_algo_register (tcp_cc_algorithm_type_e type, - const tcp_cc_algorithm_t * vft) -{ - tcp_main_t *tm = vnet_get_tcp_main (); - vec_validate (tm->cc_algos, type); - - tm->cc_algos[type] = *vft; -} - -always_inline tcp_cc_algorithm_t * -tcp_cc_algo_get (tcp_cc_algorithm_type_e type) -{ - tcp_main_t *tm = vnet_get_tcp_main (); - return &tm->cc_algos[type]; -} +void tcp_cc_algo_register (tcp_cc_algorithm_type_e type, + const tcp_cc_algorithm_t * vft); -void tcp_cc_init (tcp_connection_t * tc); +tcp_cc_algorithm_t *tcp_cc_algo_get (tcp_cc_algorithm_type_e type); /** * Push TCP header to buffer