From: Neal Cardwell Date: Thu, 1 Dec 2016 18:21:39 +0000 (-0500) Subject: ss: print new tcp_info fields: delivery_rate and app_limited X-Git-Tag: v4.10.0~117 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f579872fbdca52ef960eb969655adfd55c13308;p=thirdparty%2Fiproute2.git ss: print new tcp_info fields: delivery_rate and app_limited Dump the new delivery_rate and delivery_rate_app_limited fields that were added to tcp_info in Linux v4.9. Example output: pacing_rate 65.7Mbps delivery_rate 62.9Mbps And for the application-limited case this looks like: pacing_rate 1031.1Mbps delivery_rate 87.4Mbps app_limited Signed-off-by: Neal Cardwell Signed-off-by: Yuchung Cheng Signed-off-by: Eric Dumazet Signed-off-by: Soheil Hassas Yeganeh --- diff --git a/misc/ss.c b/misc/ss.c index c36508a6c..7f039859f 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -799,6 +799,7 @@ struct tcpstat { unsigned int lastack; double pacing_rate; double pacing_rate_max; + double delivery_rate; unsigned long long bytes_acked; unsigned long long bytes_received; unsigned int segs_out; @@ -822,6 +823,7 @@ struct tcpstat { bool has_ecnseen_opt; bool has_fastopen_opt; bool has_wscale_opt; + bool app_limited; struct dctcpstat *dctcp; struct tcp_bbr_info *bbr_info; }; @@ -1973,6 +1975,11 @@ static void tcp_stats_print(struct tcpstat *s) s->pacing_rate_max)); } + if (s->delivery_rate) + printf(" delivery_rate %sbps", sprint_bw(b1, s->delivery_rate)); + if (s->app_limited) + printf(" app_limited"); + if (s->unacked) printf(" unacked:%u", s->unacked); if (s->retrans || s->retrans_total) @@ -2274,6 +2281,8 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r, s.not_sent = info->tcpi_notsent_bytes; if (info->tcpi_min_rtt && info->tcpi_min_rtt != ~0U) s.min_rtt = (double) info->tcpi_min_rtt / 1000; + s.delivery_rate = info->tcpi_delivery_rate * 8.; + s.app_limited = info->tcpi_delivery_rate_app_limited; tcp_stats_print(&s); free(s.dctcp); free(s.bbr_info);