tcp: add pacing_rate information into tcp_info

Add two new fields to struct tcp_info, to report sk_pacing_rate
and sk_max_pacing_rate to monitoring applications, as ss from iproute2.

User exported fields are 64bit, even if kernel is currently using 32bit
fields.

lpaa5:~# ss -i
..
	 skmem:(r0,rb357120,t0,tb2097152,f1584,w1980880,o0,bl0) ts sack cubic
wscale:6,6 rto:400 rtt:0.875/0.75 mss:1448 cwnd:1 ssthresh:12 send
13.2Mbps pacing_rate 3336.2Mbps unacked:15 retrans:1/5448 lost:15
rcv_space:29200

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: Ib4f3ace4059fa799fe1af94713c31efacd593aac

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 8d776ebc4829df669bbb70c4d6331ba21cc88884..374eab6b0806ffdd3be512733ec0c38ea5513650 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -185,6 +185,9 @@ struct tcp_info {
        __u32   tcpi_rcv_space;
 
        __u32   tcpi_total_retrans;
+
+       __u64   tcpi_pacing_rate;
+       __u64   tcpi_max_pacing_rate;
 };
 
 /* for TCP_MD5SIG socket option */

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 5ea70dd1b2e22037eb8698b265fd5dd323e1a931..876aa8f90054fb8007ade51754b8e0d08e56ffe9 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2770,6 +2770,11 @@ void tcp_get_info(const struct sock *sk, struct tcp_info *info)
        info->tcpi_rcv_space = tp->rcvq_space.space;
 
        info->tcpi_total_retrans = tp->total_retrans;
+
+       info->tcpi_pacing_rate = sk->sk_pacing_rate != ~0U ?
+                                       sk->sk_pacing_rate : ~0ULL;
+       info->tcpi_max_pacing_rate = sk->sk_max_pacing_rate != ~0U ?
+                                       sk->sk_max_pacing_rate : ~0ULL;
 }
 EXPORT_SYMBOL_GPL(tcp_get_info);