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

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

tcp: add data bytes sent stats 



Introduce a new TCP stat to record the number of bytes sent
(RFC4898 tcpEStatsPerfHCDataOctetsOut) 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 984988aa

include/linux/tcp.h

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ struct tcp_sock { 
	u32	data_segs_out;	/* RFC4898 tcpEStatsPerfDataSegsOut

				 * total number of data segments sent.

				 */

	u64	bytes_sent;	/* RFC4898 tcpEStatsPerfHCDataOctetsOut

				 * total number of data bytes sent.

				 */

	u64	bytes_acked;	/* RFC4898 tcpEStatsAppHCThruOctetsAcked

				 * sum(delta(snd_una)), or how many bytes

				 * were acked.

include/uapi/linux/tcp.h

+3 −1
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ struct tcp_info { 


	__u32	tcpi_delivered;

	__u32	tcpi_delivered_ce;



	__u64	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */

};



/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
@@ -257,7 +259,7 @@ enum { 
	TCP_NLA_SND_SSTHRESH,	/* Slow start size threshold */

	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 */

};



/* for TCP_MD5SIG socket option */

net/ipv4/tcp.c

+6 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,7 @@ int tcp_disconnect(struct sock *sk, int flags) 
	sk->sk_rx_dst = NULL;

	tcp_saved_syn_free(tp);

	tp->compressed_ack = 0;

	tp->bytes_sent = 0;



	/* Clean up fastopen related fields */

	tcp_free_fastopen_req(tp);
@@ -3201,6 +3202,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 
		info->tcpi_delivery_rate = rate64;

	info->tcpi_delivered = tp->delivered;

	info->tcpi_delivered_ce = tp->delivered_ce;

	info->tcpi_bytes_sent = tp->bytes_sent;

	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(tcp_get_info);
@@ -3225,6 +3227,7 @@ static size_t tcp_opt_stats_get_size(void) 
		nla_total_size(sizeof(u32)) + /* TCP_NLA_SND_SSTHRESH */

		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 */

		0;

}
@@ -3272,6 +3275,9 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 
	nla_put_u32(stats, TCP_NLA_SNDQ_SIZE, tp->write_seq - tp->snd_una);

	nla_put_u8(stats, TCP_NLA_CA_STATE, inet_csk(sk)->icsk_ca_state);



	nla_put_u64_64bit(stats, TCP_NLA_BYTES_SENT, tp->bytes_sent,

			  TCP_NLA_PAD);



	return stats;

}

net/ipv4/tcp_output.c

+1 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, 
	if (skb->len != tcp_header_size) {

		tcp_event_data_sent(tp, sk);

		tp->data_segs_out += tcp_skb_pcount(skb);

		tp->bytes_sent += skb->len - tcp_header_size;

		tcp_internal_pacing(sk, skb);

	}