X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Ftransport.h;h=e5c09cd767d12c052d298a111b83abaafa1178df;hb=07063b8ea39b05d5d7bb00ad2a2363b11792c571;hp=cbe3c36734c22174b66a8c1e9e289415359823b0;hpb=dfb3b8771292e4c863ca266856aa2b5eb7cc7518;p=vpp.git diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h index cbe3c36734c..e5c09cd767d 100644 --- a/src/vnet/session/transport.h +++ b/src/vnet/session/transport.h @@ -19,13 +19,36 @@ #include #include +#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) +#define TRANSPORT_PACER_MIN_IDLE 100 +#define TRANSPORT_PACER_IDLE_FACTOR 0.05 + typedef struct _transport_options_t { + char *name; + char *short_name; transport_tx_fn_type_t tx_type; transport_service_type_t service_type; u8 half_open_has_fifos; } transport_options_t; +typedef enum transport_snd_flags_ +{ + TRANSPORT_SND_F_DESCHED = 1 << 0, + TRANSPORT_SND_F_POSTPONE = 1 << 1, + TRANSPORT_SND_N_FLAGS +} __clib_packed transport_snd_flags_t; + +typedef struct transport_send_params_ +{ + u32 snd_space; + u32 tx_offset; + u16 snd_mss; + transport_snd_flags_t flags; +} transport_send_params_t; + /* * Transport protocol virtual function table */ @@ -48,9 +71,8 @@ typedef struct _transport_proto_vft */ u32 (*push_header) (transport_connection_t * tconn, vlib_buffer_t * b); - u16 (*send_mss) (transport_connection_t * tc); - u32 (*send_space) (transport_connection_t * tc); - u32 (*tx_fifo_offset) (transport_connection_t * tc); + int (*send_params) (transport_connection_t * tconn, + transport_send_params_t *sp); void (*update_time) (f64 time_now, u8 thread_index); void (*flush_data) (transport_connection_t *tconn); int (*custom_tx) (void *session, u32 max_burst_size); @@ -144,11 +166,54 @@ transport_app_rx_evt (transport_proto_t tp, u32 conn_index, u32 thread_index) return tp_vfts[tp].app_rx_evt (tc); } +/** + * Get send parameters for transport connection + * + * These include maximum tx burst, mss, tx offset and other flags + * transport might want to provide to sessin layer + * + * @param tc transport connection + * @param sp send paramaters + * + */ +static inline u32 +transport_connection_snd_params (transport_connection_t * tc, + transport_send_params_t * sp) +{ + return tp_vfts[tc->proto].send_params (tc, sp); +} + +static inline u8 +transport_connection_is_descheduled (transport_connection_t * tc) +{ + return ((tc->flags & TRANSPORT_CONNECTION_F_DESCHED) ? 1 : 0); +} + +static inline void +transport_connection_deschedule (transport_connection_t * tc) +{ + tc->flags |= TRANSPORT_CONNECTION_F_DESCHED; +} + +void transport_connection_reschedule (transport_connection_t * tc); + +/** + * 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, fib_protocol_t fib_proto, u32 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_vft_t *transport_protocol_get_vft (transport_proto_t tp); -void transport_update_time (f64 time_now, u8 thread_index); +void transport_update_time (clib_time_type_t time_now, u8 thread_index); int transport_alloc_local_port (u8 proto, ip46_address_t * ip); int transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt, @@ -169,8 +234,9 @@ transport_elog_track_index (transport_connection_t * tc) } void transport_connection_tx_pacer_reset (transport_connection_t * tc, - u32 rate_bytes_per_sec, - u32 initial_bucket, u64 time_now); + u64 rate_bytes_per_sec, + u32 initial_bucket, + clib_us_time_t rtt); /** * Initialize tx pacer for connection * @@ -179,7 +245,7 @@ void transport_connection_tx_pacer_reset (transport_connection_t * tc, * @param burst_bytes initial burst size in bytes */ void transport_connection_tx_pacer_init (transport_connection_t * tc, - u32 rate_bytes_per_sec, + u64 rate_bytes_per_sec, u32 initial_bucket); /** @@ -187,19 +253,13 @@ void transport_connection_tx_pacer_init (transport_connection_t * tc, * * @param tc transport connection * @param bytes_per_sec new pacing rate + * @param rtt connection rtt that is used to compute + * inactivity time after which pacer bucket is + * reset to 1 mtu */ void transport_connection_tx_pacer_update (transport_connection_t * tc, - u64 bytes_per_sec); - -/** - * Get maximum tx burst allowed for transport connection - * - * @param tc transport connection - * @param time_now current cpu time as returned by @ref clib_cpu_time_now - * @param mss transport's mss - */ -u32 transport_connection_snd_space (transport_connection_t * tc, - u64 time_now, u16 mss); + u64 bytes_per_sec, + clib_us_time_t rtt); /** * Get tx pacer max burst @@ -208,8 +268,7 @@ u32 transport_connection_snd_space (transport_connection_t * tc, * @param time_now current cpu time * @return max burst for connection */ -u32 transport_connection_tx_pacer_burst (transport_connection_t * tc, - u64 time_now); +u32 transport_connection_tx_pacer_burst (transport_connection_t * tc); /** * Get tx pacer current rate @@ -220,12 +279,13 @@ u32 transport_connection_tx_pacer_burst (transport_connection_t * tc, u64 transport_connection_tx_pacer_rate (transport_connection_t * tc); /** - * Initialize period for tx pacers + * Reset tx pacer bucket * - * Defines a unit of time with respect to number of cpu cycles that is to - * be used by all tx pacers. + * @param tc transport connection + * @param bucket value the bucket will be reset to */ -void transport_init_tx_pacers_period (void); +void transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc, + u32 bucket); /** * Check if transport connection is paced