From be72ae6149a432899698a887b1820cf5c9d9456f Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 1 Nov 2018 11:23:03 -0700 Subject: tcp: minimize use of tls Also propagate tcp worker context instead of retrieving it multiple times. Change-Id: I7b273b981826b37783566d0172a64cd6957f3b33 Signed-off-by: Florin Coras --- src/vnet/tcp/tcp.h | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'src/vnet/tcp/tcp.h') diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index f7424c3202e..71af461aca3 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -470,6 +470,12 @@ vnet_get_tcp_main () return &tcp_main; } +always_inline tcp_worker_ctx_t * +tcp_get_worker (u32 thread_index) +{ + return &tcp_main.wrk_ctx[thread_index]; +} + always_inline tcp_header_t * tcp_buffer_hdr (vlib_buffer_t * b) { @@ -559,10 +565,11 @@ void tcp_send_fin (tcp_connection_t * tc); void tcp_init_mss (tcp_connection_t * tc); void tcp_update_burst_snd_vars (tcp_connection_t * tc); void tcp_update_rto (tcp_connection_t * tc); -void tcp_flush_frame_to_output (vlib_main_t * vm, u8 thread_index, u8 is_ip4); -void tcp_flush_frames_to_output (u8 thread_index); -void tcp_program_fastretransmit (tcp_connection_t * tc); -void tcp_do_fastretransmits (u32 thread_index); +void tcp_flush_frame_to_output (tcp_worker_ctx_t * wrk, u8 is_ip4); +void tcp_flush_frames_to_output (tcp_worker_ctx_t * wrk); +void tcp_program_fastretransmit (tcp_worker_ctx_t * wrk, + tcp_connection_t * tc); +void tcp_do_fastretransmits (tcp_worker_ctx_t * wrk); always_inline u32 tcp_end_seq (tcp_header_t * th, u32 len) @@ -680,10 +687,14 @@ tcp_is_lost_fin (tcp_connection_t * tc) } u32 tcp_snd_space (tcp_connection_t * tc); -int tcp_retransmit_first_unacked (tcp_connection_t * tc); -int tcp_fast_retransmit_no_sack (tcp_connection_t * tc, u32 burst_size); -int tcp_fast_retransmit_sack (tcp_connection_t * tc, u32 burst_size); -int tcp_fast_retransmit (tcp_connection_t * tc, u32 burst_size); +int tcp_retransmit_first_unacked (tcp_worker_ctx_t * wrk, + tcp_connection_t * tc); +int tcp_fast_retransmit_no_sack (tcp_worker_ctx_t * wrk, + tcp_connection_t * tc, u32 burst_size); +int tcp_fast_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, + u32 burst_size); +int tcp_fast_retransmit (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, + u32 burst_size); void tcp_cc_init_congestion (tcp_connection_t * tc); void tcp_cc_fastrecovery_exit (tcp_connection_t * tc); @@ -699,6 +710,12 @@ tcp_time_now (void) return tcp_main.wrk_ctx[vlib_get_thread_index ()].time_now; } +always_inline u32 +tcp_time_now_w_thread (u32 thread_index) +{ + return tcp_main.wrk_ctx[thread_index].time_now; +} + always_inline f64 tcp_time_now_us (u32 thread_index) { @@ -706,11 +723,10 @@ tcp_time_now_us (u32 thread_index) } always_inline u32 -tcp_set_time_now (u32 thread_index) +tcp_set_time_now (tcp_worker_ctx_t * wrk) { - tcp_main.wrk_ctx[thread_index].time_now = clib_cpu_time_now () - * tcp_main.tstamp_ticks_per_clock; - return tcp_main.wrk_ctx[thread_index].time_now; + wrk->time_now = clib_cpu_time_now () * tcp_main.tstamp_ticks_per_clock; + return wrk->time_now; } u32 tcp_push_header (tcp_connection_t * tconn, vlib_buffer_t * b); -- cgit 1.2.3-korg