diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/tcp/tcp.h | 3 | ||||
| -rwxr-xr-x | src/vnet/tcp/tcp_input.c | 7 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_output.c | 18 |
3 files changed, 18 insertions, 10 deletions
diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 4b0a0ddea53..f40388721b6 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -882,7 +882,8 @@ tcp_bytes_out (const tcp_connection_t * tc) if (tcp_opts_sack_permitted (&tc->rcv_opts)) return tc->sack_sb.sacked_bytes + tc->sack_sb.lost_bytes; else - return tc->rcv_dupacks * tc->snd_mss; + return clib_min (tc->rcv_dupacks * tc->snd_mss, + tc->snd_nxt - tc->snd_una); } /** diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 15dae3d7413..08cea1e75d0 100755 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -1483,9 +1483,12 @@ tcp_cc_handle_event (tcp_connection_t * tc, tcp_rate_sample_t * rs, tc->rxt_delivered = clib_max (tc->rxt_delivered + tc->bytes_acked, tc->snd_rxt_bytes); if (is_dack) - tc->prr_delivered += 1; + tc->prr_delivered += clib_min (tc->snd_mss, + tc->snd_nxt - tc->snd_una); else - tc->prr_delivered += tc->bytes_acked - tc->snd_mss * tc->rcv_dupacks; + tc->prr_delivered += tc->bytes_acked - clib_min (tc->bytes_acked, + tc->snd_mss * + tc->rcv_dupacks); /* If partial ack, assume that the first un-acked segment was lost */ if (tc->bytes_acked || tc->rcv_dupacks == TCP_DUPACK_THRESHOLD) diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index c7e9792afaa..14d1bd6391e 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -1911,8 +1911,8 @@ tcp_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, && tc->rxt_head != tc->snd_una && tcp_retransmit_should_retry_head (tc, sb)) { - n_written = tcp_prepare_retransmit_segment (wrk, tc, 0, tc->snd_mss, - &b); + max_bytes = clib_min (tc->snd_mss, tc->snd_congestion - tc->snd_una); + n_written = tcp_prepare_retransmit_segment (wrk, tc, 0, max_bytes, &b); if (!n_written) { tcp_program_retransmit (tc); @@ -2036,14 +2036,14 @@ static int tcp_retransmit_no_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, u32 burst_size) { - u32 n_written = 0, offset = 0, bi, max_deq, n_segs_now; + u32 n_written = 0, offset = 0, bi, max_deq, n_segs_now, max_bytes; u32 burst_bytes, sent_bytes; vlib_main_t *vm = wrk->vm; int snd_space, n_segs = 0; u8 cc_limited = 0; vlib_buffer_t *b; - ASSERT (tcp_in_fastrecovery (tc)); + ASSERT (tcp_in_cong_recovery (tc)); TCP_EVT (TCP_EVT_CC_EVT, tc, 0); burst_bytes = transport_connection_tx_pacer_burst (&tc->connection); @@ -2064,8 +2064,12 @@ tcp_retransmit_no_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, * segment. */ while (snd_space > 0 && n_segs < burst_size) { - n_written = tcp_prepare_retransmit_segment (wrk, tc, offset, - tc->snd_mss, &b); + max_bytes = clib_min (tc->snd_mss, + tc->snd_congestion - tc->snd_una - offset); + if (!max_bytes) + break; + n_written = tcp_prepare_retransmit_segment (wrk, tc, offset, max_bytes, + &b); /* Nothing left to retransmit */ if (n_written == 0) @@ -2094,7 +2098,7 @@ send_unsent: snd_space = clib_min (max_deq, snd_space); burst_size = clib_min (burst_size - n_segs, snd_space / tc->snd_mss); n_segs_now = tcp_transmit_unsent (wrk, tc, burst_size); - if (max_deq > n_segs_now * tc->snd_mss) + if (n_segs_now && max_deq > n_segs_now * tc->snd_mss) tcp_program_retransmit (tc); n_segs += n_segs_now; } |