X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=0012ba288bfb428ce77d80263c8f1e82d28c4ae8;hb=e111bbd12;hp=06c541a9e2b605df14a6a0c0e2b40b4909f5d780;hpb=7ac053b27fee8f9e437cf7b61357943356381061;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 06c541a9e2b..0012ba288bf 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 @@ -22,53 +22,37 @@ */ transport_proto_vft_t *tp_vfts; -/* - * Port allocator seed - */ -static u32 port_allocator_seed; - -/* - * Local endpoints table - */ -static transport_endpoint_table_t local_endpoints_table; - -/* - * Pool of local endpoints - */ -static transport_endpoint_t *local_endpoints; - -/* - * Local endpoints pool lock - */ -static clib_spinlock_t local_endpoints_lock; +typedef struct local_endpoint_ +{ + transport_endpoint_t ep; + transport_proto_t proto; + int refcnt; +} local_endpoint_t; -/* - * Period used by transport pacers. Initialized by session layer - */ -static double transport_pacer_period; +typedef struct transport_main_ +{ + transport_endpoint_table_t local_endpoints_table; + local_endpoint_t *local_endpoints; + u32 *lcl_endpts_freelist; + u32 port_allocator_seed; + u16 port_allocator_min_src_port; + u16 port_allocator_max_src_port; + u8 lcl_endpts_cleanup_pending; + clib_spinlock_t local_endpoints_lock; +} transport_main_t; -#define TRANSPORT_PACER_MIN_MSS 1460 -#define TRANSPORT_PACER_MIN_BURST TRANSPORT_PACER_MIN_MSS +static transport_main_t tp_main; 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_UDPC: - s = format (s, "UDPC"); - break; - } + + if (tp_vfts[transport_proto].transport_options.name) + s = format (s, "%s", tp_vfts[transport_proto].transport_options.name); + else + s = format (s, "n/a"); + return s; } @@ -76,21 +60,43 @@ u8 * format_transport_proto_short (u8 * s, va_list * args) { u32 transport_proto = va_arg (*args, u32); - switch (transport_proto) + char *short_name; + + short_name = tp_vfts[transport_proto].transport_options.short_name; + if (short_name) + s = format (s, "%s", short_name); + else + s = format (s, "NA"); + + return s; +} + +const char *transport_flags_str[] = { +#define _(sym, str) str, + foreach_transport_connection_flag +#undef _ +}; + +u8 * +format_transport_flags (u8 *s, va_list *args) +{ + transport_connection_flags_t flags; + int i, last = -1; + + flags = va_arg (*args, transport_connection_flags_t); + + for (i = 0; i < TRANSPORT_CONNECTION_N_FLAGS; i++) + if (flags & (1 << i)) + last = i; + + for (i = 0; i < last; i++) { - 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_UDPC: - s = format (s, "U"); - break; + if (flags & (1 << i)) + s = format (s, "%s, ", transport_flags_str[i]); } + if (last >= 0) + s = format (s, "%s", transport_flags_str[last]); + return s; } @@ -112,11 +118,14 @@ format_transport_connection (u8 * s, va_list * args) 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) + if (tc && verbose > 1) { indent = format_get_indent (s) + 1; - s = format (s, "%Upacer: %U\n", format_white_space, indent, - format_transport_pacer, &tc->pacer); + if (transport_connection_is_tx_paced (tc)) + s = format (s, "%Upacer: %U\n", format_white_space, indent, + format_transport_pacer, &tc->pacer, tc->thread_index); + s = format (s, "%Utransport: flags: %U\n", format_white_space, indent, + format_transport_flags, tc->flags); } return s; } @@ -125,14 +134,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; } @@ -140,44 +148,76 @@ 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); + s = (tp_vft->format_half_open) (s, args); 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; + transport_proto_vft_t *tp_vft; + u8 longest_match = 0, match; + char *str, *str_match = 0; + transport_proto_t tp; + + for (tp = 0; tp < vec_len (tp_vfts); tp++) + { + tp_vft = &tp_vfts[tp]; + str = tp_vft->transport_options.name; + if (!str) + continue; + if (unformat_transport_str_match (input, str)) + { + match = strlen (str); + if (match > longest_match) + { + *proto = tp; + longest_match = match; + str_match = str; + } + } + } + if (longest_match) + { + (void) unformat (input, str_match); + return 1; + } + + return 0; +} + +u8 * +format_transport_protos (u8 * s, va_list * args) +{ + transport_proto_vft_t *tp_vft; + + vec_foreach (tp_vft, tp_vfts) + s = format (s, "%s\n", tp_vft->transport_options.name); + + return s; } u32 @@ -225,15 +265,6 @@ transport_endpoint_table_del (transport_endpoint_table_t * ht, u8 proto, clib_bihash_add_del_24_8 (ht, &kv, 0); } -/** - * Register transport virtual function table. - * - * @param transport_proto - transport protocol type (i.e., TCP, UDP ..) - * @param vft - virtual function table for transport proto - * @param fib_proto - network layer protocol - * @param output_node - output node index that session layer will hand off - * buffers to, for requested fib proto - */ void transport_register_protocol (transport_proto_t transport_proto, const transport_proto_vft_t * vft, @@ -247,6 +278,24 @@ transport_register_protocol (transport_proto_t transport_proto, session_register_transport (transport_proto, vft, is_ip4, output_node); } +transport_proto_t +transport_register_new_protocol (const transport_proto_vft_t * vft, + fib_protocol_t fib_proto, u32 output_node) +{ + transport_proto_t transport_proto; + u8 is_ip4; + + transport_proto = session_add_transport_proto (); + is_ip4 = fib_proto == FIB_PROTOCOL_IP4; + + vec_validate (tp_vfts, transport_proto); + tp_vfts[transport_proto] = *vft; + + session_register_transport (transport_proto, vft, is_ip4, output_node); + + return transport_proto; +} + /** * Get transport virtual function table * @@ -263,67 +312,283 @@ transport_protocol_get_vft (transport_proto_t transport_proto) 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); +} + +void +transport_cleanup_half_open (transport_proto_t tp, u32 conn_index) +{ + if (tp_vfts[tp].cleanup_ho) + tp_vfts[tp].cleanup_ho (conn_index); +} + +int +transport_connect (transport_proto_t tp, transport_endpoint_cfg_t * tep) +{ + if (PREDICT_FALSE (!tp_vfts[tp].connect)) + return SESSION_E_TRANSPORT_NO_REG; + return tp_vfts[tp].connect (tep); +} + +void +transport_half_close (transport_proto_t tp, u32 conn_index, u8 thread_index) +{ + if (tp_vfts[tp].half_close) + tp_vfts[tp].half_close (conn_index, thread_index); +} + +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_cfg_t *tep) +{ + if (PREDICT_FALSE (!tp_vfts[tp].start_listen)) + return SESSION_E_TRANSPORT_NO_REG; + 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); + } +} + +int +transport_connection_attribute (transport_proto_t tp, u32 conn_index, + u8 thread_index, u8 is_get, + transport_endpt_attr_t *attr) +{ + if (!tp_vfts[tp].attribute) + return -1; + + return tp_vfts[tp].attribute (conn_index, thread_index, is_get, attr); } #define PORT_MASK ((1 << 16)- 1) void -transport_endpoint_del (u32 tepi) +transport_endpoint_free (u32 tepi) { - clib_spinlock_lock_if_init (&local_endpoints_lock); - pool_put_index (local_endpoints, tepi); - clib_spinlock_unlock_if_init (&local_endpoints_lock); + transport_main_t *tm = &tp_main; + pool_put_index (tm->local_endpoints, tepi); } -always_inline transport_endpoint_t * -transport_endpoint_new (void) +always_inline local_endpoint_t * +transport_endpoint_alloc (void) { - transport_endpoint_t *tep; - pool_get_zero (local_endpoints, tep); - return tep; + transport_main_t *tm = &tp_main; + local_endpoint_t *lep; + + ASSERT (vlib_get_thread_index () <= transport_cl_thread ()); + + pool_get_aligned_safe (tm->local_endpoints, lep, 0); + return lep; +} + +static void +transport_cleanup_freelist (void) +{ + transport_main_t *tm = &tp_main; + local_endpoint_t *lep; + u32 *lep_indexp; + + clib_spinlock_lock (&tm->local_endpoints_lock); + + vec_foreach (lep_indexp, tm->lcl_endpts_freelist) + { + lep = pool_elt_at_index (tm->local_endpoints, *lep_indexp); + + /* Port re-shared after attempt to cleanup */ + if (lep->refcnt > 0) + continue; + + transport_endpoint_table_del (&tm->local_endpoints_table, lep->proto, + &lep->ep); + transport_endpoint_free (*lep_indexp); + } + + vec_reset_length (tm->lcl_endpts_freelist); + + tm->lcl_endpts_cleanup_pending = 0; + + clib_spinlock_unlock (&tm->local_endpoints_lock); } void -transport_endpoint_cleanup (u8 proto, ip46_address_t * lcl_ip, u16 port) +transport_program_endpoint_cleanup (u32 lepi) { - u32 tepi; - transport_endpoint_t *tep; + transport_main_t *tm = &tp_main; + u8 flush_fl = 0; + + /* All workers can free connections. Synchronize access to freelist */ + clib_spinlock_lock (&tm->local_endpoints_lock); + + vec_add1 (tm->lcl_endpts_freelist, lepi); + + /* Avoid accumulating lots of endpoints for cleanup */ + if (!tm->lcl_endpts_cleanup_pending && + vec_len (tm->lcl_endpts_freelist) > 32) + { + tm->lcl_endpts_cleanup_pending = 1; + flush_fl = 1; + } - /* Cleanup local endpoint if this was an active connect */ - tepi = transport_endpoint_lookup (&local_endpoints_table, proto, lcl_ip, + clib_spinlock_unlock (&tm->local_endpoints_lock); + + if (flush_fl) + session_send_rpc_evt_to_thread_force (transport_cl_thread (), + transport_cleanup_freelist, 0); +} + +int +transport_release_local_endpoint (u8 proto, ip46_address_t *lcl_ip, u16 port) +{ + transport_main_t *tm = &tp_main; + local_endpoint_t *lep; + u32 lepi; + + lepi = transport_endpoint_lookup (&tm->local_endpoints_table, proto, lcl_ip, clib_net_to_host_u16 (port)); - if (tepi != ENDPOINT_INVALID_INDEX) + if (lepi == ENDPOINT_INVALID_INDEX) + return -1; + + lep = pool_elt_at_index (tm->local_endpoints, lepi); + + /* Local endpoint no longer in use, program cleanup */ + if (!clib_atomic_sub_fetch (&lep->refcnt, 1)) { - tep = pool_elt_at_index (local_endpoints, tepi); - transport_endpoint_table_del (&local_endpoints_table, proto, tep); - transport_endpoint_del (tepi); + transport_program_endpoint_cleanup (lepi); + return 0; } + + /* Not an error, just in idication that endpoint was not cleaned up */ + return -1; } -static void -transport_endpoint_mark_used (u8 proto, ip46_address_t * ip, u16 port) +static int +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)); - tep->port = port; - transport_endpoint_table_add (&local_endpoints_table, proto, tep, - tep - local_endpoints); - clib_spinlock_unlock_if_init (&local_endpoints_lock); + transport_main_t *tm = &tp_main; + local_endpoint_t *lep; + u32 tei; + + ASSERT (vlib_get_thread_index () <= transport_cl_thread ()); + + tei = + transport_endpoint_lookup (&tm->local_endpoints_table, proto, ip, port); + if (tei != ENDPOINT_INVALID_INDEX) + return SESSION_E_PORTINUSE; + + /* Pool reallocs with worker barrier */ + lep = transport_endpoint_alloc (); + clib_memcpy_fast (&lep->ep.ip, ip, sizeof (*ip)); + lep->ep.port = port; + lep->proto = proto; + lep->refcnt = 1; + + transport_endpoint_table_add (&tm->local_endpoints_table, proto, &lep->ep, + lep - tm->local_endpoints); + + return 0; +} + +void +transport_share_local_endpoint (u8 proto, ip46_address_t * lcl_ip, u16 port) +{ + transport_main_t *tm = &tp_main; + local_endpoint_t *lep; + u32 lepi; + + /* Active opens should call this only from a control thread, which are also + * used to allocate and free ports. So, pool has only one writer and + * potentially many readers. Listeners are allocated with barrier */ + lepi = transport_endpoint_lookup (&tm->local_endpoints_table, proto, lcl_ip, + clib_net_to_host_u16 (port)); + if (lepi != ENDPOINT_INVALID_INDEX) + { + lep = pool_elt_at_index (tm->local_endpoints, lepi); + clib_atomic_add_fetch (&lep->refcnt, 1); + } } /** @@ -331,16 +596,18 @@ transport_endpoint_mark_used (u8 proto, ip46_address_t * ip, u16 port) * table to mark the pair as used. */ int -transport_alloc_local_port (u8 proto, ip46_address_t * ip) +transport_alloc_local_port (u8 proto, ip46_address_t *lcl_addr, + transport_endpoint_cfg_t *rmt) { - u16 min = 1024, max = 65535; /* XXX configurable ? */ + transport_main_t *tm = &tp_main; + u16 min = tm->port_allocator_min_src_port; + u16 max = tm->port_allocator_max_src_port; int tries, limit; - u32 tei; limit = max - min; - /* Only support active opens from thread 0 */ - ASSERT (vlib_get_thread_index () == 0); + /* Only support active opens from one of ctrl threads */ + ASSERT (vlib_get_thread_index () <= transport_cl_thread ()); /* Search for first free slot */ for (tries = 0; tries < limit; tries++) @@ -350,24 +617,28 @@ transport_alloc_local_port (u8 proto, ip46_address_t * ip) /* Find a port in the specified range */ while (1) { - port = random_u32 (&port_allocator_seed) & PORT_MASK; + port = random_u32 (&tm->port_allocator_seed) & PORT_MASK; if (PREDICT_TRUE (port >= min && port < max)) break; } - /* Look it up. If not found, we're done */ - tei = transport_endpoint_lookup (&local_endpoints_table, proto, ip, - port); - if (tei == ENDPOINT_INVALID_INDEX) - { - transport_endpoint_mark_used (proto, ip, port); - return port; - } + if (!transport_endpoint_mark_used (proto, lcl_addr, port)) + return port; + + /* IP:port pair already in use, check if 6-tuple available */ + if (session_lookup_connection (rmt->fib_index, lcl_addr, &rmt->ip, port, + rmt->port, proto, rmt->is_ip4)) + continue; + + /* 6-tuple is available so increment lcl endpoint refcount */ + transport_share_local_endpoint (proto, lcl_addr, port); + + return port; } return -1; } -static clib_error_t * +static session_error_t transport_get_interface_ip (u32 sw_if_index, u8 is_ip4, ip46_address_t * addr) { if (is_ip4) @@ -375,9 +646,7 @@ transport_get_interface_ip (u32 sw_if_index, u8 is_ip4, ip46_address_t * addr) 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); + return SESSION_E_NOIP; addr->ip4.as_u32 = ip4->as_u32; } else @@ -385,26 +654,24 @@ transport_get_interface_ip (u32 sw_if_index, u8 is_ip4, ip46_address_t * addr) 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 (&addr->ip6, ip6, sizeof (*ip6)); + return SESSION_E_NOIP; + clib_memcpy_fast (&addr->ip6, ip6, sizeof (*ip6)); } return 0; } -static clib_error_t * -transport_find_local_ip_for_remote (u32 sw_if_index, - transport_endpoint_t * rmt, - ip46_address_t * lcl_addr) +static session_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) + 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; @@ -413,18 +680,15 @@ transport_find_local_ip_for_remote (u32 sw_if_index, /* 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); + return SESSION_E_NOROUTE; + + *sw_if_index = fib_entry_get_resolving_interface (fei); + if (*sw_if_index == ENDPOINT_INVALID_INDEX) + return SESSION_E_NOINTF; } clib_memset (lcl_addr, 0, sizeof (*lcl_addr)); - return transport_get_interface_ip (sw_if_index, rmt->is_ip4, lcl_addr); + return transport_get_interface_ip (*sw_if_index, rmt->is_ip4, lcl_addr); } int @@ -432,173 +696,202 @@ 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; + transport_main_t *tm = &tp_main; + session_error_t error; int port; - u32 tei; /* * Find the local address */ if (ip_is_zero (&rmt_cfg->peer.ip, rmt_cfg->peer.is_ip4)) { - error = transport_find_local_ip_for_remote (rmt_cfg->peer.sw_if_index, + error = transport_find_local_ip_for_remote (&rmt_cfg->peer.sw_if_index, rmt, lcl_addr); if (error) - return -1; + return error; } 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)); } + /* Cleanup freelist if need be */ + if (vec_len (tm->lcl_endpts_freelist)) + transport_cleanup_freelist (); + /* * Allocate source port */ if (rmt_cfg->peer.port == 0) { - port = transport_alloc_local_port (proto, lcl_addr); + port = transport_alloc_local_port (proto, lcl_addr, rmt_cfg); if (port < 1) - { - clib_warning ("Failed to allocate src port"); - return -1; - } + return SESSION_E_NOPORT; *lcl_port = port; } else { 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; + + if (!transport_endpoint_mark_used (proto, lcl_addr, port)) + return 0; + + /* IP:port pair already in use, check if 6-tuple available */ + if (session_lookup_connection (rmt->fib_index, lcl_addr, &rmt->ip, port, + rmt->port, proto, rmt->is_ip4)) + return SESSION_E_PORTINUSE; + + /* 6-tuple is available so increment lcl endpoint refcount */ + transport_share_local_endpoint (proto, lcl_addr, port); + + return 0; } return 0; } -#define SPACER_CPU_TICKS_PER_PERIOD_SHIFT 10 -#define SPACER_CPU_TICKS_PER_PERIOD (1 << SPACER_CPU_TICKS_PER_PERIOD_SHIFT) +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 *); - - s = format (s, "bucket %u max_burst %u tokens/period %.3f last_update %x", - pacer->bucket, pacer->max_burst_size, pacer->tokens_per_period, - pacer->last_update); + 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 %ld t/p %.3f last_update %U burst %u", + pacer->bytes_per_sec, pacer->bucket, pacer->tokens_per_period, + format_clib_us_time, diff, pacer->max_burst); return s; } static inline u32 -spacer_max_burst (spacer_t * pacer, u64 norm_time_now) +spacer_max_burst (spacer_t * pacer, clib_us_time_t time_now) { - u64 n_periods = norm_time_now - pacer->last_update; - u64 inc; + u64 n_periods = (time_now - pacer->last_update); + i64 inc; - if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10) + if ((inc = (f32) n_periods * pacer->tokens_per_period) > 10) { - pacer->last_update = norm_time_now; - pacer->bucket += inc; + pacer->last_update = time_now; + pacer->bucket = clib_min (pacer->bucket + inc, (i64) pacer->max_burst); } - return clib_min (pacer->bucket, pacer->max_burst_size); + return pacer->bucket >= 0 ? pacer->max_burst : 0; } static inline void spacer_update_bucket (spacer_t * pacer, u32 bytes) { - ASSERT (pacer->bucket >= bytes); pacer->bucket -= bytes; } static inline void -spacer_update_max_burst_size (spacer_t * pacer, u32 max_burst_bytes) +spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec, + clib_us_time_t rtt, clib_time_type_t sec_per_loop) +{ + clib_us_time_t max_time; + + 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; + + /* Allow a min number of bursts per rtt, if their size is acceptable. Goal + * is to spread the sending of data over the rtt but to also allow for some + * coalescing that can potentially + * 1) reduce load on session layer by reducing scheduling frequency for a + * session and + * 2) optimize sending when tso if available + * + * Max "time-length" of a burst cannot be less than 1us or more than 1ms. + */ + max_time = clib_max (rtt / TRANSPORT_PACER_BURSTS_PER_RTT, + (clib_us_time_t) (sec_per_loop * CLIB_US_TIME_FREQ)); + max_time = clib_clamp (max_time, 1 /* 1us */ , 1000 /* 1ms */ ); + pacer->max_burst = (rate_bytes_per_sec * max_time) * CLIB_US_TIME_PERIOD; + pacer->max_burst = clib_clamp (pacer->max_burst, TRANSPORT_PACER_MIN_BURST, + TRANSPORT_PACER_MAX_BURST); +} + +static inline u64 +spacer_pace_rate (spacer_t * pacer) { - pacer->max_burst_size = clib_max (max_burst_bytes, - TRANSPORT_PACER_MIN_BURST); + return pacer->bytes_per_sec; } static inline void -spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) +spacer_reset (spacer_t * pacer, clib_us_time_t time_now, u64 bucket) { - ASSERT (rate_bytes_per_sec != 0); - pacer->tokens_per_period = rate_bytes_per_sec / transport_pacer_period; + pacer->last_update = time_now; + pacer->bucket = bucket; } void transport_connection_tx_pacer_reset (transport_connection_t * tc, - u32 rate_bytes_per_sec, - u32 start_bucket, u64 time_now) + u64 rate_bytes_per_sec, u32 start_bucket, + clib_us_time_t rtt) { - spacer_t *pacer = &tc->pacer; - f64 dispatch_period; - u32 burst_size; + spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec, rtt, + transport_seconds_per_loop (tc->thread_index)); + spacer_reset (&tc->pacer, transport_us_time_now (tc->thread_index), + start_bucket); +} - 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; +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, - u32 rate_bytes_per_sec, + u64 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); + initial_bucket, 1e6); } void transport_connection_tx_pacer_update (transport_connection_t * tc, - u64 bytes_per_sec) + u64 bytes_per_sec, clib_us_time_t rtt) { - 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); + spacer_set_pace_rate (&tc->pacer, bytes_per_sec, rtt, + transport_seconds_per_loop (tc->thread_index)); } u32 -transport_connection_tx_pacer_burst (transport_connection_t * tc, - u64 time_now) +transport_connection_tx_pacer_burst (transport_connection_t * tc) { - time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - return spacer_max_burst (&tc->pacer, time_now); + return spacer_max_burst (&tc->pacer, + transport_us_time_now (tc->thread_index)); } -u32 -transport_connection_snd_space (transport_connection_t * tc, u64 time_now, - u16 mss) +u64 +transport_connection_tx_pacer_rate (transport_connection_t * tc) { - u32 snd_space, max_paced_burst; - - 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); - 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; - } - return snd_space; + return spacer_pace_rate (&tc->pacer); } void -transport_connection_update_tx_stats (transport_connection_t * tc, u32 bytes) +transport_connection_update_tx_bytes (transport_connection_t * tc, u32 bytes) { - tc->stats.tx_bytes += bytes; if (transport_connection_is_tx_paced (tc)) spacer_update_bucket (&tc->pacer, bytes); } @@ -611,14 +904,38 @@ transport_connection_tx_pacer_update_bytes (transport_connection_t * tc, } void -transport_init_tx_pacers_period (void) +transport_update_pacer_time (u32 thread_index, clib_time_type_t now) { - f64 cpu_freq = os_cpu_clock_frequency (); - transport_pacer_period = cpu_freq / SPACER_CPU_TICKS_PER_PERIOD; + session_wrk_update_time (session_main_get_worker (thread_index), now); } void -transport_update_time (f64 time_now, u8 thread_index) +transport_connection_reschedule (transport_connection_t * tc) +{ + tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED; + transport_connection_tx_pacer_reset_bucket (tc, 0 /* bucket */); + 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_fifos_init_ooo (transport_connection_t * tc) +{ + session_t *s = session_get (tc->s_index, tc->thread_index); + svm_fifo_init_ooo_lookup (s->rx_fifo, 0 /* ooo enq */ ); + svm_fifo_init_ooo_lookup (s->tx_fifo, 1 /* ooo deq */ ); +} + +void +transport_update_time (clib_time_type_t time_now, u8 thread_index) { transport_proto_vft_t *vft; vec_foreach (vft, tp_vfts) @@ -636,6 +953,9 @@ transport_enable_disable (vlib_main_t * vm, u8 is_en) { if (vft->enable) (vft->enable) (vm, is_en); + + if (vft->update_time) + session_register_update_time_fn (vft->update_time, is_en); } } @@ -643,7 +963,8 @@ 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 (); + transport_main_t *tm = &tp_main; u32 num_threads; if (smm->local_endpoints_table_buckets == 0) @@ -652,14 +973,21 @@ transport_init (void) smm->local_endpoints_table_memory = 512 << 20; /* Initialize [port-allocator] random number seed */ - port_allocator_seed = (u32) clib_cpu_time_now (); + tm->port_allocator_seed = (u32) clib_cpu_time_now (); + tm->port_allocator_min_src_port = smm->port_allocator_min_src_port; + tm->port_allocator_max_src_port = smm->port_allocator_max_src_port; - clib_bihash_init_24_8 (&local_endpoints_table, "local endpoints table", + clib_bihash_init_24_8 (&tm->local_endpoints_table, "local endpoints table", smm->local_endpoints_table_buckets, smm->local_endpoints_table_memory); + clib_spinlock_init (&tm->local_endpoints_lock); + num_threads = 1 /* main thread */ + vtm->n_threads; if (num_threads > 1) - clib_spinlock_init (&local_endpoints_lock); + { + /* Main not polled if there are workers */ + smm->transport_cl_thread = 1; + } } /*