X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=bb4c6817345e4768d7451899ac5b27567f6aee4b;hb=8ac1d6d05f2a0d6759284d4eeb5079644a5c8c86;hp=42149eb36a6be9fe5d3428a3f844236a0468b2c6;hpb=c44a558164a466a74a4c10d4e7d7dd1b9a4b01dd;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 42149eb36a6..bb4c6817345 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include #include @@ -47,7 +47,9 @@ static clib_spinlock_t local_endpoints_lock; */ static double transport_pacer_period; -#define TRANSPORT_PACER_MIN_MSS 1460 +#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) @@ -64,9 +66,21 @@ format_transport_proto (u8 * s, va_list * args) 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"); + break; + default: + s = format (s, "UNKNOWN"); + break; } return s; } @@ -86,9 +100,21 @@ format_transport_proto_short (u8 * s, va_list * args) 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"); + break; + default: + s = format (s, "?"); + break; } return s; } @@ -124,14 +150,13 @@ u8 * format_transport_listen_connection (u8 * s, va_list * args) { u32 transport_proto = va_arg (*args, u32); - u32 listen_index = va_arg (*args, u32); transport_proto_vft_t *tp_vft; tp_vft = transport_protocol_get_vft (transport_proto); if (!tp_vft) return s; - s = format (s, "%U", tp_vft->format_listener, listen_index); + s = (tp_vft->format_listener) (s, args); return s; } @@ -158,6 +183,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 +199,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; @@ -259,22 +288,107 @@ 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 +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); + return (tp_vfts[tp].transport_options.service_type == TRANSPORT_SERVICE_CL); +} + +always_inline void +default_get_transport_endpoint (transport_connection_t * tc, + transport_endpoint_t * tep, u8 is_lcl) +{ + if (is_lcl) + { + tep->port = tc->lcl_port; + tep->is_ip4 = tc->is_ip4; + clib_memcpy_fast (&tep->ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); + } + else + { + 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, transport_endpoint_t * tep, + u8 is_lcl) +{ + if (tp_vfts[tp].get_transport_endpoint) + 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, tep, is_lcl); + } +} + +void +transport_get_listener_endpoint (transport_proto_t tp, u32 conn_index, + transport_endpoint_t * tep, u8 is_lcl) +{ + if (tp_vfts[tp].get_transport_listener_endpoint) + 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, tep, is_lcl); + } } #define PORT_MASK ((1 << 16)- 1) @@ -318,7 +432,7 @@ transport_endpoint_mark_used (u8 proto, ip46_address_t * ip, u16 port) transport_endpoint_t *tep; clib_spinlock_lock_if_init (&local_endpoints_lock); tep = transport_endpoint_new (); - clib_memcpy (&tep->ip, ip, sizeof (*ip)); + clib_memcpy_fast (&tep->ip, ip, sizeof (*ip)); tep->port = port; transport_endpoint_table_add (&local_endpoints_table, proto, tep, tep - local_endpoints); @@ -387,7 +501,7 @@ transport_get_interface_ip (u32 sw_if_index, u8 is_ip4, ip46_address_t * addr) return clib_error_return (0, "no routable ip6 addresses on %U", format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index); - clib_memcpy (&addr->ip6, ip6, sizeof (*ip6)); + clib_memcpy_fast (&addr->ip6, ip6, sizeof (*ip6)); } return 0; } @@ -403,7 +517,7 @@ transport_find_local_ip_for_remote (u32 sw_if_index, if (sw_if_index == ENDPOINT_INVALID_INDEX) { /* Find a FIB path to the destination */ - clib_memcpy (&prefix.fp_addr, &rmt->ip, sizeof (rmt->ip)); + clib_memcpy_fast (&prefix.fp_addr, &rmt->ip, sizeof (rmt->ip)); prefix.fp_proto = rmt->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6; prefix.fp_len = rmt->is_ip4 ? 32 : 128; @@ -443,12 +557,16 @@ transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg, error = transport_find_local_ip_for_remote (rmt_cfg->peer.sw_if_index, rmt, lcl_addr); if (error) - return -1; + { + clib_error_report (error); + return -1; + } } else { /* Assume session layer vetted this address */ - clib_memcpy (lcl_addr, &rmt_cfg->peer.ip, sizeof (rmt_cfg->peer.ip)); + clib_memcpy_fast (lcl_addr, &rmt_cfg->peer.ip, + sizeof (rmt_cfg->peer.ip)); } /* @@ -505,7 +623,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 @@ -515,12 +633,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_MSS); -} - static inline void spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) { @@ -528,18 +640,18 @@ spacer_set_pace_rate (spacer_t * pacer, u64 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; +} + void transport_connection_tx_pacer_reset (transport_connection_t * tc, u32 rate_bytes_per_sec, 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; @@ -561,11 +673,7 @@ void transport_connection_tx_pacer_update (transport_connection_t * tc, u64 bytes_per_sec) { - u32 burst_size; - - burst_size = bytes_per_sec * transport_dispatch_period (tc->thread_index); spacer_set_pace_rate (&tc->pacer, bytes_per_sec); - spacer_update_max_burst_size (&tc->pacer, burst_size); } u32 @@ -594,6 +702,12 @@ transport_connection_snd_space (transport_connection_t * tc, u64 time_now, return snd_space; } +u64 +transport_connection_tx_pacer_rate (transport_connection_t * tc) +{ + return spacer_pace_rate (&tc->pacer); +} + void transport_connection_update_tx_stats (transport_connection_t * tc, u32 bytes) { @@ -642,7 +756,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)