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

Commit 50f694a6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'TCP-data-delivery-and-ECN-stats-tracking' 



Yuchung Cheng says:

====================
tracking TCP data delivery and ECN stats

This patch series improve tracking the data delivery status
  1. minor improvement on SYN data
  2. accounting bytes delivered with CE marks
  3. exporting the delivery stats to applications

s.t. users can get better sense of TCP performance at per host,
per connection, and even per application message level.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 415787d7 feb5f2ec

include/linux/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct tcp_sock { 
				 * receiver in Recovery. */

	u32	prr_out;	/* Total number of pkts sent during Recovery. */

	u32	delivered;	/* Total data packets delivered incl. rexmits */

	u32	delivered_ce;	/* Like the above but only ECE marked packets */

	u32	lost;		/* Total data packets lost incl. rexmits */

	u32	app_limited;	/* limited until "delivered" reaches this val */

	u64	first_tx_mstamp;  /* start of window send phase */

include/uapi/linux/snmp.h

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ enum 
	LINUX_MIB_TCPKEEPALIVE,			/* TCPKeepAlive */

	LINUX_MIB_TCPMTUPFAIL,			/* TCPMTUPFail */

	LINUX_MIB_TCPMTUPSUCCESS,		/* TCPMTUPSuccess */

	LINUX_MIB_TCPDELIVERED,			/* TCPDelivered */

	LINUX_MIB_TCPDELIVEREDCE,		/* TCPDeliveredCE */

	__LINUX_MIB_MAX

};

include/uapi/linux/tcp.h

+5 −0
Original line number Diff line number Diff line
@@ -224,6 +224,9 @@ struct tcp_info { 
	__u64	tcpi_busy_time;      /* Time (usec) busy sending data */

	__u64	tcpi_rwnd_limited;   /* Time (usec) limited by receive window */

	__u64	tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */



	__u32	tcpi_delivered;

	__u32	tcpi_delivered_ce;

};



/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
@@ -244,6 +247,8 @@ enum { 
	TCP_NLA_SNDQ_SIZE,	/* Data (bytes) pending in send queue */

	TCP_NLA_CA_STATE,	/* ca_state of socket */

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



};

net/ipv4/proc.c

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ static const struct snmp_mib snmp4_net_list[] = { 
	SNMP_MIB_ITEM("TCPKeepAlive", LINUX_MIB_TCPKEEPALIVE),

	SNMP_MIB_ITEM("TCPMTUPFail", LINUX_MIB_TCPMTUPFAIL),

	SNMP_MIB_ITEM("TCPMTUPSuccess", LINUX_MIB_TCPMTUPSUCCESS),

	SNMP_MIB_ITEM("TCPDelivered", LINUX_MIB_TCPDELIVERED),

	SNMP_MIB_ITEM("TCPDeliveredCE", LINUX_MIB_TCPDELIVEREDCE),

	SNMP_MIB_SENTINEL

};

net/ipv4/tcp.c

+7 −1
Original line number Diff line number Diff line
@@ -2559,6 +2559,7 @@ int tcp_disconnect(struct sock *sk, int flags) 
	tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;

	tp->snd_cwnd_cnt = 0;

	tp->window_clamp = 0;

	tp->delivered_ce = 0;

	tcp_set_ca_state(sk, TCP_CA_Open);

	tp->is_sack_reneg = 0;

	tcp_clear_retrans(tp);
@@ -3166,6 +3167,8 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 
	rate64 = tcp_compute_delivery_rate(tp);

	if (rate64)

		info->tcpi_delivery_rate = rate64;

	info->tcpi_delivered = tp->delivered;

	info->tcpi_delivered_ce = tp->delivered_ce;

	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(tcp_get_info);
@@ -3179,7 +3182,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 
	u32 rate;



	stats = alloc_skb(7 * nla_total_size_64bit(sizeof(u64)) +

			  5 * nla_total_size(sizeof(u32)) +

			  7 * nla_total_size(sizeof(u32)) +

			  3 * nla_total_size(sizeof(u8)), GFP_ATOMIC);

	if (!stats)

		return NULL;
@@ -3210,9 +3213,12 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 
	nla_put_u8(stats, TCP_NLA_RECUR_RETRANS, inet_csk(sk)->icsk_retransmits);

	nla_put_u8(stats, TCP_NLA_DELIVERY_RATE_APP_LMT, !!tp->rate_app_limited);

	nla_put_u32(stats, TCP_NLA_SND_SSTHRESH, tp->snd_ssthresh);

	nla_put_u32(stats, TCP_NLA_DELIVERED, tp->delivered);

	nla_put_u32(stats, TCP_NLA_DELIVERED_CE, tp->delivered_ce);



	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);



	return stats;

}