X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=16f4f02cbe30dc0acddb3dc6dc9498f73dc94dfe;hb=6080e0d15e152e38811b01306eef6719a682c007;hp=9efe0e1730792c6593f90efe7af832b25d329b48;hpb=cdb7170ab44affe51c574eb2218744fff1bdd369;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 9efe0e17307..16f4f02cbe3 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -42,35 +42,20 @@ static transport_endpoint_t *local_endpoints; */ static clib_spinlock_t local_endpoints_lock; -/* - * Period used by transport pacers. Initialized by session layer - */ -static double transport_pacer_period; - -#define TRANSPORT_PACER_MIN_MSS 1460 -#define TRANSPORT_PACER_MIN_BURST TRANSPORT_PACER_MIN_MSS -#define TRANSPORT_PACER_MAX_BURST (32 * TRANSPORT_PACER_MIN_MSS) - u8 * format_transport_proto (u8 * s, va_list * args) { u32 transport_proto = va_arg (*args, u32); switch (transport_proto) { - case TRANSPORT_PROTO_TCP: - s = format (s, "TCP"); +#define _(sym, str, sstr) \ + case TRANSPORT_PROTO_ ## sym: \ + s = format (s, str); \ break; - case TRANSPORT_PROTO_UDP: - s = format (s, "UDP"); - break; - case TRANSPORT_PROTO_SCTP: - s = format (s, "SCTP"); - break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "UDPC"); - break; - case TRANSPORT_PROTO_QUIC: - s = format (s, "QUIC"); + foreach_transport_proto +#undef _ + default: + s = format (s, "UNKNOWN"); break; } return s; @@ -82,20 +67,14 @@ format_transport_proto_short (u8 * s, va_list * args) u32 transport_proto = va_arg (*args, u32); switch (transport_proto) { - case TRANSPORT_PROTO_TCP: - s = format (s, "T"); - break; - case TRANSPORT_PROTO_UDP: - s = format (s, "U"); +#define _(sym, str, sstr) \ + case TRANSPORT_PROTO_ ## sym: \ + s = format (s, sstr); \ break; - case TRANSPORT_PROTO_SCTP: - s = format (s, "S"); - break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "U"); - break; - case TRANSPORT_PROTO_QUIC: - s = format (s, "Q"); + foreach_transport_proto +#undef _ + default: + s = format (s, "?"); break; } return s; @@ -123,7 +102,9 @@ format_transport_connection (u8 * s, va_list * args) { indent = format_get_indent (s) + 1; s = format (s, "%Upacer: %U\n", format_white_space, indent, - format_transport_pacer, &tc->pacer); + format_transport_pacer, &tc->pacer, tc->thread_index); + s = format (s, "%Utransport: flags 0x%x\n", format_white_space, indent, + tc->flags); } return s; } @@ -157,37 +138,49 @@ format_transport_half_open_connection (u8 * s, va_list * args) return s; } +static u8 +unformat_transport_str_match (unformat_input_t * input, const char *str) +{ + int i; + + if (strlen (str) > vec_len (input->buffer) - input->index) + return 0; + + for (i = 0; i < strlen (str); i++) + { + if (input->buffer[i + input->index] != str[i]) + return 0; + } + return 1; +} + uword unformat_transport_proto (unformat_input_t * input, va_list * args) { u32 *proto = va_arg (*args, u32 *); - if (unformat (input, "tcp")) - *proto = TRANSPORT_PROTO_TCP; - else if (unformat (input, "TCP")) - *proto = TRANSPORT_PROTO_TCP; - else if (unformat (input, "udpc")) - *proto = TRANSPORT_PROTO_UDPC; - else if (unformat (input, "UDPC")) - *proto = TRANSPORT_PROTO_UDPC; - else if (unformat (input, "udp")) - *proto = TRANSPORT_PROTO_UDP; - else if (unformat (input, "UDP")) - *proto = TRANSPORT_PROTO_UDP; - else if (unformat (input, "sctp")) - *proto = TRANSPORT_PROTO_SCTP; - else if (unformat (input, "SCTP")) - *proto = TRANSPORT_PROTO_SCTP; - else if (unformat (input, "tls")) - *proto = TRANSPORT_PROTO_TLS; - else if (unformat (input, "TLS")) - *proto = TRANSPORT_PROTO_TLS; - else if (unformat (input, "quic")) - *proto = TRANSPORT_PROTO_QUIC; - else if (unformat (input, "QUIC")) - *proto = TRANSPORT_PROTO_QUIC; - else - return 0; - return 1; + u8 longest_match = 0, match; + char *str_match = 0; + +#define _(sym, str, sstr) \ + if (unformat_transport_str_match (input, str)) \ + { \ + match = strlen (str); \ + if (match > longest_match) \ + { \ + *proto = TRANSPORT_PROTO_ ## sym; \ + longest_match = match; \ + str_match = str; \ + } \ + } + foreach_transport_proto +#undef _ + if (longest_match) + { + unformat (input, str_match); + return 1; + } + + return 0; } u32 @@ -270,16 +263,22 @@ transport_protocol_get_vft (transport_proto_t transport_proto) return &tp_vfts[transport_proto]; } +u8 +transport_half_open_has_fifos (transport_proto_t tp) +{ + return tp_vfts[tp].transport_options.half_open_has_fifos; +} + transport_service_type_t transport_protocol_service_type (transport_proto_t tp) { - return tp_vfts[tp].service_type; + return tp_vfts[tp].transport_options.service_type; } transport_tx_fn_type_t transport_protocol_tx_fn_type (transport_proto_t tp) { - return tp_vfts[tp].tx_type; + return tp_vfts[tp].transport_options.tx_type; } void @@ -300,6 +299,15 @@ transport_close (transport_proto_t tp, u32 conn_index, u8 thread_index) tp_vfts[tp].close (conn_index, thread_index); } +void +transport_reset (transport_proto_t tp, u32 conn_index, u8 thread_index) +{ + if (tp_vfts[tp].reset) + tp_vfts[tp].reset (conn_index, thread_index); + else + tp_vfts[tp].close (conn_index, thread_index); +} + u32 transport_start_listen (transport_proto_t tp, u32 session_index, transport_endpoint_t * tep) @@ -316,57 +324,54 @@ transport_stop_listen (transport_proto_t tp, u32 conn_index) u8 transport_protocol_is_cl (transport_proto_t tp) { - return (tp_vfts[tp].service_type == TRANSPORT_SERVICE_CL); + return (tp_vfts[tp].transport_options.service_type == TRANSPORT_SERVICE_CL); } always_inline void default_get_transport_endpoint (transport_connection_t * tc, - ip46_address_t * ip, u16 * port, u8 * is_ip4, - u8 is_lcl) + transport_endpoint_t * tep, u8 is_lcl) { if (is_lcl) { - *port = tc->lcl_port; - *is_ip4 = tc->is_ip4; - clib_memcpy_fast (ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); + tep->port = tc->lcl_port; + tep->is_ip4 = tc->is_ip4; + clib_memcpy_fast (&tep->ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); } else { - *port = tc->rmt_port; - *is_ip4 = tc->is_ip4; - clib_memcpy_fast (ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); + tep->port = tc->rmt_port; + tep->is_ip4 = tc->is_ip4; + clib_memcpy_fast (&tep->ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); } } void transport_get_endpoint (transport_proto_t tp, u32 conn_index, - u32 thread_index, ip46_address_t * ip, u16 * port, - u8 * is_ip4, u8 is_lcl) + u32 thread_index, transport_endpoint_t * tep, + u8 is_lcl) { if (tp_vfts[tp].get_transport_endpoint) - tp_vfts[tp].get_transport_endpoint (conn_index, thread_index, ip, port, - is_ip4, is_lcl); + tp_vfts[tp].get_transport_endpoint (conn_index, thread_index, tep, + is_lcl); else { transport_connection_t *tc; tc = transport_get_connection (tp, conn_index, thread_index); - default_get_transport_endpoint (tc, ip, port, is_ip4, is_lcl); + default_get_transport_endpoint (tc, tep, is_lcl); } } void transport_get_listener_endpoint (transport_proto_t tp, u32 conn_index, - ip46_address_t * ip, u16 * port, u8 * is_ip4, - u8 is_lcl) + transport_endpoint_t * tep, u8 is_lcl) { if (tp_vfts[tp].get_transport_listener_endpoint) - tp_vfts[tp].get_transport_listener_endpoint (conn_index, ip, port, is_ip4, - is_lcl); + tp_vfts[tp].get_transport_listener_endpoint (conn_index, tep, is_lcl); else { transport_connection_t *tc; tc = transport_get_listener (tp, conn_index); - default_get_transport_endpoint (tc, ip, port, is_ip4, is_lcl); + default_get_transport_endpoint (tc, tep, is_lcl); } } @@ -576,30 +581,49 @@ transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg, return 0; } -#define SPACER_CPU_TICKS_PER_PERIOD_SHIFT 10 -#define SPACER_CPU_TICKS_PER_PERIOD (1 << SPACER_CPU_TICKS_PER_PERIOD_SHIFT) +u8 * +format_clib_us_time (u8 * s, va_list * args) +{ + clib_us_time_t t = va_arg (*args, clib_us_time_t); + if (t < 1e3) + s = format (s, "%u us", t); + else + s = format (s, "%.3f s", (f64) t * CLIB_US_TIME_PERIOD); + return s; +} u8 * format_transport_pacer (u8 * s, va_list * args) { spacer_t *pacer = va_arg (*args, spacer_t *); - - s = format (s, "bucket %u max_burst %u tokens/period %.3f last_update %x", - pacer->bucket, pacer->max_burst_size, pacer->tokens_per_period, - pacer->last_update); + u32 thread_index = va_arg (*args, int); + clib_us_time_t now, diff; + + now = transport_us_time_now (thread_index); + diff = now - pacer->last_update; + s = format (s, "rate %lu bucket %lu t/p %.3f last_update %U idle %u", + pacer->bytes_per_sec, pacer->bucket, pacer->tokens_per_period, + format_clib_us_time, diff, pacer->idle_timeout_us); return s; } static inline u32 -spacer_max_burst (spacer_t * pacer, u64 norm_time_now) +spacer_max_burst (spacer_t * pacer, clib_us_time_t time_now) { - u64 n_periods = norm_time_now - pacer->last_update; + u64 n_periods = (time_now - pacer->last_update); u64 inc; - if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10) + if (PREDICT_FALSE (n_periods > pacer->idle_timeout_us)) + { + pacer->last_update = time_now; + pacer->bucket = TRANSPORT_PACER_MIN_BURST; + return TRANSPORT_PACER_MIN_BURST; + } + + if ((inc = (f32) n_periods * pacer->tokens_per_period) > 10) { - pacer->last_update = norm_time_now; - pacer->bucket += inc; + pacer->last_update = time_now; + pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec); } return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); @@ -613,72 +637,79 @@ spacer_update_bucket (spacer_t * pacer, u32 bytes) } static inline void -spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) +spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec, + clib_us_time_t rtt) { ASSERT (rate_bytes_per_sec != 0); - pacer->tokens_per_period = rate_bytes_per_sec / transport_pacer_period; + pacer->bytes_per_sec = rate_bytes_per_sec; + pacer->tokens_per_period = rate_bytes_per_sec * CLIB_US_TIME_PERIOD; + pacer->idle_timeout_us = clib_max (rtt * TRANSPORT_PACER_IDLE_FACTOR, + TRANSPORT_PACER_MIN_IDLE); +} + +static inline u64 +spacer_pace_rate (spacer_t * pacer) +{ + return pacer->bytes_per_sec; +} + +static inline void +spacer_reset (spacer_t * pacer, clib_us_time_t time_now, u64 bucket) +{ + pacer->last_update = time_now; + pacer->bucket = bucket; } void transport_connection_tx_pacer_reset (transport_connection_t * tc, - u32 rate_bytes_per_sec, - u32 start_bucket, u64 time_now) + u64 rate_bytes_per_sec, u32 start_bucket, + clib_us_time_t rtt) +{ + spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec, rtt); + spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index), + start_bucket); +} + +void +transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc, + u32 bucket) { - spacer_t *pacer = &tc->pacer; - spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec); - pacer->last_update = time_now >> SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - pacer->bucket = start_bucket; + spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index), bucket); } void transport_connection_tx_pacer_init (transport_connection_t * tc, - u32 rate_bytes_per_sec, + u64 rate_bytes_per_sec, u32 initial_bucket) { - vlib_main_t *vm = vlib_get_main (); tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED; transport_connection_tx_pacer_reset (tc, rate_bytes_per_sec, - initial_bucket, - vm->clib_time.last_cpu_time); + initial_bucket, 1e6); } void transport_connection_tx_pacer_update (transport_connection_t * tc, - u64 bytes_per_sec) + u64 bytes_per_sec, clib_us_time_t rtt) { - spacer_set_pace_rate (&tc->pacer, bytes_per_sec); + spacer_set_pace_rate (&tc->pacer, bytes_per_sec, rtt); } u32 -transport_connection_tx_pacer_burst (transport_connection_t * tc, - u64 time_now) +transport_connection_tx_pacer_burst (transport_connection_t * tc) { - time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - return spacer_max_burst (&tc->pacer, time_now); + return spacer_max_burst (&tc->pacer, + transport_us_time_now (tc->thread_index)); } -u32 -transport_connection_snd_space (transport_connection_t * tc, u64 time_now, - u16 mss) +u64 +transport_connection_tx_pacer_rate (transport_connection_t * tc) { - u32 snd_space, max_paced_burst; - - snd_space = tp_vfts[tc->proto].send_space (tc); - if (transport_connection_is_tx_paced (tc)) - { - time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - max_paced_burst = spacer_max_burst (&tc->pacer, time_now); - max_paced_burst = (max_paced_burst < mss) ? 0 : max_paced_burst; - snd_space = clib_min (snd_space, max_paced_burst); - snd_space = snd_space - snd_space % mss; - } - return snd_space; + return spacer_pace_rate (&tc->pacer); } void -transport_connection_update_tx_stats (transport_connection_t * tc, u32 bytes) +transport_connection_update_tx_bytes (transport_connection_t * tc, u32 bytes) { - tc->stats.tx_bytes += bytes; if (transport_connection_is_tx_paced (tc)) spacer_update_bucket (&tc->pacer, bytes); } @@ -691,14 +722,24 @@ transport_connection_tx_pacer_update_bytes (transport_connection_t * tc, } void -transport_init_tx_pacers_period (void) +transport_connection_reschedule (transport_connection_t * tc) { - f64 cpu_freq = os_cpu_clock_frequency (); - transport_pacer_period = cpu_freq / SPACER_CPU_TICKS_PER_PERIOD; + tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED; + transport_connection_tx_pacer_reset_bucket (tc, TRANSPORT_PACER_MIN_BURST); + if (transport_max_tx_dequeue (tc)) + sesssion_reschedule_tx (tc); + else + { + session_t *s = session_get (tc->s_index, tc->thread_index); + svm_fifo_unset_event (s->tx_fifo); + if (svm_fifo_max_dequeue_cons (s->tx_fifo)) + if (svm_fifo_set_event (s->tx_fifo)) + sesssion_reschedule_tx (tc); + } } void -transport_update_time (f64 time_now, u8 thread_index) +transport_update_time (clib_time_type_t time_now, u8 thread_index) { transport_proto_vft_t *vft; vec_foreach (vft, tp_vfts)