X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=8f7e30c86025a5f30c4be27aae565dc348de263f;hb=ea5cd12d26047c36be5969c2c88147d26f788103;hp=22a356eaae2c9d8650c81af6776dcdbe5311d594;hpb=0048223baad2b58a4e91aaeb2d05886499bbe004;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 22a356eaae2..8f7e30c8602 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -47,37 +47,18 @@ static clib_spinlock_t local_endpoints_lock; */ 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"); - break; - case TRANSPORT_PROTO_UDP: - s = format (s, "UDP"); - break; - case TRANSPORT_PROTO_SCTP: - s = format (s, "SCTP"); - break; - case TRANSPORT_PROTO_NONE: - s = format (s, "NONE"); - break; - case TRANSPORT_PROTO_TLS: - s = format (s, "TLS"); - break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "UDPC"); - break; - case TRANSPORT_PROTO_QUIC: - s = format (s, "QUIC"); +#define _(sym, str, sstr) \ + case TRANSPORT_PROTO_ ## sym: \ + s = format (s, str); \ break; + foreach_transport_proto +#undef _ default: s = format (s, "UNKNOWN"); break; @@ -91,27 +72,12 @@ 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"); - break; - case TRANSPORT_PROTO_SCTP: - s = format (s, "S"); - break; - case TRANSPORT_PROTO_NONE: - s = format (s, "N"); - break; - case TRANSPORT_PROTO_TLS: - s = format (s, "J"); - break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "U"); - break; - case TRANSPORT_PROTO_QUIC: - s = format (s, "Q"); +#define _(sym, str, sstr) \ + case TRANSPORT_PROTO_ ## sym: \ + s = format (s, sstr); \ break; + foreach_transport_proto +#undef _ default: s = format (s, "?"); break; @@ -179,33 +145,16 @@ 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 + +#define _(sym, str, sstr) \ + if (unformat (input, str)) \ + { \ + *proto = TRANSPORT_PROTO_ ## sym; \ + return 1; \ + } + foreach_transport_proto +#undef _ return 0; - return 1; } u32 @@ -324,6 +273,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) @@ -604,9 +562,14 @@ u8 * format_transport_pacer (u8 * s, va_list * args) { spacer_t *pacer = va_arg (*args, spacer_t *); + vlib_main_t *vm = vlib_get_main (); + u64 now, diff; - s = format (s, "bucket %u tokens/period %.3f last_update %x", - pacer->bucket, pacer->tokens_per_period, pacer->last_update); + now = vm->clib_time.last_cpu_time; + diff = now - (pacer->last_update << SPACER_CPU_TICKS_PER_PERIOD_SHIFT); + s = format (s, "rate %u bucket %u t/p %.3f last_update %.3f", + pacer->bytes_per_sec, pacer->bucket, pacer->tokens_per_period, + diff * vm->clib_time.seconds_per_clock); return s; } @@ -616,10 +579,18 @@ spacer_max_burst (spacer_t * pacer, u64 norm_time_now) u64 n_periods = norm_time_now - pacer->last_update; u64 inc; - if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10) + if (PREDICT_FALSE (n_periods > 5e5)) { pacer->last_update = norm_time_now; - pacer->bucket += inc; + pacer->bucket = TRANSPORT_PACER_MIN_BURST; + return TRANSPORT_PACER_MIN_BURST; + } + + if (n_periods > 0 + && (inc = (f32) n_periods * pacer->tokens_per_period) > 10) + { + pacer->last_update = norm_time_now; + pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec); } return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); @@ -636,13 +607,21 @@ static inline void spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) { ASSERT (rate_bytes_per_sec != 0); + pacer->bytes_per_sec = rate_bytes_per_sec; pacer->tokens_per_period = rate_bytes_per_sec / transport_pacer_period; } static inline u64 spacer_pace_rate (spacer_t * pacer) { - return pacer->tokens_per_period * transport_pacer_period; + return pacer->bytes_per_sec; +} + +static inline void +spacer_reset_bucket (spacer_t * pacer, u64 norm_time_now) +{ + pacer->last_update = norm_time_now; + pacer->bucket = 0; } void @@ -683,6 +662,14 @@ transport_connection_tx_pacer_burst (transport_connection_t * tc, return spacer_max_burst (&tc->pacer, time_now); } +void +transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc, + u64 time_now) +{ + time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; + spacer_reset_bucket (&tc->pacer, time_now); +} + u32 transport_connection_snd_space (transport_connection_t * tc, u64 time_now, u16 mss) @@ -690,13 +677,14 @@ transport_connection_snd_space (transport_connection_t * tc, u64 time_now, u32 snd_space, max_paced_burst; snd_space = tp_vfts[tc->proto].send_space (tc); - if (transport_connection_is_tx_paced (tc)) + if (snd_space && 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; + max_paced_burst = + (max_paced_burst < TRANSPORT_PACER_MIN_BURST) ? 0 : max_paced_burst; snd_space = clib_min (snd_space, max_paced_burst); - snd_space = snd_space - snd_space % mss; + return snd_space >= mss ? snd_space - snd_space % mss : snd_space; } return snd_space; }