tcp: expose both send and receive intervals for rate sample

Congestion control algorithms, which access the rate sample
through the tcp_cong_control function, only have access to the maximum
of the send and receive interval, for cases where the acknowledgment
rate may be inaccurate due to ACK compression or decimation. Algorithms
may want to use send rates and receive rates as separate signals.

Signed-off-by: Deepti Raghavan <deeptir@mit.edu>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index cce37694776e13f8c2430aaee191ced5aa7120c0..f6cb20e6e524018e0e98d8e0dce342f27dae660b 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -954,6 +954,8 @@ struct rate_sample {
        u32  prior_delivered;   /* tp->delivered at "prior_mstamp" */
        s32  delivered;         /* number of packets delivered over interval */
        long interval_us;       /* time for tp->delivered to incr "delivered" */
+       u32 snd_interval_us;    /* snd interval for delivered packets */
+       u32 rcv_interval_us;    /* rcv interval for delivered packets */
        long rtt_us;            /* RTT of last (S)ACKed packet (or -1) */
        int  losses;            /* number of packets marked lost upon ACK */
        u32  acked_sacked;      /* number of packets newly (S)ACKed upon ACK */

diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
index c61240e43923d6dd6a5d6215074e2da2c2bc71f4..4dff40dad4dc5ccc372f5108b0d6ba38497ab81f 100644 (file)
--- a/net/ipv4/tcp_rate.c
+++ b/net/ipv4/tcp_rate.c
@@ -146,6 +146,10 @@ void tcp_rate_gen(struct sock *sk, u32 delivered, u32 lost,
                                    rs->prior_mstamp); /* ack phase */
        rs->interval_us = max(snd_us, ack_us);
 
+       /* Record both segment send and ack receive intervals */
+       rs->snd_interval_us = snd_us;
+       rs->rcv_interval_us = ack_us;
+
        /* Normally we expect interval_us >= min-rtt.
         * Note that rate may still be over-estimated when a spuriously
         * retransmistted skb was first (s)acked because "interval_us"