X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=9efe0e1730792c6593f90efe7af832b25d329b48;hb=cdb7170ab44affe51c574eb2218744fff1bdd369;hp=0f86f9e916a9157a9ec8c181418406757c3ae2c8;hpb=288eaab5964b9211350acad8d742fae4789577fe;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 0f86f9e916a..9efe0e17307 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include #include @@ -49,6 +49,7 @@ 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) @@ -68,6 +69,9 @@ format_transport_proto (u8 * s, va_list * args) case TRANSPORT_PROTO_UDPC: s = format (s, "UDPC"); break; + case TRANSPORT_PROTO_QUIC: + s = format (s, "QUIC"); + break; } return s; } @@ -90,6 +94,9 @@ format_transport_proto_short (u8 * s, va_list * args) case TRANSPORT_PROTO_UDPC: s = format (s, "U"); break; + case TRANSPORT_PROTO_QUIC: + s = format (s, "Q"); + break; } return s; } @@ -158,6 +165,10 @@ unformat_transport_proto (unformat_input_t * input, va_list * args) *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")) @@ -170,10 +181,10 @@ unformat_transport_proto (unformat_input_t * input, va_list * args) *proto = TRANSPORT_PROTO_TLS; else if (unformat (input, "TLS")) *proto = TRANSPORT_PROTO_TLS; - else if (unformat (input, "udpc")) - *proto = TRANSPORT_PROTO_UDPC; - else if (unformat (input, "UDPC")) - *proto = TRANSPORT_PROTO_UDPC; + else if (unformat (input, "quic")) + *proto = TRANSPORT_PROTO_QUIC; + else if (unformat (input, "QUIC")) + *proto = TRANSPORT_PROTO_QUIC; else return 0; return 1; @@ -271,12 +282,94 @@ transport_protocol_tx_fn_type (transport_proto_t tp) return tp_vfts[tp].tx_type; } +void +transport_cleanup (transport_proto_t tp, u32 conn_index, u8 thread_index) +{ + tp_vfts[tp].cleanup (conn_index, thread_index); +} + +int +transport_connect (transport_proto_t tp, transport_endpoint_cfg_t * tep) +{ + return tp_vfts[tp].connect (tep); +} + +void +transport_close (transport_proto_t tp, u32 conn_index, u8 thread_index) +{ + tp_vfts[tp].close (conn_index, thread_index); +} + +u32 +transport_start_listen (transport_proto_t tp, u32 session_index, + transport_endpoint_t * tep) +{ + return tp_vfts[tp].start_listen (session_index, tep); +} + +u32 +transport_stop_listen (transport_proto_t tp, u32 conn_index) +{ + return tp_vfts[tp].stop_listen (conn_index); +} + u8 transport_protocol_is_cl (transport_proto_t tp) { return (tp_vfts[tp].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) +{ + if (is_lcl) + { + *port = tc->lcl_port; + *is_ip4 = tc->is_ip4; + clib_memcpy_fast (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)); + } +} + +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) +{ + if (tp_vfts[tp].get_transport_endpoint) + tp_vfts[tp].get_transport_endpoint (conn_index, thread_index, ip, port, + is_ip4, 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); + } +} + +void +transport_get_listener_endpoint (transport_proto_t tp, u32 conn_index, + ip46_address_t * ip, u16 * port, u8 * is_ip4, + 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); + else + { + transport_connection_t *tc; + tc = transport_get_listener (tp, conn_index); + default_get_transport_endpoint (tc, ip, port, is_ip4, is_lcl); + } +} + #define PORT_MASK ((1 << 16)- 1) void @@ -509,7 +602,7 @@ spacer_max_burst (spacer_t * pacer, u64 norm_time_now) pacer->bucket += inc; } - return clib_min (pacer->bucket, pacer->max_burst_size); + return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); } static inline void @@ -519,13 +612,6 @@ spacer_update_bucket (spacer_t * pacer, u32 bytes) pacer->bucket -= bytes; } -static inline void -spacer_update_max_burst_size (spacer_t * pacer, u32 max_burst_bytes) -{ - pacer->max_burst_size = clib_max (max_burst_bytes, - TRANSPORT_PACER_MIN_BURST); -} - static inline void spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) { @@ -539,12 +625,6 @@ transport_connection_tx_pacer_reset (transport_connection_t * tc, u32 start_bucket, u64 time_now) { spacer_t *pacer = &tc->pacer; - f64 dispatch_period; - u32 burst_size; - - dispatch_period = transport_dispatch_period (tc->thread_index); - burst_size = rate_bytes_per_sec * dispatch_period; - spacer_update_max_burst_size (&tc->pacer, burst_size); 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; @@ -566,10 +646,7 @@ void transport_connection_tx_pacer_update (transport_connection_t * tc, u64 bytes_per_sec) { - f64 dispatch_period = transport_dispatch_period (tc->thread_index); - u32 burst_size = 1.1 * bytes_per_sec * dispatch_period; spacer_set_pace_rate (&tc->pacer, bytes_per_sec); - spacer_update_max_burst_size (&tc->pacer, burst_size); } u32 @@ -646,7 +723,7 @@ void transport_init (void) { vlib_thread_main_t *vtm = vlib_get_thread_main (); - session_manager_main_t *smm = vnet_get_session_manager_main (); + session_main_t *smm = vnet_get_session_main (); u32 num_threads; if (smm->local_endpoints_table_buckets == 0)