ss: Add tcp_info fields data_segs_in/out

tcp_info fields, data_segs_in and data_segs_out, have been added to the
kernel in commit a44d6eacdaf5 ("tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In")
since kernel 4.6.

This patch supports those fileds in ss:

ESTAB      801736 360                            face:face:face:face::1:22                                      face:face:face:face::face:46779
         cubic wscale:9,7 rto:223 rtt:22.195/8.202 ato:40 mss:1428 cwnd:11 ssthresh:7 bytes_acked:203649 bytes_received:334034603 segs_out:18513 segs_in:241825 data_segs_out:4192 data_segs_in:241672 send 5.7Mbps lastsnd:2 lastack:3 pacing_rate 6.8Mbps unacked:10 retrans:0/1 rcv_rtt:29.375 rcv_space:1241704 minrtt:0.013

Signed-off-by: Martin KaFai Lau <kafai@fb.com>

diff --git a/misc/ss.c b/misc/ss.c
index 9c456d4f1c324c03b4d05ec186d4f187201bbbd1..02be7e7407dfb938071b83909b5df9788d7d9874 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -766,6 +766,8 @@ struct tcpstat {
        unsigned long long  bytes_received;
        unsigned int        segs_out;
        unsigned int        segs_in;
+       unsigned int        data_segs_out;
+       unsigned int        data_segs_in;
        unsigned int        unacked;
        unsigned int        retrans;
        unsigned int        retrans_total;
@@ -1716,6 +1718,10 @@ static void tcp_stats_print(struct tcpstat *s)
                printf(" segs_out:%u", s->segs_out);
        if (s->segs_in)
                printf(" segs_in:%u", s->segs_in);
+       if (s->data_segs_out)
+               printf(" data_segs_out:%u", s->data_segs_out);
+       if (s->data_segs_in)
+               printf(" data_segs_in:%u", s->data_segs_in);
 
        if (s->dctcp && s->dctcp->enabled) {
                struct dctcpstat *dctcp = s->dctcp;
@@ -2022,6 +2028,8 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
                s.bytes_received = info->tcpi_bytes_received;
                s.segs_out = info->tcpi_segs_out;
                s.segs_in = info->tcpi_segs_in;
+               s.data_segs_out = info->tcpi_data_segs_out;
+               s.data_segs_in = info->tcpi_data_segs_in;
                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;