diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-11-22 17:38:25 -0800 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2020-08-12 01:22:20 +0000 |
| commit | 29cd29616d2c4f80e669e11efb46e67db7124813 (patch) | |
| tree | 89639407974f25c381e2cbd6c757eea433a49ca4 /src/vnet/tcp/tcp_output.c | |
| parent | ec1e751445d1e068f4f312b70ce2f67e10e42ca6 (diff) | |
tcp: invalidate expired timer handles before dispatching
Type: fix
Change-Id: Icc8cd05cb9c1844a9f8b0399797ad554f4ccf1a1
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit b72a0ff73514ec7ea79ed3fad49b77d56b248642)
Diffstat (limited to 'src/vnet/tcp/tcp_output.c')
| -rw-r--r-- | src/vnet/tcp/tcp_output.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 4ba127cbd67..1dc629d45c6 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -1218,13 +1218,11 @@ tcp_program_retransmit (tcp_connection_t * tc) * Sends delayed ACK when timer expires */ void -tcp_timer_delack_handler (u32 index) +tcp_timer_delack_handler (u32 index, u32 thread_index) { - u32 thread_index = vlib_get_thread_index (); tcp_connection_t *tc; tc = tcp_connection_get (index, thread_index); - tc->timers[TCP_TIMER_DELACK] = TCP_TIMER_HANDLE_INVALID; tcp_send_ack (tc); } @@ -1454,9 +1452,8 @@ tcp_cc_init_rxt_timeout (tcp_connection_t * tc) } void -tcp_timer_retransmit_handler (u32 tc_index) +tcp_timer_retransmit_handler (u32 tc_index, u32 thread_index) { - u32 thread_index = vlib_get_thread_index (); tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); vlib_main_t *vm = wrk->vm; tcp_connection_t *tc; @@ -1469,8 +1466,6 @@ tcp_timer_retransmit_handler (u32 tc_index) if (PREDICT_FALSE (tc == 0 || tc->state == TCP_STATE_SYN_SENT)) return; - tc->timers[TCP_TIMER_RETRANSMIT] = TCP_TIMER_HANDLE_INVALID; - /* Wait-close and retransmit could pop at the same time */ if (tc->state == TCP_STATE_CLOSED) return; @@ -1603,9 +1598,8 @@ tcp_timer_retransmit_handler (u32 tc_index) * SYN retransmit timer handler. Active open only. */ void -tcp_timer_retransmit_syn_handler (u32 tc_index) +tcp_timer_retransmit_syn_handler (u32 tc_index, u32 thread_index) { - u32 thread_index = vlib_get_thread_index (); tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); vlib_main_t *vm = wrk->vm; tcp_connection_t *tc; @@ -1618,8 +1612,6 @@ tcp_timer_retransmit_syn_handler (u32 tc_index) if (PREDICT_FALSE (tc == 0 || tc->state != TCP_STATE_SYN_SENT)) return; - tc->timers[TCP_TIMER_RETRANSMIT_SYN] = TCP_TIMER_HANDLE_INVALID; - /* Half-open connection actually moved to established but we were * waiting for syn retransmit to pop to call cleanup from the right * thread. */ @@ -1672,9 +1664,8 @@ tcp_timer_retransmit_syn_handler (u32 tc_index) * */ void -tcp_timer_persist_handler (u32 index) +tcp_timer_persist_handler (u32 index, u32 thread_index) { - u32 thread_index = vlib_get_thread_index (); tcp_worker_ctx_t *wrk = tcp_get_worker (thread_index); u32 bi, max_snd_bytes, available_bytes, offset; tcp_main_t *tm = vnet_get_tcp_main (); @@ -1688,9 +1679,6 @@ tcp_timer_persist_handler (u32 index) if (!tc) return; - /* Make sure timer handle is set to invalid */ - tc->timers[TCP_TIMER_PERSIST] = TCP_TIMER_HANDLE_INVALID; - /* Problem already solved or worse */ if (tc->state == TCP_STATE_CLOSED || tc->snd_wnd > tc->snd_mss || (tc->flags & TCP_CONN_FINSNT)) |