X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp.h;h=8fa9013e31ad2acbd646d93f51e3711788f1fb83;hb=70f879d2852dfc042ad0911a4a6e4a1714c0eb83;hp=81ce1d52bde5b951fd3c15012511b0c2ea0797d7;hpb=d206724e78d99aee5d91d43fb0832d51d70eb57a;p=vpp.git diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 81ce1d52bde..8fa9013e31a 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -31,6 +31,8 @@ #define TCP_FIB_RECHECK_PERIOD 1 * THZ /**< Recheck every 1s */ #define TCP_MAX_OPTION_SPACE 40 #define TCP_CC_DATA_SZ 24 +#define TCP_MAX_GSO_SZ 65536 +#define TCP_RXT_MAX_BURST 10 #define TCP_DUPACK_THRESHOLD 3 #define TCP_IW_N_SEGMENTS 10 @@ -80,13 +82,6 @@ typedef enum _tcp_timers TCP_N_TIMERS } tcp_timers_e; -typedef void (timer_expiration_handler) (u32 index); - -extern timer_expiration_handler tcp_timer_delack_handler; -extern timer_expiration_handler tcp_timer_retransmit_handler; -extern timer_expiration_handler tcp_timer_persist_handler; -extern timer_expiration_handler tcp_timer_retransmit_syn_handler; - #define TCP_TIMER_HANDLE_INVALID ((u32) ~0) #define TCP_TIMER_TICK 0.1 /**< Timer tick in seconds */ @@ -101,6 +96,30 @@ extern timer_expiration_handler tcp_timer_retransmit_syn_handler; #define TCP_RTO_BOFF_MAX 8 /* Max number of retries before reset */ #define TCP_ESTABLISH_TIME (60 * THZ) /* Connection establish timeout */ +/** Connection configuration flags */ +#define foreach_tcp_cfg_flag \ + _(RATE_SAMPLE, "Rate sampling") \ + _(NO_CSUM_OFFLOAD, "No csum offload") \ + _(NO_TSO, "TSO off") \ + _(TSO, "TSO") \ + _(NO_ENDPOINT,"No endpoint") \ + +typedef enum tcp_cfg_flag_bits_ +{ +#define _(sym, str) TCP_CFG_F_##sym##_BIT, + foreach_tcp_cfg_flag +#undef _ + TCP_CFG_N_FLAG_BITS +} tcp_cfg_flag_bits_e; + +typedef enum tcp_cfg_flag_ +{ +#define _(sym, str) TCP_CFG_F_##sym = 1 << TCP_CFG_F_##sym##_BIT, + foreach_tcp_cfg_flag +#undef _ + TCP_CFG_N_FLAGS +} tcp_cfg_flags_e; + /** TCP connection flags */ #define foreach_tcp_connection_flag \ _(SNDACK, "Send ACK") \ @@ -110,16 +129,14 @@ extern timer_expiration_handler tcp_timer_retransmit_syn_handler; _(DCNT_PENDING, "Disconnect pending") \ _(HALF_OPEN_DONE, "Half-open completed") \ _(FINPNDG, "FIN pending") \ - _(FRXT_PENDING, "Fast-retransmit pending") \ - _(FRXT_FIRST, "Fast-retransmit first again") \ - _(DEQ_PENDING, "Pending dequeue acked") \ + _(RXT_PENDING, "Retransmit pending") \ + _(FRXT_FIRST, "Retransmit first") \ + _(DEQ_PENDING, "Dequeue pending ") \ _(PSH_PENDING, "PSH pending") \ _(FINRCVD, "FIN received") \ - _(RATE_SAMPLE, "Conn does rate sampling") \ - _(TRACK_BURST, "Track burst") \ _(ZERO_RWND_SENT, "Zero RWND sent") \ -typedef enum _tcp_connection_flag_bits +typedef enum tcp_connection_flag_bits_ { #define _(sym, str) TCP_CONN_##sym##_BIT, foreach_tcp_connection_flag @@ -127,7 +144,7 @@ typedef enum _tcp_connection_flag_bits TCP_CONN_N_FLAG_BITS } tcp_connection_flag_bits_e; -typedef enum _tcp_connection_flag +typedef enum tcp_connection_flag_ { #define _(sym, str) TCP_CONN_##sym = 1 << TCP_CONN_##sym##_BIT, foreach_tcp_connection_flag @@ -165,13 +182,14 @@ typedef struct _sack_scoreboard u32 sacked_bytes; /**< Number of bytes sacked in sb */ u32 last_sacked_bytes; /**< Number of bytes last sacked */ u32 last_bytes_delivered; /**< Sack bytes delivered to app */ - u32 snd_una_adv; /**< Bytes to add to snd_una */ + u32 rxt_sacked; /**< Rxt bytes last delivered */ u32 high_sacked; /**< Highest byte sacked (fack) */ u32 high_rxt; /**< Highest retransmitted sequence */ u32 rescue_rxt; /**< Rescue sequence number */ u32 lost_bytes; /**< Bytes lost as per RFC6675 */ u32 last_lost_bytes; /**< Number of bytes last lost */ u32 cur_rxt_hole; /**< Retransmitting from this hole */ + u8 is_reneging; #if TCP_SCOREBOARD_TRACE scoreboard_trace_elt_t *trace; @@ -218,8 +236,11 @@ 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_clear_reneging (sack_scoreboard_t * sb, u32 start, u32 end); void scoreboard_init (sack_scoreboard_t * sb); +void scoreboard_init_rxt (sack_scoreboard_t * sb, u32 snd_una); u8 *format_tcp_scoreboard (u8 * s, va_list * args); #define TCP_BTS_INVALID_INDEX ((u32)~0) @@ -228,6 +249,8 @@ typedef enum tcp_bts_flags_ { TCP_BTS_IS_RXT = 1, TCP_BTS_IS_APP_LIMITED = 1 << 1, + TCP_BTS_IS_SACKED = 1 << 2, + TCP_BTS_IS_RXT_LOST = 1 << 3, } __clib_packed tcp_bts_flags_t; typedef struct tcp_bt_sample_ @@ -239,7 +262,7 @@ typedef struct tcp_bt_sample_ u64 delivered; /**< Total delivered bytes for sample */ f64 delivered_time; /**< Delivered time when sample taken */ f64 tx_time; /**< Transmit time for the burst */ - u64 tx_rate; /**< Tx pacing rate */ + f64 first_tx_time; /**< Connection first tx time at tx */ tcp_bts_flags_t flags; /**< Sample flag */ } tcp_bt_sample_t; @@ -250,7 +273,6 @@ typedef struct tcp_rate_sample_ f64 prior_time; /**< Delivered time of sample used for rate */ f64 interval_time; /**< Time to ack the bytes delivered */ f64 rtt_time; /**< RTT for sample */ - u64 tx_rate; /**< Tx pacing rate */ u32 delivered; /**< Bytes delivered in interval_time */ u32 acked_and_sacked; /**< Bytes acked + sacked now */ u32 lost; /**< Bytes lost now */ @@ -304,6 +326,7 @@ typedef struct _tcp_connection transport_connection_t connection; /**< Common transport data. First! */ u8 state; /**< TCP state as per tcp_state_t */ + u8 cfg_flags; /**< Connection configuration flags */ u16 flags; /**< Connection flags (see tcp_conn_flags_e) */ u32 timers[TCP_N_TIMERS]; /**< Timer handles into timer wheel */ @@ -359,8 +382,12 @@ typedef struct _tcp_connection u32 prev_cwnd; /**< ssthresh before congestion */ u32 bytes_acked; /**< Bytes acknowledged by current segment */ u32 burst_acked; /**< Bytes acknowledged in current burst */ - u32 snd_rxt_bytes; /**< Retransmitted bytes */ + u32 snd_rxt_bytes; /**< Retransmitted bytes during current cc event */ u32 snd_rxt_ts; /**< Timestamp when first packet is retransmitted */ + u32 prr_delivered; /**< RFC6937 bytes delivered during current event */ + u32 prr_start; /**< snd_una when prr starts */ + u32 rxt_delivered; /**< Rxt bytes delivered during current cc event */ + u32 rxt_head; /**< snd_una last time we re rxted the head */ u32 tsecr_last_ack; /**< Timestamp echoed to us in last healthy ACK */ u32 snd_congestion; /**< snd_una_max when congestion is detected */ u32 tx_fifo_size; /**< Tx fifo size. Used to constrain cwnd */ @@ -392,6 +419,7 @@ typedef struct _tcp_connection u64 delivered; /**< Total bytes delivered to peer */ u64 app_limited; /**< Delivered when app-limited detected */ f64 delivered_time; /**< Time last bytes were acked */ + f64 first_tx_time; /**< Send time for recently delivered/sent */ tcp_byte_tracker_t *bt; /**< Tx byte tracker */ tcp_errors_t errors; /**< Soft connection errors */ @@ -400,6 +428,9 @@ typedef struct _tcp_connection u32 last_fib_check; /**< Last time we checked fib route for peer */ u16 mss; /**< Our max seg size that includes options */ u32 timestamp_delta; /**< Offset for timestamp */ + u32 ipv6_flow_label; /**< flow label for ipv6 header */ + +#define rst_state snd_wl1 } tcp_connection_t; /* *INDENT-OFF* */ @@ -438,6 +469,15 @@ struct _tcp_cc_algorithm #define tcp_in_cong_recovery(tc) ((tc)->flags & \ (TCP_CONN_FAST_RECOVERY | TCP_CONN_RECOVERY)) +#define tcp_csum_offload(tc) (!((tc)->cfg_flags & TCP_CFG_F_NO_CSUM_OFFLOAD)) + +typedef void (timer_expiration_handler) (tcp_connection_t * tc); + +extern timer_expiration_handler tcp_timer_delack_handler; +extern timer_expiration_handler tcp_timer_retransmit_handler; +extern timer_expiration_handler tcp_timer_persist_handler; +extern timer_expiration_handler tcp_timer_retransmit_syn_handler; + always_inline void tcp_cong_recovery_off (tcp_connection_t * tc) { @@ -462,23 +502,38 @@ typedef struct _tcp_lookup_dispatch u8 next, error; } tcp_lookup_dispatch_t; +#define foreach_tcp_wrk_stat \ + _(timer_expirations, u64, "timer expirations") \ + _(rxt_segs, u64, "segments retransmitted") \ + _(tr_events, u32, "timer retransmit events") \ + _(to_closewait, u32, "timeout close-wait") \ + _(to_closewait2, u32, "timeout close-wait w/data") \ + _(to_finwait1, u32, "timeout fin-wait-1") \ + _(to_finwait2, u32, "timeout fin-wait-2") \ + _(to_lastack, u32, "timeout last-ack") \ + _(to_closing, u32, "timeout closing") \ + _(tr_abort, u32, "timer retransmit abort") \ + _(rst_unread, u32, "reset on close due to unread data") \ + +typedef struct tcp_wrk_stats_ +{ +#define _(name, type, str) type name; + foreach_tcp_wrk_stat +#undef _ +} tcp_wrk_stats_t; + +typedef struct tcp_free_req_ +{ + clib_time_type_t free_time; + u32 connection_index; +} tcp_cleanup_req_t; + typedef struct tcp_worker_ctx_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); - /** worker time */ - u32 time_now; - - /** worker timer wheel */ - tw_timer_wheel_16t_2w_512sl_t timer_wheel; - - /** tx buffer free list */ - u32 *tx_buffers; - - /** tx frames for tcp 4/6 output nodes */ - vlib_frame_t *tx_frames[2]; - /** tx frames for ip 4/6 lookup nodes */ - vlib_frame_t *ip_lookup_tx_frames[2]; + /** worker's pool of connections */ + tcp_connection_t *connections; /** vector of pending ack dequeues */ u32 *pending_deq_acked; @@ -486,16 +541,49 @@ typedef struct tcp_worker_ctx_ /** vector of pending disconnect notifications */ u32 *pending_disconnects; + /** vector of pending reset notifications */ + u32 *pending_resets; + /** convenience pointer to this thread's vlib main */ vlib_main_t *vm; + /** worker time */ + u32 time_now; + + /* Max timers to be handled per dispatch loop */ + u32 max_timers_per_loop; + + /** tx frames for ip 4/6 lookup nodes */ + vlib_frame_t *ip_lookup_tx_frames[2]; + CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); /** cached 'on the wire' options for bursts */ u8 cached_opts[40]; + /** tx buffer free list */ + u32 *tx_buffers; + + /* Fifo of pending timer expirations */ + u32 *pending_timers; + + /* fifo of pending free requests */ + tcp_cleanup_req_t *pending_cleanups; + + /** worker timer wheel */ + tw_timer_wheel_16t_2w_512sl_t timer_wheel; + + CLIB_CACHE_LINE_ALIGN_MARK (cacheline2); + + tcp_wrk_stats_t stats; } tcp_worker_ctx_t; +#define tcp_worker_stats_inc(_ti,_stat,_val) \ + tcp_main.wrk_ctx[_ti].stats._stat += _val + +#define tcp_workerp_stats_inc(_wrk,_stat,_val) \ + _wrk->stats._stat += _val + typedef struct tcp_iss_seed_ { u64 first; @@ -521,9 +609,19 @@ typedef struct tcp_configuration_ /** Enable tx pacing for new connections */ u8 enable_tx_pacing; + /** Allow use of TSO whenever available */ + u8 allow_tso; + + /** Set if csum offloading is enabled */ + u8 csum_offload; + /** Default congestion control algorithm type */ tcp_cc_algorithm_type_e cc_algo; + /** Min rwnd, as number of snd_mss segments, for update ack to be sent after + * a zero rwnd advertisement */ + u32 rwnd_min_update_ack; + /** Delayed ack time (disabled) */ u16 delack_time; @@ -545,8 +643,8 @@ typedef struct tcp_configuration_ /** Timer ticks to wait in closing for fin ack */ u16 closing_time; - /** Timer ticks to wait before cleaning up the connection */ - u16 cleanup_time; + /** Time to wait (sec) before cleaning up the connection */ + f32 cleanup_time; /** Number of preallocated connections */ u32 preallocated_connections; @@ -564,27 +662,24 @@ typedef struct tcp_configuration_ typedef struct _tcp_main { - /* Per-worker thread tcp connection pools */ - tcp_connection_t **connections; + /** per-worker context */ + tcp_worker_ctx_t *wrk_ctx; /* Pool of listeners. */ tcp_connection_t *listener_pool; + f64 tstamp_ticks_per_clock; + + /** vlib buffer size */ + u32 bytes_per_buffer; + /** Dispatch table by state and flags */ tcp_lookup_dispatch_t dispatch_table[TCP_N_STATES][64]; - u8 log2_tstamp_clocks_per_tick; - f64 tstamp_ticks_per_clock; - - /** per-worker context */ - tcp_worker_ctx_t *wrk_ctx; + clib_spinlock_t half_open_lock; /** Pool of half-open connections on which we've sent a SYN */ tcp_connection_t *half_open_connections; - clib_spinlock_t half_open_lock; - - /** vlib buffer size */ - u32 bytes_per_buffer; /** Seed used to generate random iss */ tcp_iss_seed_t iss_seed; @@ -644,6 +739,7 @@ vnet_get_tcp_main () always_inline tcp_worker_ctx_t * tcp_get_worker (u32 thread_index) { + ASSERT (thread_index < vec_len (tcp_main.wrk_ctx)); return &tcp_main.wrk_ctx[thread_index]; } @@ -671,20 +767,22 @@ 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) { - if (PREDICT_FALSE - (pool_is_free_index (tcp_main.connections[thread_index], conn_index))) + tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); + if (PREDICT_FALSE (pool_is_free_index (wrk->connections, conn_index))) return 0; - return pool_elt_at_index (tcp_main.connections[thread_index], conn_index); + return pool_elt_at_index (wrk->connections, conn_index); } always_inline tcp_connection_t * tcp_connection_get_if_valid (u32 conn_index, u32 thread_index) { - if (tcp_main.connections[thread_index] == 0) + tcp_worker_ctx_t *wrk; + if (thread_index >= vec_len (tcp_main.wrk_ctx)) return 0; - if (pool_is_free_index (tcp_main.connections[thread_index], conn_index)) + wrk = tcp_get_worker (thread_index); + if (pool_is_free_index (wrk->connections, conn_index)) return 0; - return pool_elt_at_index (tcp_main.connections[thread_index], conn_index); + return pool_elt_at_index (wrk->connections, conn_index); } always_inline tcp_connection_t * @@ -697,7 +795,7 @@ always_inline void tcp_connection_set_state (tcp_connection_t * tc, tcp_state_t state) { tc->state = state; - TCP_EVT_DBG (TCP_EVT_STATE_CHANGE, tc); + TCP_EVT (TCP_EVT_STATE_CHANGE, tc); } void tcp_connection_close (tcp_connection_t * tc); @@ -705,8 +803,9 @@ void tcp_connection_cleanup (tcp_connection_t * tc); void tcp_connection_del (tcp_connection_t * tc); int tcp_half_open_connection_cleanup (tcp_connection_t * tc); tcp_connection_t *tcp_connection_alloc (u8 thread_index); +tcp_connection_t *tcp_connection_alloc_w_base (u8 thread_index, + tcp_connection_t * base); void tcp_connection_free (tcp_connection_t * tc); -void tcp_connection_reset (tcp_connection_t * tc); int tcp_configure_v4_source_address_range (vlib_main_t * vm, ip4_address_t * start, ip4_address_t * end, u32 table_id); @@ -715,11 +814,15 @@ int tcp_configure_v6_source_address_range (vlib_main_t * vm, ip6_address_t * end, u32 table_id); void tcp_api_reference (void); u8 *format_tcp_connection (u8 * s, va_list * args); +u8 *format_tcp_connection_id (u8 * s, va_list * args); always_inline tcp_connection_t * tcp_listener_get (u32 tli) { - return pool_elt_at_index (tcp_main.listener_pool, tli); + tcp_connection_t *tc = 0; + if (!pool_is_free_index (tcp_main.listener_pool, tli)) + tc = pool_elt_at_index (tcp_main.listener_pool, tli); + return tc; } always_inline tcp_connection_t * @@ -741,16 +844,14 @@ void tcp_send_reset (tcp_connection_t * tc); void tcp_send_syn (tcp_connection_t * tc); void tcp_send_synack (tcp_connection_t * tc); void tcp_send_fin (tcp_connection_t * tc); -void tcp_init_mss (tcp_connection_t * tc); +void tcp_send_ack (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 (tcp_worker_ctx_t * wrk, u8 is_ip4); -void tcp_flush_frames_to_output (tcp_worker_ctx_t * wrk); void tcp_send_window_update_ack (tcp_connection_t * tc); void tcp_program_ack (tcp_connection_t * tc); void tcp_program_dupack (tcp_connection_t * tc); -void tcp_program_fastretransmit (tcp_connection_t * tc); +void tcp_program_retransmit (tcp_connection_t * tc); /* * Rate estimation @@ -780,7 +881,7 @@ void tcp_bt_flush_samples (tcp_connection_t * tc); * * @param tc tcp connection */ -void tcp_bt_track_tx (tcp_connection_t * tc); +void tcp_bt_track_tx (tcp_connection_t * tc, u32 len); /** * Track a tcp retransmission * @@ -811,6 +912,7 @@ void tcp_bt_check_app_limited (tcp_connection_t * tc); * @param bt byte tracker */ int tcp_bt_is_sane (tcp_byte_tracker_t * bt); +u8 *format_tcp_bt (u8 * s, va_list * args); always_inline u32 tcp_end_seq (tcp_header_t * th, u32 len) @@ -838,7 +940,8 @@ tcp_bytes_out (const tcp_connection_t * tc) if (tcp_opts_sack_permitted (&tc->rcv_opts)) return tc->sack_sb.sacked_bytes + tc->sack_sb.lost_bytes; else - return tc->rcv_dupacks * tc->snd_mss; + return clib_min (tc->rcv_dupacks * tc->snd_mss, + tc->snd_nxt - tc->snd_una); } /** @@ -850,18 +953,9 @@ tcp_flight_size (const tcp_connection_t * tc) int flight_size; flight_size = (int) (tc->snd_nxt - tc->snd_una) - tcp_bytes_out (tc) - + tc->snd_rxt_bytes; + + tc->snd_rxt_bytes - tc->rxt_delivered; - if (flight_size < 0) - { - if (0) - clib_warning - ("Negative: %u %u %u dupacks %u sacked bytes %u flags %d", - tc->snd_una_max - tc->snd_una, tcp_bytes_out (tc), - tc->snd_rxt_bytes, tc->rcv_dupacks, tc->sack_sb.sacked_bytes, - tc->rcv_opts.flags); - return 0; - } + ASSERT (flight_size >= 0); return flight_size; } @@ -905,7 +999,8 @@ tcp_cwnd_accumulate (tcp_connection_t * tc, u32 thresh, u32 bytes) always_inline u32 tcp_loss_wnd (const tcp_connection_t * tc) { - return tc->snd_mss; + /* Whatever we have in flight + the packet we're about to send */ + return tcp_flight_size (tc) + tc->snd_mss; } always_inline u32 @@ -944,22 +1039,13 @@ tcp_available_cc_snd_space (const tcp_connection_t * tc) always_inline u8 tcp_is_lost_fin (tcp_connection_t * tc) { - if ((tc->flags & TCP_CONN_FINSNT) && tc->snd_una_max - tc->snd_una == 1) + if ((tc->flags & TCP_CONN_FINSNT) && (tc->snd_una_max - tc->snd_una == 1)) return 1; return 0; } u32 tcp_snd_space (tcp_connection_t * tc); -int tcp_retransmit_first_unacked (tcp_worker_ctx_t * wrk, - tcp_connection_t * tc); -int tcp_fast_retransmit_no_sack (tcp_worker_ctx_t * wrk, - tcp_connection_t * tc, u32 burst_size); -int tcp_fast_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, - u32 burst_size); -int tcp_fast_retransmit (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, - u32 burst_size); -void tcp_cc_init_congestion (tcp_connection_t * tc); -void tcp_cc_fastrecovery_clear (tcp_connection_t * tc); +int tcp_fastrecovery_prr_snd_space (tcp_connection_t * tc); fib_node_index_t tcp_lookup_rmt_in_fib (tcp_connection_t * tc); @@ -1013,6 +1099,7 @@ void tcp_connection_init_vars (tcp_connection_t * tc); void tcp_connection_tx_pacer_update (tcp_connection_t * tc); void tcp_connection_tx_pacer_reset (tcp_connection_t * tc, u32 window, u32 start_bucket); +void tcp_program_cleanup (tcp_worker_ctx_t * wrk, tcp_connection_t * tc); always_inline void tcp_cc_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs) @@ -1028,6 +1115,12 @@ tcp_cc_rcv_cong_ack (tcp_connection_t * tc, tcp_cc_ack_t ack_type, tc->cc_algo->rcv_cong_ack (tc, ack_type, rs); } +static inline void +tcp_cc_congestion (tcp_connection_t * tc) +{ + tc->cc_algo->congestion (tc); +} + static inline void tcp_cc_loss (tcp_connection_t * tc) { @@ -1061,9 +1154,10 @@ tcp_cc_get_pacing_rate (tcp_connection_t * tc) return tc->cc_algo->get_pacing_rate (tc); f64 srtt = clib_min ((f64) tc->srtt * TCP_TICK, tc->mrtt_us); + /* TODO should constrain to interface's max throughput but * we don't have link speeds for sw ifs ..*/ - return (tc->cwnd / srtt); + return ((f64) tc->cwnd / srtt); } always_inline void @@ -1137,13 +1231,21 @@ tcp_persist_timer_set (tcp_connection_t * tc) always_inline void tcp_persist_timer_update (tcp_connection_t * tc) { - tcp_timer_update (tc, TCP_TIMER_PERSIST, - clib_max (tc->rto * TCP_TO_TIMER_TICK, 1)); + u32 interval; + + if (seq_leq (tc->snd_una, tc->snd_congestion + tc->burst_acked)) + interval = 1; + else + interval = clib_max (tc->rto * TCP_TO_TIMER_TICK, 1); + + tcp_timer_update (tc, TCP_TIMER_PERSIST, interval); } always_inline void tcp_persist_timer_reset (tcp_connection_t * tc) { + if (transport_connection_is_descheduled (&tc->connection)) + transport_connection_reschedule (&tc->connection); tcp_timer_reset (tc, TCP_TIMER_PERSIST); } @@ -1228,6 +1330,8 @@ vlib_buffer_push_tcp_net_order (vlib_buffer_t * b, u16 sp, u16 dp, u32 seq, th->window = wnd; th->checksum = 0; th->urgent_pointer = 0; + vnet_buffer (b)->l4_hdr_offset = (u8 *) th - b->data; + b->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID; return th; }