diff mbox

[iproute2] ss: add support for segs_in and segs_out

Message ID 1432666481-1582-1-git-send-email-kraig@google.com
State Accepted, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Craig Gallek May 26, 2015, 6:54 p.m. UTC
Two new tcp_info fields: tcpi_segs_in and tcpi_segs_out.
(2efd055c53c06b7e89c167c98069bab9afce7e59)

~: ss -ti src :22
	 cubic wscale:7,6 rto:201 rtt:0.244/0.012 ato:40 mss:1418 cwnd:21 bytes_acked:80605 bytes_received:20491 segs_out:414 segs_in:600 send 976.3Mbps lastsnd:23 lastrcv:23 lastack:22 pacing_rate 1952.7Mbps rcv_rtt:98 rcv_space:28960

Signed-off-by: Craig Gallek <kraig@google.com>
---
 include/linux/tcp.h | 4 +++-
 misc/ss.c           | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

Comments

Marcelo Leitner May 26, 2015, 7:01 p.m. UTC | #1
On Tue, May 26, 2015 at 02:54:41PM -0400, Craig Gallek wrote:
> Two new tcp_info fields: tcpi_segs_in and tcpi_segs_out.
> (2efd055c53c06b7e89c167c98069bab9afce7e59)
> 
> ~: ss -ti src :22
> 	 cubic wscale:7,6 rto:201 rtt:0.244/0.012 ato:40 mss:1418 cwnd:21 bytes_acked:80605 bytes_received:20491 segs_out:414 segs_in:600 send 976.3Mbps lastsnd:23 lastrcv:23 lastack:22 pacing_rate 1952.7Mbps rcv_rtt:98 rcv_space:28960
> 
> Signed-off-by: Craig Gallek <kraig@google.com>

Cool, thanks Craig.

Reviewed-by: Marcelo Ricardo Leitner <mleitner@redhat.com>

> ---
>  include/linux/tcp.h | 4 +++-
>  misc/ss.c           | 8 ++++++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/tcp.h b/include/linux/tcp.h
> index 8b17cff..1e9b4a6 100644
> --- a/include/linux/tcp.h
> +++ b/include/linux/tcp.h
> @@ -192,8 +192,10 @@ struct tcp_info {
>  
>  	__u64	tcpi_pacing_rate;
>  	__u64	tcpi_max_pacing_rate;
> -	__u64	tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
> +	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
>  	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
> +	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
> +	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
>  };
>  
>  /* for TCP_MD5SIG socket option */
> diff --git a/misc/ss.c b/misc/ss.c
> index dba0901..3e01f88 100644
> --- a/misc/ss.c
> +++ b/misc/ss.c
> @@ -769,6 +769,8 @@ struct tcpstat
>  	double		    pacing_rate_max;
>  	unsigned long long  bytes_acked;
>  	unsigned long long  bytes_received;
> +	unsigned int	    segs_out;
> +	unsigned int	    segs_in;
>  	unsigned int	    unacked;
>  	unsigned int	    retrans;
>  	unsigned int	    retrans_total;
> @@ -1695,6 +1697,10 @@ static void tcp_stats_print(struct tcpstat *s)
>  		printf(" bytes_acked:%llu", s->bytes_acked);
>  	if (s->bytes_received)
>  		printf(" bytes_received:%llu", s->bytes_received);
> +	if (s->segs_out)
> +		printf(" segs_out:%u", s->segs_out);
> +	if (s->segs_in)
> +		printf(" segs_in:%u", s->segs_in);
>  
>  	if (s->dctcp && s->dctcp->enabled) {
>  		struct dctcpstat *dctcp = s->dctcp;
> @@ -1990,6 +1996,8 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
>  		}
>  		s.bytes_acked = info->tcpi_bytes_acked;
>  		s.bytes_received = info->tcpi_bytes_received;
> +		s.segs_out = info->tcpi_segs_out;
> +		s.segs_in = info->tcpi_segs_in;
>  		tcp_stats_print(&s);
>  		if (s.dctcp)
>  			free(s.dctcp);
> -- 
> 2.2.0.rc0.207.ga3a616c
> 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Hemminger June 26, 2015, 3:52 a.m. UTC | #2
On Tue, 26 May 2015 14:54:41 -0400
Craig Gallek <kraig@google.com> wrote:

> Two new tcp_info fields: tcpi_segs_in and tcpi_segs_out.
> (2efd055c53c06b7e89c167c98069bab9afce7e59)
> 
> ~: ss -ti src :22
> 	 cubic wscale:7,6 rto:201 rtt:0.244/0.012 ato:40 mss:1418 cwnd:21 bytes_acked:80605 bytes_received:20491 segs_out:414 segs_in:600 send 976.3Mbps lastsnd:23 lastrcv:23 lastack:22 pacing_rate 1952.7Mbps rcv_rtt:98 rcv_space:28960
> 
> Signed-off-by: Craig Gallek <kraig@google.com>

Applied to net-next branch
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8b17cff..1e9b4a6 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -192,8 +192,10 @@  struct tcp_info {
 
 	__u64	tcpi_pacing_rate;
 	__u64	tcpi_max_pacing_rate;
-	__u64	tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
+	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
 	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
+	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
+	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
 };
 
 /* for TCP_MD5SIG socket option */
diff --git a/misc/ss.c b/misc/ss.c
index dba0901..3e01f88 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -769,6 +769,8 @@  struct tcpstat
 	double		    pacing_rate_max;
 	unsigned long long  bytes_acked;
 	unsigned long long  bytes_received;
+	unsigned int	    segs_out;
+	unsigned int	    segs_in;
 	unsigned int	    unacked;
 	unsigned int	    retrans;
 	unsigned int	    retrans_total;
@@ -1695,6 +1697,10 @@  static void tcp_stats_print(struct tcpstat *s)
 		printf(" bytes_acked:%llu", s->bytes_acked);
 	if (s->bytes_received)
 		printf(" bytes_received:%llu", s->bytes_received);
+	if (s->segs_out)
+		printf(" segs_out:%u", s->segs_out);
+	if (s->segs_in)
+		printf(" segs_in:%u", s->segs_in);
 
 	if (s->dctcp && s->dctcp->enabled) {
 		struct dctcpstat *dctcp = s->dctcp;
@@ -1990,6 +1996,8 @@  static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
 		}
 		s.bytes_acked = info->tcpi_bytes_acked;
 		s.bytes_received = info->tcpi_bytes_received;
+		s.segs_out = info->tcpi_segs_out;
+		s.segs_in = info->tcpi_segs_in;
 		tcp_stats_print(&s);
 		if (s.dctcp)
 			free(s.dctcp);