tcp: ignore rcv_rtt sample with old ts ecr value

When receiving multiple packets with the same ts ecr value, only try
to compute rcv_rtt sample with the earliest received packet.
This is because the rcv_rtt calculated by later received packets
could possibly include long idle time or other types of delay.
For example:
(1) server sends last packet of reply with TS val V1
(2) client ACKs last packet of reply with TS ecr V1
(3) long idle time passes
(4) client sends next request data packet with TS ecr V1 (again!)
At this time, the rcv_rtt computed on server with TS ecr V1 will be
inflated with the idle time and should get ignored.

Signed-off-by: Wei Wang <weiwan@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 13 insertions, 3 deletions

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 72705eaf4b84..3dbea6610304 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -350,6 +350,7 @@ struct tcp_sock {
 #endif
 
 /* Receiver side RTT estimation */
+        u32 rcv_rtt_last_tsecr;
         struct {
                 u32     rtt_us;
                 u32     seq;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 141acd92e58a..47c45d5be9f9 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2563,6 +2563,7 @@ int tcp_disconnect(struct sock *sk, int flags)
         sk->sk_shutdown = 0;
         sock_reset_flag(sk, SOCK_DONE);
         tp->srtt_us = 0;
+        tp->rcv_rtt_last_tsecr = 0;
         tp->write_seq += tp->max_window + 2;
         if (tp->write_seq == 0)
                 tp->write_seq = 1;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 355d3dffd021..76ca88f63b70 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -582,9 +582,12 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
-        if (tp->rx_opt.rcv_tsecr &&
-            (TCP_SKB_CB(skb)->end_seq -
-             TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss)) {
+        if (tp->rx_opt.rcv_tsecr == tp->rcv_rtt_last_tsecr)
+                return;
+        tp->rcv_rtt_last_tsecr = tp->rx_opt.rcv_tsecr;
+
+        if (TCP_SKB_CB(skb)->end_seq -
+            TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss) {
                 u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr;
                 u32 delta_us;
 
@@ -5475,6 +5478,11 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
                                 tcp_ack(sk, skb, 0);
                                 __kfree_skb(skb);
                                 tcp_data_snd_check(sk);
+                                /* When receiving pure ack in fast path, update
+                                 * last ts ecr directly instead of calling
+                                 * tcp_rcv_rtt_measure_ts()
+                                 */
+                                tp->rcv_rtt_last_tsecr = tp->rx_opt.rcv_tsecr;
                                 return;
                         } else { /* Header too small */
                                 TCP_INC_STATS(sock_net(sk), TCP_MIB_INERRS);