Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb31c9b9 authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

tcp: add data bytes retransmitted stats 



Introduce a new TCP stat to record the number of bytes retransmitted
(RFC4898 tcpEStatsPerfOctetsRetrans) and expose it in both tcp_info
(TCP_INFO) and opt_stats (SOF_TIMESTAMPING_OPT_STATS).

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba113c3a

include/linux/tcp.h

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ struct tcp_sock { 
				 * the first SYN. */

	u32	undo_marker;	/* snd_una upon a new recovery episode. */

	int	undo_retrans;	/* number of undoable retransmissions. */

	u64	bytes_retrans;	/* RFC4898 tcpEStatsPerfOctetsRetrans

				 * Total data bytes retransmitted

				 */

	u32	total_retrans;	/* Total retransmits for entire connection */



	u32	urg_seq;	/* Seq of received urgent pointer */

include/uapi/linux/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ struct tcp_info { 
	__u32	tcpi_delivered_ce;



	__u64	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */

	__u64	tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */

};



/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
@@ -260,6 +261,7 @@ enum { 
	TCP_NLA_DELIVERED,	/* Data pkts delivered incl. out-of-order */

	TCP_NLA_DELIVERED_CE,	/* Like above but only ones w/ CE marks */

	TCP_NLA_BYTES_SENT,	/* Data bytes sent including retransmission */

	TCP_NLA_BYTES_RETRANS,	/* Data bytes retransmitted */

};



/* for TCP_MD5SIG socket option */

net/ipv4/tcp.c

+5 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,7 @@ int tcp_disconnect(struct sock *sk, int flags) 
	tcp_saved_syn_free(tp);

	tp->compressed_ack = 0;

	tp->bytes_sent = 0;

	tp->bytes_retrans = 0;



	/* Clean up fastopen related fields */

	tcp_free_fastopen_req(tp);
@@ -3203,6 +3204,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 
	info->tcpi_delivered = tp->delivered;

	info->tcpi_delivered_ce = tp->delivered_ce;

	info->tcpi_bytes_sent = tp->bytes_sent;

	info->tcpi_bytes_retrans = tp->bytes_retrans;

	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(tcp_get_info);
@@ -3228,6 +3230,7 @@ static size_t tcp_opt_stats_get_size(void) 
		nla_total_size(sizeof(u32)) + /* TCP_NLA_DELIVERED */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_DELIVERED_CE */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_SENT */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_RETRANS */

		0;

}
@@ -3277,6 +3280,8 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 


	nla_put_u64_64bit(stats, TCP_NLA_BYTES_SENT, tp->bytes_sent,

			  TCP_NLA_PAD);

	nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, tp->bytes_retrans,

			  TCP_NLA_PAD);



	return stats;

}

net/ipv4/tcp_output.c

+1 −0
Original line number Diff line number Diff line
@@ -2871,6 +2871,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) 
	if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)

		__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);

	tp->total_retrans += segs;

	tp->bytes_retrans += skb->len;



	/* make sure skb->data is aligned on arches that require it

	 * and check if ack-trimming & collapsing extended the headroom