/*
- * 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:
* limitations under the License.
*/
-#include <vnet/session/transport_interface.h>
+#include <vnet/session/transport.h>
#include <vnet/session/session.h>
#include <vnet/fib/fib.h>
*/
static double transport_pacer_period;
-#define TRANSPORT_PACER_MIN_MSS 1460
-#define TRANSPORT_PACER_MIN_BURST TRANSPORT_PACER_MIN_MSS
-
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");
+#define _(sym, str, sstr) \
+ case TRANSPORT_PROTO_ ## sym: \
+ s = format (s, str); \
break;
- case TRANSPORT_PROTO_UDPC:
- s = format (s, "UDPC");
+ foreach_transport_proto
+#undef _
+ default:
+ s = format (s, "UNKNOWN");
break;
}
return s;
u32 transport_proto = va_arg (*args, u32);
switch (transport_proto)
{
- case TRANSPORT_PROTO_TCP:
- s = format (s, "T");
+#define _(sym, str, sstr) \
+ case TRANSPORT_PROTO_ ## sym: \
+ s = format (s, sstr); \
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");
+ foreach_transport_proto
+#undef _
+ default:
+ s = format (s, "?");
break;
}
return s;
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;
}
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
+
+#define _(sym, str, sstr) \
+ if (unformat (input, str)) \
+ { \
+ *proto = TRANSPORT_PROTO_ ## sym; \
+ return 1; \
+ }
+ foreach_transport_proto
+#undef _
return 0;
- return 1;
}
u32
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)
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);
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;
}
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;
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));
}
/*
format_transport_pacer (u8 * s, va_list * args)
{
spacer_t *pacer = va_arg (*args, spacer_t *);
+ vlib_main_t *vm = vlib_get_main ();
+ u64 now, diff;
- 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);
+ now = vm->clib_time.last_cpu_time;
+ diff = now - (pacer->last_update << SPACER_CPU_TICKS_PER_PERIOD_SHIFT);
+ s = format (s, "rate %u bucket %u t/p %.3f last_update %.3f",
+ pacer->bytes_per_sec, pacer->bucket, pacer->tokens_per_period,
+ diff * vm->clib_time.seconds_per_clock);
return s;
}
u64 n_periods = norm_time_now - pacer->last_update;
u64 inc;
- if (n_periods > 0 && (inc = n_periods * pacer->tokens_per_period) > 10)
+ if (PREDICT_FALSE (n_periods > 5e5))
+ {
+ pacer->last_update = norm_time_now;
+ pacer->bucket = TRANSPORT_PACER_MIN_BURST;
+ return TRANSPORT_PACER_MIN_BURST;
+ }
+
+ if (n_periods > 0
+ && (inc = (f32) n_periods * pacer->tokens_per_period) > 10)
{
pacer->last_update = norm_time_now;
- pacer->bucket += inc;
+ pacer->bucket = clib_min (pacer->bucket + inc, pacer->bytes_per_sec);
}
- return clib_min (pacer->bucket, pacer->max_burst_size);
+ return clib_min (pacer->bucket, TRANSPORT_PACER_MAX_BURST);
}
static inline void
}
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)
{
- pacer->max_burst_size = clib_max (max_burst_bytes,
- TRANSPORT_PACER_MIN_BURST);
+ 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;
+}
+
+static inline u64
+spacer_pace_rate (spacer_t * pacer)
+{
+ return pacer->bytes_per_sec;
}
static inline void
-spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec)
+spacer_reset_bucket (spacer_t * pacer, u64 norm_time_now)
{
- ASSERT (rate_bytes_per_sec != 0);
- pacer->tokens_per_period = rate_bytes_per_sec / transport_pacer_period;
+ pacer->last_update = norm_time_now;
+ pacer->bucket = 0;
}
void
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;
transport_connection_tx_pacer_update (transport_connection_t * tc,
u64 bytes_per_sec)
{
- 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);
}
u32
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);
+}
+
u32
transport_connection_snd_space (transport_connection_t * tc, u64 time_now,
u16 mss)
u32 snd_space, max_paced_burst;
snd_space = tp_vfts[tc->proto].send_space (tc);
- if (transport_connection_is_tx_paced (tc))
+ if (snd_space && 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;
+ max_paced_burst =
+ (max_paced_burst < TRANSPORT_PACER_MIN_BURST) ? 0 : max_paced_burst;
snd_space = clib_min (snd_space, max_paced_burst);
- snd_space = snd_space - snd_space % mss;
+ return snd_space >= mss ? snd_space - snd_space % mss : snd_space;
}
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)
+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);
}
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)
Code Review / vpp.git / blobdiff