diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-10-16 19:28:17 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-10-17 18:42:18 +0000 |
| commit | cb711a4ec908b89edc9da29d3c2e093dab85fbbf (patch) | |
| tree | f1243df614041ccd384ff88e078ab490f668591c /src/vnet/tcp/tcp_output.c | |
| parent | ec44e263728e6795f77e1d16d6c07eeb093b4f34 (diff) | |
tcp: avoid sending acks when data available
Type: fix
Change-Id: I02e2cb2d349f9ddb2bfed040a08ca448f379d565
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/tcp/tcp_output.c')
| -rw-r--r-- | src/vnet/tcp/tcp_output.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 08099fffa4e..6ba0ee28f13 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -518,7 +518,6 @@ tcp_compute_checksum (tcp_connection_t * tc, vlib_buffer_t * b) return checksum; } - /** * Prepare ACK */ @@ -1086,6 +1085,10 @@ tcp_send_fin (tcp_connection_t * tc) return; } + /* If we have non-dupacks programmed, no need to send them */ + if ((tc->flags & TCP_CONN_SNDACK) && !tc->pending_dupacks) + tc->flags &= ~TCP_CONN_SNDACK; + tcp_retransmit_timer_force_update (tc); b = vlib_get_buffer (vm, bi); tcp_init_buffer (vm, b); @@ -1165,7 +1168,6 @@ tcp_push_hdr_i (tcp_connection_t * tc, vlib_buffer_t * b, u32 snd_nxt, tc->bytes_out += data_len; tc->data_segs_out += 1; - th->checksum = tcp_compute_checksum (tc, b); TCP_EVT (TCP_EVT_PKTIZE, tc); @@ -1883,6 +1885,13 @@ tcp_retransmit_should_retry_head (tcp_connection_t * tc, return (tx_adv_sack > (tc->snd_una - tc->prr_start) * rr); } +static inline u8 +tcp_max_tx_deq (tcp_connection_t * tc) +{ + return (transport_max_tx_dequeue (&tc->connection) + - (tc->snd_nxt - tc->snd_una)); +} + #define scoreboard_rescue_rxt_valid(_sb, _tc) \ (seq_geq (_sb->rescue_rxt, _tc->snd_una) \ && seq_leq (_sb->rescue_rxt, _tc->snd_congestion)) @@ -2145,8 +2154,13 @@ tcp_send_acks (tcp_connection_t * tc, u32 max_burst_size) if (!tc->pending_dupacks) { - tcp_send_ack (tc); - return 1; + if (tcp_in_cong_recovery (tc) || !tcp_max_tx_deq (tc) + || tc->state != TCP_STATE_ESTABLISHED) + { + tcp_send_ack (tc); + return 1; + } + return 0; } /* If we're supposed to send dupacks but have no ooo data @@ -2154,6 +2168,7 @@ tcp_send_acks (tcp_connection_t * tc, u32 max_burst_size) if (!vec_len (tc->snd_sacks)) { tcp_send_ack (tc); + tc->pending_dupacks = 0; return 1; } |