X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=0679eaa10790ce5245f8949109e30fe0e5b97282;hb=09d18c2fee0eb96c486f9d112e39dcd34e430b0e;hp=8cbad0d397fa4cf03e0561a1a6aa5205fecf2b40;hpb=de9a849a18514f0b09bb5f57a73f6a57ee425c76;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 8cbad0d397f..0679eaa1079 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) @@ -67,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; } @@ -89,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; } @@ -124,14 +132,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 +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,91 @@ 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, + 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) void @@ -291,7 +381,7 @@ always_inline transport_endpoint_t * transport_endpoint_new (void) { transport_endpoint_t *tep; - pool_get (local_endpoints, tep); + pool_get_zero (local_endpoints, tep); return tep; } @@ -312,6 +402,19 @@ transport_endpoint_cleanup (u8 proto, ip46_address_t * lcl_ip, u16 port) } } +static void +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_fast (&tep->ip, ip, sizeof (*ip)); + tep->port = port; + transport_endpoint_table_add (&local_endpoints_table, proto, tep, + tep - local_endpoints); + clib_spinlock_unlock_if_init (&local_endpoints_lock); +} + /** * Allocate local port and add if successful add entry to local endpoint * table to mark the pair as used. @@ -319,10 +422,9 @@ transport_endpoint_cleanup (u8 proto, ip46_address_t * lcl_ip, u16 port) int transport_alloc_local_port (u8 proto, ip46_address_t * ip) { - transport_endpoint_t *tep; - u32 tei; u16 min = 1024, max = 65535; /* XXX configurable ? */ int tries, limit; + u32 tei; limit = max - min; @@ -347,96 +449,127 @@ transport_alloc_local_port (u8 proto, ip46_address_t * ip) port); if (tei == ENDPOINT_INVALID_INDEX) { - clib_spinlock_lock_if_init (&local_endpoints_lock); - tep = transport_endpoint_new (); - clib_memcpy (&tep->ip, ip, sizeof (*ip)); - tep->port = port; - transport_endpoint_table_add (&local_endpoints_table, proto, tep, - tep - local_endpoints); - clib_spinlock_unlock_if_init (&local_endpoints_lock); - - return tep->port; + transport_endpoint_mark_used (proto, ip, port); + return port; } } return -1; } -int -transport_alloc_local_endpoint (u8 proto, transport_endpoint_t * rmt, - ip46_address_t * lcl_addr, u16 * lcl_port) +static clib_error_t * +transport_get_interface_ip (u32 sw_if_index, u8 is_ip4, ip46_address_t * addr) { - fib_prefix_t prefix; - fib_node_index_t fei; - u32 sw_if_index; - int port; - - /* - * Find the local address and allocate port - */ - - /* Find a FIB path to the destination */ - clib_memcpy (&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; - - ASSERT (rmt->fib_index != ENDPOINT_INVALID_INDEX); - fei = fib_table_lookup (rmt->fib_index, &prefix); - - /* Couldn't find route to destination. Bail out. */ - if (fei == FIB_NODE_INDEX_INVALID) + if (is_ip4) + { + ip4_address_t *ip4; + ip4 = ip_interface_get_first_ip (sw_if_index, 1); + if (!ip4) + return clib_error_return (0, "no routable ip4 address on %U", + format_vnet_sw_if_index_name, + vnet_get_main (), sw_if_index); + addr->ip4.as_u32 = ip4->as_u32; + } + else { - clib_warning ("no route to destination"); - return -1; + ip6_address_t *ip6; + ip6 = ip_interface_get_first_ip (sw_if_index, 0); + if (ip6 == 0) + 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_fast (&addr->ip6, ip6, sizeof (*ip6)); } + return 0; +} - sw_if_index = rmt->sw_if_index; - if (sw_if_index == ENDPOINT_INVALID_INDEX) - sw_if_index = fib_entry_get_resolving_interface (fei); +static clib_error_t * +transport_find_local_ip_for_remote (u32 sw_if_index, + transport_endpoint_t * rmt, + ip46_address_t * lcl_addr) +{ + fib_node_index_t fei; + fib_prefix_t prefix; if (sw_if_index == ENDPOINT_INVALID_INDEX) { - clib_warning ("no resolving interface for %U", format_ip46_address, - &rmt->ip, (rmt->is_ip4 == 0) + 1); - return -1; + /* Find a FIB path to the destination */ + 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; + + ASSERT (rmt->fib_index != ENDPOINT_INVALID_INDEX); + fei = fib_table_lookup (rmt->fib_index, &prefix); + + /* Couldn't find route to destination. Bail out. */ + if (fei == FIB_NODE_INDEX_INVALID) + return clib_error_return (0, "no route to %U", format_ip46_address, + &rmt->ip, (rmt->is_ip4 == 0) + 1); + + sw_if_index = fib_entry_get_resolving_interface (fei); + if (sw_if_index == ENDPOINT_INVALID_INDEX) + return clib_error_return (0, "no resolving interface for %U", + format_ip46_address, &rmt->ip, + (rmt->is_ip4 == 0) + 1); } clib_memset (lcl_addr, 0, sizeof (*lcl_addr)); + return transport_get_interface_ip (sw_if_index, rmt->is_ip4, lcl_addr); +} - if (rmt->is_ip4) +int +transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg, + ip46_address_t * lcl_addr, u16 * lcl_port) +{ + transport_endpoint_t *rmt = (transport_endpoint_t *) rmt_cfg; + clib_error_t *error; + int port; + u32 tei; + + /* + * Find the local address + */ + if (ip_is_zero (&rmt_cfg->peer.ip, rmt_cfg->peer.is_ip4)) { - ip4_address_t *ip4; - ip4 = ip_interface_get_first_ip (sw_if_index, 1); - if (!ip4) + error = transport_find_local_ip_for_remote (rmt_cfg->peer.sw_if_index, + rmt, lcl_addr); + if (error) { - clib_warning ("no routable ip4 address on %U", - format_vnet_sw_if_index_name, vnet_get_main (), - sw_if_index); + clib_error_report (error); return -1; } - lcl_addr->ip4.as_u32 = ip4->as_u32; } else { - ip6_address_t *ip6; - ip6 = ip_interface_get_first_ip (sw_if_index, 0); - if (ip6 == 0) + /* Assume session layer vetted this address */ + clib_memcpy_fast (lcl_addr, &rmt_cfg->peer.ip, + sizeof (rmt_cfg->peer.ip)); + } + + /* + * Allocate source port + */ + if (rmt_cfg->peer.port == 0) + { + port = transport_alloc_local_port (proto, lcl_addr); + if (port < 1) { - clib_warning ("no routable ip6 addresses on %U", - format_vnet_sw_if_index_name, vnet_get_main (), - sw_if_index); + clib_warning ("Failed to allocate src port"); return -1; } - clib_memcpy (&lcl_addr->ip6, ip6, sizeof (*ip6)); + *lcl_port = port; } - - /* Allocate source port */ - port = transport_alloc_local_port (proto, lcl_addr); - if (port < 1) + else { - clib_warning ("Failed to allocate src port"); - return -1; + port = clib_net_to_host_u16 (rmt_cfg->peer.port); + tei = transport_endpoint_lookup (&local_endpoints_table, proto, + lcl_addr, port); + if (tei != ENDPOINT_INVALID_INDEX) + return -1; + + transport_endpoint_mark_used (proto, lcl_addr, port); + *lcl_port = port; } - *lcl_port = port; + return 0; } @@ -458,10 +591,15 @@ static inline u32 spacer_max_burst (spacer_t * pacer, u64 norm_time_now) { u64 n_periods = norm_time_now - pacer->last_update; + u64 inc; - pacer->last_update = norm_time_now; - pacer->bucket += n_periods * pacer->tokens_per_period; - return clib_min (pacer->bucket, pacer->max_burst_size); + if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10) + { + pacer->last_update = norm_time_now; + pacer->bucket += inc; + } + + return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); } static inline void @@ -471,12 +609,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) { @@ -485,43 +617,54 @@ spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) } void -transport_connection_tx_pacer_init (transport_connection_t * tc, - u32 rate_bytes_per_sec, u32 burst_bytes) +transport_connection_tx_pacer_reset (transport_connection_t * tc, + u32 rate_bytes_per_sec, + u32 start_bucket, u64 time_now) { - vlib_main_t *vm = vlib_get_main (); - u64 time_now = vm->clib_time.last_cpu_time; spacer_t *pacer = &tc->pacer; - - tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED; - spacer_update_max_burst_size (&tc->pacer, burst_bytes); spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec); pacer->last_update = time_now >> SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - pacer->bucket = burst_bytes; + pacer->bucket = start_bucket; +} + +void +transport_connection_tx_pacer_init (transport_connection_t * tc, + u32 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); } 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 -transport_connection_max_tx_burst (transport_connection_t * tc, u64 time_now) +transport_connection_tx_pacer_burst (transport_connection_t * tc, + u64 time_now) +{ + time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; + return spacer_max_burst (&tc->pacer, time_now); +} + +u32 +transport_connection_snd_space (transport_connection_t * tc, u64 time_now, + u16 mss) { u32 snd_space, max_paced_burst; - u32 mss; 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); - mss = tp_vfts[tc->proto].send_mss (tc); 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; @@ -537,6 +680,13 @@ transport_connection_update_tx_stats (transport_connection_t * tc, u32 bytes) spacer_update_bucket (&tc->pacer, bytes); } +void +transport_connection_tx_pacer_update_bytes (transport_connection_t * tc, + u32 bytes) +{ + spacer_update_bucket (&tc->pacer, bytes); +} + void transport_init_tx_pacers_period (void) { @@ -570,7 +720,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)