X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.c;h=d2c659495196ba21c47d97ca6f3bb51903ed7712;hb=4fde4ae0363de45d867eb3472e43b89ae34d3bd1;hp=3e723994752a198f056792ee794284ba3a353383;hpb=36ebcfffbc7ab0e83b4bb8dfaec16bf16cafb954;p=vpp.git diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 3e723994752..d2c65949519 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -17,6 +17,12 @@ #include #include +typedef struct local_endpoint_ +{ + transport_endpoint_t ep; + int refcnt; +} local_endpoint_t; + /** * Per-type vector of transport protocol virtual function tables */ @@ -35,38 +41,23 @@ static transport_endpoint_table_t local_endpoints_table; /* * Pool of local endpoints */ -static transport_endpoint_t *local_endpoints; +static local_endpoint_t *local_endpoints; /* * Local endpoints pool lock */ static clib_spinlock_t local_endpoints_lock; -/* - * Period used by transport pacers. Initialized by session layer - */ -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 (43 * TRANSPORT_PACER_MIN_MSS) - u8 * format_transport_proto (u8 * s, va_list * args) { u32 transport_proto = va_arg (*args, u32); - switch (transport_proto) - { -#define _(sym, str, sstr) \ - case TRANSPORT_PROTO_ ## sym: \ - s = format (s, str); \ - break; - foreach_transport_proto -#undef _ - default: - s = format (s, "UNKNOWN"); - 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; } @@ -74,18 +65,14 @@ u8 * format_transport_proto_short (u8 * s, va_list * args) { u32 transport_proto = va_arg (*args, u32); - switch (transport_proto) - { -#define _(sym, str, sstr) \ - case TRANSPORT_PROTO_ ## sym: \ - s = format (s, sstr); \ - break; - foreach_transport_proto -#undef _ - default: - s = format (s, "?"); - break; - } + 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; } @@ -111,7 +98,9 @@ format_transport_connection (u8 * s, va_list * args) { indent = format_get_indent (s) + 1; s = format (s, "%Upacer: %U\n", format_white_space, indent, - format_transport_pacer, &tc->pacer); + format_transport_pacer, &tc->pacer, tc->thread_index); + s = format (s, "%Utransport: flags 0x%x\n", format_white_space, indent, + tc->flags); } return s; } @@ -145,20 +134,66 @@ format_transport_half_open_connection (u8 * s, va_list * 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 *); + transport_proto_vft_t *tp_vft; + u8 longest_match = 0, match; + char *str, *str_match = 0; + transport_proto_t tp; -#define _(sym, str, sstr) \ - if (unformat (input, str)) \ - { \ - *proto = TRANSPORT_PROTO_ ## sym; \ - return 1; \ + 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; + } + } } - foreach_transport_proto -#undef _ - return 0; + 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 @@ -206,15 +241,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, @@ -228,6 +254,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 * @@ -241,12 +285,6 @@ 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) { @@ -363,44 +401,64 @@ transport_endpoint_del (u32 tepi) clib_spinlock_unlock_if_init (&local_endpoints_lock); } -always_inline transport_endpoint_t * +always_inline local_endpoint_t * transport_endpoint_new (void) { - transport_endpoint_t *tep; - pool_get_zero (local_endpoints, tep); - return tep; + local_endpoint_t *lep; + pool_get_zero (local_endpoints, lep); + return lep; } void transport_endpoint_cleanup (u8 proto, ip46_address_t * lcl_ip, u16 port) { - u32 tepi; - transport_endpoint_t *tep; + local_endpoint_t *lep; + u32 lepi; /* Cleanup local endpoint if this was an active connect */ - tepi = transport_endpoint_lookup (&local_endpoints_table, proto, lcl_ip, + lepi = transport_endpoint_lookup (&local_endpoints_table, proto, lcl_ip, clib_net_to_host_u16 (port)); - if (tepi != ENDPOINT_INVALID_INDEX) + if (lepi != ENDPOINT_INVALID_INDEX) { - tep = pool_elt_at_index (local_endpoints, tepi); - transport_endpoint_table_del (&local_endpoints_table, proto, tep); - transport_endpoint_del (tepi); + lep = pool_elt_at_index (local_endpoints, lepi); + if (!clib_atomic_sub_fetch (&lep->refcnt, 1)) + { + transport_endpoint_table_del (&local_endpoints_table, proto, + &lep->ep); + transport_endpoint_del (lepi); + } } } static void transport_endpoint_mark_used (u8 proto, ip46_address_t * ip, u16 port) { - transport_endpoint_t *tep; + local_endpoint_t *lep; 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); + lep = transport_endpoint_new (); + clib_memcpy_fast (&lep->ep.ip, ip, sizeof (*ip)); + lep->ep.port = port; + lep->refcnt = 1; + transport_endpoint_table_add (&local_endpoints_table, proto, &lep->ep, + lep - local_endpoints); clib_spinlock_unlock_if_init (&local_endpoints_lock); } +void +transport_share_local_endpoint (u8 proto, ip46_address_t * lcl_ip, u16 port) +{ + local_endpoint_t *lep; + u32 lepi; + + lepi = transport_endpoint_lookup (&local_endpoints_table, proto, lcl_ip, + clib_net_to_host_u16 (port)); + if (lepi != ENDPOINT_INVALID_INDEX) + { + lep = pool_elt_at_index (local_endpoints, lepi); + clib_atomic_add_fetch (&lep->refcnt, 1); + } +} + /** * Allocate local port and add if successful add entry to local endpoint * table to mark the pair as used. @@ -442,7 +500,7 @@ transport_alloc_local_port (u8 proto, ip46_address_t * ip) 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) @@ -450,9 +508,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 @@ -460,15 +516,13 @@ 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); + return SESSION_E_NOIP; clib_memcpy_fast (&addr->ip6, ip6, sizeof (*ip6)); } return 0; } -static clib_error_t * +static session_error_t transport_find_local_ip_for_remote (u32 sw_if_index, transport_endpoint_t * rmt, ip46_address_t * lcl_addr) @@ -488,14 +542,11 @@ 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); + return SESSION_E_NOROUTE; 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_NOINTF; } clib_memset (lcl_addr, 0, sizeof (*lcl_addr)); @@ -507,7 +558,7 @@ 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; + session_error_t error; int port; u32 tei; @@ -519,10 +570,7 @@ 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) - { - clib_error_report (error); - return -1; - } + return error; } else { @@ -538,50 +586,66 @@ transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg, { port = transport_alloc_local_port (proto, lcl_addr); 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); + *lcl_port = port; tei = transport_endpoint_lookup (&local_endpoints_table, proto, lcl_addr, port); if (tei != ENDPOINT_INVALID_INDEX) - return -1; + return SESSION_E_PORTINUSE; transport_endpoint_mark_used (proto, lcl_addr, port); - *lcl_port = port; } 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 tokens/period %.3f last_update %x", - pacer->bucket, 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 %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, 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 n_periods = (time_now - pacer->last_update); u64 inc; - if (n_periods > 0 - && (inc = (f32) n_periods * pacer->tokens_per_period) > 10) + if (PREDICT_FALSE (n_periods > pacer->idle_timeout_us)) { - pacer->last_update = norm_time_now; + 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); } @@ -596,11 +660,14 @@ spacer_update_bucket (spacer_t * pacer, u32 bytes) } static inline void -spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec) +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 / transport_pacer_period; + 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 @@ -610,75 +677,51 @@ spacer_pace_rate (spacer_t * pacer) } static inline void -spacer_reset_bucket (spacer_t * pacer, u64 norm_time_now) +spacer_reset (spacer_t * pacer, clib_us_time_t time_now, u64 bucket) { - pacer->last_update = norm_time_now; - pacer->bucket = 0; + 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; - 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; + 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, - 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) -{ - spacer_set_pace_rate (&tc->pacer, bytes_per_sec); -} - -u32 -transport_connection_tx_pacer_burst (transport_connection_t * tc, - u64 time_now) + u64 bytes_per_sec, clib_us_time_t rtt) { - time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - return spacer_max_burst (&tc->pacer, time_now); -} - -void -transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc, - u64 time_now) -{ - time_now >>= SPACER_CPU_TICKS_PER_PERIOD_SHIFT; - spacer_reset_bucket (&tc->pacer, time_now); + spacer_set_pace_rate (&tc->pacer, bytes_per_sec, rtt); } u32 -transport_connection_snd_space (transport_connection_t * tc, u64 time_now, - u16 mss) +transport_connection_tx_pacer_burst (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 < TRANSPORT_PACER_MIN_BURST) ? 0 : max_paced_burst; - snd_space = clib_min (snd_space, max_paced_burst); - return snd_space >= mss ? snd_space - snd_space % mss : snd_space; - } - return snd_space; + return spacer_max_burst (&tc->pacer, + transport_us_time_now (tc->thread_index)); } u64 @@ -702,14 +745,24 @@ transport_connection_tx_pacer_update_bytes (transport_connection_t * tc, } void -transport_init_tx_pacers_period (void) +transport_connection_reschedule (transport_connection_t * tc) { - f64 cpu_freq = os_cpu_clock_frequency (); - transport_pacer_period = cpu_freq / SPACER_CPU_TICKS_PER_PERIOD; + 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)