diff options
author | Eric Dumazet <edumazet@google.com> | 2016-02-12 01:02:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-16 20:27:35 -0500 |
commit | cd9b266095f422267bddbec88f9098b48ea548fc (patch) | |
tree | 0b7f6c9c5660fbdf2e0e78112780ce1a16eff7a3 /net/ipv4/tcp.c | |
parent | 4cba259f198b93d514ed7be44a7d679c83e7d9f1 (diff) |
tcp: add tcpi_min_rtt and tcpi_notsent_bytes to tcp_info
tcpi_min_rtt reports the minimal rtt observed by TCP stack for the flow,
in usec unit. Might be ~0U if not yet known.
tcpi_notsent_bytes reports the amount of bytes in the write queue that
were not yet sent.
This is done in a single patch to not add a temporary 32bit padding hole
in tcp_info.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 014f18e2f7b3..f93150d15199 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -2642,6 +2642,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) | |||
2642 | const struct inet_connection_sock *icsk = inet_csk(sk); | 2642 | const struct inet_connection_sock *icsk = inet_csk(sk); |
2643 | u32 now = tcp_time_stamp; | 2643 | u32 now = tcp_time_stamp; |
2644 | unsigned int start; | 2644 | unsigned int start; |
2645 | int notsent_bytes; | ||
2645 | u64 rate64; | 2646 | u64 rate64; |
2646 | u32 rate; | 2647 | u32 rate; |
2647 | 2648 | ||
@@ -2722,6 +2723,11 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) | |||
2722 | } while (u64_stats_fetch_retry_irq(&tp->syncp, start)); | 2723 | } while (u64_stats_fetch_retry_irq(&tp->syncp, start)); |
2723 | info->tcpi_segs_out = tp->segs_out; | 2724 | info->tcpi_segs_out = tp->segs_out; |
2724 | info->tcpi_segs_in = tp->segs_in; | 2725 | info->tcpi_segs_in = tp->segs_in; |
2726 | |||
2727 | notsent_bytes = READ_ONCE(tp->write_seq) - READ_ONCE(tp->snd_nxt); | ||
2728 | info->tcpi_notsent_bytes = max(0, notsent_bytes); | ||
2729 | |||
2730 | info->tcpi_min_rtt = tcp_min_rtt(tp); | ||
2725 | } | 2731 | } |
2726 | EXPORT_SYMBOL_GPL(tcp_get_info); | 2732 | EXPORT_SYMBOL_GPL(tcp_get_info); |
2727 | 2733 | ||