X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_output.c;h=235a59be0b3d7ee290d08c21bb2cb61b136d1749;hb=6809538e646bf86c000dc1faba60b0a4157ad898;hp=a21c012b5b7163c02db769e4a02a6a3d066ccba5;hpb=573f44c2f5c883753bc9880eead1bd662586521d;p=vpp.git diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index a21c012b5b7..235a59be0b3 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include typedef enum _tcp_output_next { @@ -120,11 +122,6 @@ tcp_update_rcv_wnd (tcp_connection_t * tc) * Figure out how much space we have available */ available_space = transport_max_rx_enqueue (&tc->connection); - if (PREDICT_FALSE (available_space < tc->rcv_opts.mss)) - { - tc->rcv_wnd = 0; - return; - } /* * Use the above and what we know about what we've previously advertised @@ -132,24 +129,22 @@ tcp_update_rcv_wnd (tcp_connection_t * tc) */ observed_wnd = (i32) tc->rcv_wnd - (tc->rcv_nxt - tc->rcv_las); - /* Bad. Thou shalt not shrink */ + /* Check if we are about to retract the window. Do the comparison before + * rounding to avoid errors. Per RFC7323 sec. 2.4 we could remove this */ if (PREDICT_FALSE ((i32) available_space < observed_wnd)) { - wnd = clib_max (observed_wnd, 0); + wnd = round_down_pow2 (clib_max (observed_wnd, 0), 1 << tc->rcv_wscale); TCP_EVT (TCP_EVT_RCV_WND_SHRUNK, tc, observed_wnd, available_space); } else { - wnd = available_space; + /* Make sure we have a multiple of 1 << rcv_wscale. We round down to + * avoid advertising a window larger than what can be buffered */ + wnd = round_down_pow2 (available_space, 1 << tc->rcv_wscale); } - /* Make sure we have a multiple of rcv_wscale */ - if (wnd && tc->rcv_wscale) - { - wnd &= ~((1 << tc->rcv_wscale) - 1); - if (wnd == 0) - wnd = 1 << tc->rcv_wscale; - } + if (PREDICT_FALSE (wnd < tc->rcv_opts.mss)) + wnd = 0; tc->rcv_wnd = clib_min (wnd, TCP_WND_MAX << tc->rcv_wscale); } @@ -328,6 +323,13 @@ tcp_update_burst_snd_vars (tcp_connection_t * tc) tcp_cc_event (tc, TCP_CC_EVT_START_TX); tcp_connection_tx_pacer_reset (tc, tc->cwnd, TRANSPORT_PACER_MIN_BURST); } + + if (tc->flags & TCP_CONN_PSH_PENDING) + { + u32 max_deq = transport_max_tx_dequeue (&tc->connection); + /* Last byte marked for push */ + tc->psh_seq = tc->snd_una + max_deq - 1; + } } #endif /* CLIB_MARCH_VARIANT */ @@ -428,7 +430,7 @@ tcp_compute_checksum (tcp_connection_t * tc, vlib_buffer_t * b) } else { - b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM; + vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TCP_CKSUM); } return checksum; } @@ -671,7 +673,10 @@ tcp_send_reset_w_pkt (tcp_connection_t * tc, vlib_buffer_t * pkt, fib_protocol_t fib_proto; if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return; + } b = vlib_get_buffer (vm, bi); sw_if_index = vnet_buffer (pkt)->sw_if_index[VLIB_RX]; @@ -752,7 +757,10 @@ tcp_send_reset (tcp_connection_t * tc) u8 flags; if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return; + } b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); @@ -814,6 +822,7 @@ tcp_send_syn (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, 1); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -839,11 +848,13 @@ tcp_send_synack (tcp_connection_t * tc) vlib_buffer_t *b; u32 bi; - tcp_retransmit_timer_force_update (&wrk->timer_wheel, tc); + ASSERT (tc->snd_una != tc->snd_nxt); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, 1); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -880,6 +891,7 @@ tcp_send_fin (tcp_connection_t * tc) else /* Make sure retransmit retries a fin not data */ tc->flags |= TCP_CONN_FINSNT; + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -887,7 +899,6 @@ tcp_send_fin (tcp_connection_t * tc) if ((tc->flags & TCP_CONN_SNDACK) && !tc->pending_dupacks) tc->flags &= ~TCP_CONN_SNDACK; - tcp_retransmit_timer_force_update (&wrk->timer_wheel, tc); b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); tcp_make_fin (tc, b); @@ -895,11 +906,11 @@ tcp_send_fin (tcp_connection_t * tc) TCP_EVT (TCP_EVT_FIN_SENT, tc); /* Account for the FIN */ tc->snd_nxt += 1; + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); if (!fin_snt) { tc->flags |= TCP_CONN_FINSNT; tc->flags &= ~TCP_CONN_FINPNDG; - tc->snd_una_max = seq_max (tc->snd_una_max, tc->snd_nxt); } } @@ -991,8 +1002,7 @@ tcp_session_push_header (transport_connection_t * tconn, vlib_buffer_t * b) tcp_push_hdr_i (tc, b, tc->snd_nxt, /* compute opts */ 0, /* burst */ 1, /* update_snd_nxt */ 1); - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); - tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + tcp_validate_txf_size (tc, tc->snd_nxt - tc->snd_una); /* If not tracking an ACK, start tracking */ if (tc->rtt_ts == 0 && !tcp_in_cong_recovery (tc)) { @@ -1020,6 +1030,7 @@ tcp_send_ack (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_update_rcv_wnd (tc); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } b = vlib_get_buffer (vm, bi); @@ -1060,17 +1071,6 @@ tcp_program_retransmit (tcp_connection_t * tc) } } -/** - * Delayed ack timer handler - * - * Sends delayed ACK when timer expires - */ -void -tcp_timer_delack_handler (tcp_connection_t * tc) -{ - tcp_send_ack (tc); -} - /** * Send window update ack * @@ -1129,7 +1129,10 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, if (PREDICT_TRUE (seg_size <= bytes_per_buffer)) { if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) - return 0; + { + tcp_worker_stats_inc (wrk, no_buffer, 1); + return 0; + } *b = vlib_get_buffer (vm, bi); data = tcp_init_buffer (vm, *b); n_bytes = session_tx_fifo_peek_bytes (&tc->connection, data, offset, @@ -1156,6 +1159,7 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, { if (n_bufs) vlib_buffer_free (vm, wrk->tx_buffers, n_bufs); + tcp_worker_stats_inc (wrk, no_buffer, 1); return 0; } @@ -1294,6 +1298,7 @@ tcp_cc_init_rxt_timeout (tcp_connection_t * tc) tc->rtt_ts = 0; tc->cwnd_acc_bytes = 0; tc->tr_occurences += 1; + tc->sack_sb.reorder = TCP_DUPACK_THRESHOLD; tcp_recovery_on (tc); } @@ -1328,11 +1333,8 @@ tcp_timer_retransmit_handler (tcp_connection_t * tc) return; } - /* Shouldn't be here. This condition is tricky because it has to take - * into account boff > 0 due to persist timeout. */ - if ((tc->rto_boff == 0 && tc->snd_una == tc->snd_nxt) - || (tc->rto_boff > 0 && seq_geq (tc->snd_una, tc->snd_congestion) - && !tcp_flight_size (tc))) + /* Shouldn't be here */ + if (tc->snd_una == tc->snd_nxt) { ASSERT (!tcp_in_recovery (tc)); tc->rto_boff = 0; @@ -1382,7 +1384,7 @@ tcp_timer_retransmit_handler (tcp_connection_t * tc) tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); tc->rto = clib_min (tc->rto << 1, TCP_RTO_MAX); - tcp_retransmit_timer_force_update (&wrk->timer_wheel, tc); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); tc->rto_boff += 1; if (tc->rto_boff == 1) @@ -1417,6 +1419,7 @@ tcp_timer_retransmit_handler (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT, 1); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1424,7 +1427,8 @@ tcp_timer_retransmit_handler (tcp_connection_t * tc) if (tc->rto_boff > TCP_RTO_SYN_RETRIES) tc->rto = clib_min (tc->rto << 1, TCP_RTO_MAX); - tcp_retransmit_timer_force_update (&wrk->timer_wheel, tc); + ASSERT (tc->snd_una != tc->snd_nxt); + tcp_retransmit_timer_update (&wrk->timer_wheel, tc); b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); @@ -1480,6 +1484,7 @@ tcp_timer_retransmit_syn_handler (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_timer_update (&wrk->timer_wheel, tc, TCP_TIMER_RETRANSMIT_SYN, 1); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1547,6 +1552,7 @@ tcp_timer_persist_handler (tcp_connection_t * tc) if (PREDICT_FALSE (!vlib_buffer_alloc (vm, &bi, 1))) { tcp_persist_timer_set (&wrk->timer_wheel, tc); + tcp_worker_stats_inc (wrk, no_buffer, 1); return; } @@ -1561,7 +1567,7 @@ tcp_timer_persist_handler (tcp_connection_t * tc) max_snd_bytes); b->current_length = n_bytes; ASSERT (n_bytes != 0 && (tcp_timer_is_active (tc, TCP_TIMER_RETRANSMIT) - || tc->snd_nxt == tc->snd_una_max + || tc->snd_una == tc->snd_nxt || tc->rto_boff > 1)); if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) @@ -1572,8 +1578,7 @@ tcp_timer_persist_handler (tcp_connection_t * tc) tcp_push_hdr_i (tc, b, tc->snd_nxt, /* compute opts */ 0, /* burst */ 0, /* update_snd_nxt */ 1); - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); - tcp_validate_txf_size (tc, tc->snd_una_max - tc->snd_una); + tcp_validate_txf_size (tc, tc->snd_nxt - tc->snd_una); tcp_enqueue_to_output (wrk, b, bi, tc->c_is_ip4); /* Just sent new data, enable retransmit */ @@ -1639,7 +1644,6 @@ tcp_transmit_unsent (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, tcp_bt_track_tx (tc, n_written); tc->snd_nxt += n_written; - tc->snd_una_max = seq_max (tc->snd_nxt, tc->snd_una_max); } done: