X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=16f4f02cbe30dc0acddb3dc6dc9498f73dc94dfe;hb=6080e0d15e152e38811b01306eef6719a682c007;hp=a401190e42666df4d378f96d49f7b8f04de10733;hpb=40903ac34f89d9e2ad775e98b7bcec5b7feb0207;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index a401190e426..16f4f02cbe3 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 @@ -48,17 +48,14 @@ 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"); + foreach_transport_proto +#undef _ + default: + s = format (s, "UNKNOWN"); break; } return s; @@ -70,49 +67,120 @@ 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"); +#define _(sym, str, sstr) \ + case TRANSPORT_PROTO_ ## sym: \ + s = format (s, sstr); \ break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "U"); + foreach_transport_proto +#undef _ + default: + s = format (s, "?"); break; } return s; } +u8 * +format_transport_connection (u8 * s, va_list * args) +{ + u32 transport_proto = va_arg (*args, u32); + u32 conn_index = va_arg (*args, u32); + u32 thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); + transport_proto_vft_t *tp_vft; + transport_connection_t *tc; + u32 indent; + + tp_vft = transport_protocol_get_vft (transport_proto); + if (!tp_vft) + return s; + + s = format (s, "%U", tp_vft->format_connection, conn_index, thread_index, + verbose); + tc = tp_vft->get_connection (conn_index, thread_index); + if (tc && transport_connection_is_tx_paced (tc) && verbose > 1) + { + indent = format_get_indent (s) + 1; + s = format (s, "%Upacer: %U\n", format_white_space, indent, + format_transport_pacer, &tc->pacer, tc->thread_index); + s = format (s, "%Utransport: flags 0x%x\n", format_white_space, indent, + tc->flags); + } + return s; +} + +u8 * +format_transport_listen_connection (u8 * s, va_list * args) +{ + u32 transport_proto = va_arg (*args, u32); + transport_proto_vft_t *tp_vft; + + tp_vft = transport_protocol_get_vft (transport_proto); + if (!tp_vft) + return s; + + s = (tp_vft->format_listener) (s, args); + return s; +} + +u8 * +format_transport_half_open_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_half_open, listen_index); + 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, "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, "udpc")) - *proto = TRANSPORT_PROTO_UDPC; - else if (unformat (input, "UDPC")) - *proto = TRANSPORT_PROTO_UDPC; - 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 @@ -195,22 +263,116 @@ 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); +} + +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) +{ + 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) @@ -227,7 +389,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; } @@ -248,6 +410,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. @@ -255,10 +430,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; @@ -283,101 +457,289 @@ 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); } - memset (lcl_addr, 0, sizeof (*lcl_addr)); + clib_memset (lcl_addr, 0, sizeof (*lcl_addr)); + return transport_get_interface_ip (sw_if_index, rmt->is_ip4, lcl_addr); +} + +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; - if (rmt->is_ip4) + /* + * 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; } +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 *); + 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, clib_us_time_t time_now) +{ + u64 n_periods = (time_now - pacer->last_update); + u64 inc; + + 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 = time_now; + pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec); + } + + return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST); +} + +static inline void +spacer_update_bucket (spacer_t * pacer, u32 bytes) +{ + ASSERT (pacer->bucket >= bytes); + pacer->bucket -= bytes; +} + +static inline void +spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec, + clib_us_time_t rtt) +{ + ASSERT (rate_bytes_per_sec != 0); + 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, + 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_reset (&tc->pacer, transport_us_time_now (tc->thread_index), bucket); +} + +void +transport_connection_tx_pacer_init (transport_connection_t * tc, + u64 rate_bytes_per_sec, + u32 initial_bucket) +{ + tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED; + transport_connection_tx_pacer_reset (tc, rate_bytes_per_sec, + initial_bucket, 1e6); +} + +void +transport_connection_tx_pacer_update (transport_connection_t * tc, + u64 bytes_per_sec, clib_us_time_t rtt) +{ + spacer_set_pace_rate (&tc->pacer, bytes_per_sec, rtt); +} + +u32 +transport_connection_tx_pacer_burst (transport_connection_t * tc) +{ + return spacer_max_burst (&tc->pacer, + transport_us_time_now (tc->thread_index)); +} + +u64 +transport_connection_tx_pacer_rate (transport_connection_t * tc) +{ + return spacer_pace_rate (&tc->pacer); +} + +void +transport_connection_update_tx_bytes (transport_connection_t * tc, u32 bytes) +{ + if (transport_connection_is_tx_paced (tc)) + 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_connection_reschedule (transport_connection_t * tc) +{ + 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) @@ -402,7 +764,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)