tcp: do not cancel delay-AcK on DCTCP special ACK
authorYuchung Cheng <ycheng@google.com>
Wed, 18 Jul 2018 20:56:35 +0000 (13:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Jul 2018 21:32:23 +0000 (14:32 -0700)
commit27cde44a259c380a3c09066fc4b42de7dde9b1ad
tree2f0249f49428f487fcda2249b5dab4d82dd8e514
parent2987babb6982306509380fc11b450227a844493b
tcp: do not cancel delay-AcK on DCTCP special ACK

Currently when a DCTCP receiver delays an ACK and receive a
data packet with a different CE mark from the previous one's, it
sends two immediate ACKs acking previous and latest sequences
respectly (for ECN accounting).

Previously sending the first ACK may mark off the delayed ACK timer
(tcp_event_ack_sent). This may subsequently prevent sending the
second ACK to acknowledge the latest sequence (tcp_ack_snd_check).
The culprit is that tcp_send_ack() assumes it always acknowleges
the latest sequence, which is not true for the first special ACK.

The fix is to not make the assumption in tcp_send_ack and check the
actual ack sequence before cancelling the delayed ACK. Further it's
safer to pass the ack sequence number as a local variable into
tcp_send_ack routine, instead of intercepting tp->rcv_nxt to avoid
future bugs like this.

Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/tcp.h
net/ipv4/tcp_dctcp.c
net/ipv4/tcp_output.c