tcp: add stat of data packet reordering events (7ec65372) · Commits · e / devices / android_kernel_fairphone_FP4

include/linux/tcp.h

+2 −2

include/uapi/linux/tcp.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -239,6 +239,7 @@ struct tcp_info {
	__u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */		__u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */
	__u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */		__u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */
	__u32 tcpi_dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups */		__u32 tcpi_dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups */
			__u32 tcpi_reord_seen; /* reordering events seen */
	};		};

	/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */		/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */
	@@ -264,6 +265,7 @@ enum {
	TCP_NLA_BYTES_SENT, /* Data bytes sent including retransmission */		TCP_NLA_BYTES_SENT, /* Data bytes sent including retransmission */
	TCP_NLA_BYTES_RETRANS, /* Data bytes retransmitted */		TCP_NLA_BYTES_RETRANS, /* Data bytes retransmitted */
	TCP_NLA_DSACK_DUPS, /* DSACK blocks received */		TCP_NLA_DSACK_DUPS, /* DSACK blocks received */
			TCP_NLA_REORD_SEEN, /* reordering events seen */
	};		};

	/* for TCP_MD5SIG socket option */		/* for TCP_MD5SIG socket option */

net/ipv4/tcp.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2597,6 +2597,7 @@ int tcp_disconnect(struct sock *sk, int flags)
	tp->bytes_sent = 0;		tp->bytes_sent = 0;
	tp->bytes_retrans = 0;		tp->bytes_retrans = 0;
	tp->dsack_dups = 0;		tp->dsack_dups = 0;
			tp->reord_seen = 0;

	/* Clean up fastopen related fields */		/* Clean up fastopen related fields */
	tcp_free_fastopen_req(tp);		tcp_free_fastopen_req(tp);
	@@ -3207,6 +3208,7 @@ void tcp_get_info(struct sock sk, struct tcp_info info)
	info->tcpi_bytes_sent = tp->bytes_sent;		info->tcpi_bytes_sent = tp->bytes_sent;
	info->tcpi_bytes_retrans = tp->bytes_retrans;		info->tcpi_bytes_retrans = tp->bytes_retrans;
	info->tcpi_dsack_dups = tp->dsack_dups;		info->tcpi_dsack_dups = tp->dsack_dups;
			info->tcpi_reord_seen = tp->reord_seen;
	unlock_sock_fast(sk, slow);		unlock_sock_fast(sk, slow);
	}		}
	EXPORT_SYMBOL_GPL(tcp_get_info);		EXPORT_SYMBOL_GPL(tcp_get_info);
	@@ -3234,6 +3236,7 @@ static size_t tcp_opt_stats_get_size(void)
	nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_SENT */		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_SENT */
	nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_RETRANS */		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_RETRANS */
	nla_total_size(sizeof(u32)) + /* TCP_NLA_DSACK_DUPS */		nla_total_size(sizeof(u32)) + /* TCP_NLA_DSACK_DUPS */
			nla_total_size(sizeof(u32)) + /* TCP_NLA_REORD_SEEN */
	0;		0;
	}		}

	@@ -3286,6 +3289,7 @@ struct sk_buff tcp_get_timestamping_opt_stats(const struct sock sk)
	nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, tp->bytes_retrans,		nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, tp->bytes_retrans,
	TCP_NLA_PAD);		TCP_NLA_PAD);
	nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp->dsack_dups);		nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp->dsack_dups);
			nla_put_u32(stats, TCP_NLA_REORD_SEEN, tp->reord_seen);

	return stats;		return stats;
	}		}

net/ipv4/tcp_input.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -906,8 +906,8 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq,
	sock_net(sk)->ipv4.sysctl_tcp_max_reordering);		sock_net(sk)->ipv4.sysctl_tcp_max_reordering);
	}		}

	tp->rack.reord = 1;
	/* This exciting event is worth to be remembered. 8) */		/* This exciting event is worth to be remembered. 8) */
			tp->reord_seen++;
	NET_INC_STATS(sock_net(sk),		NET_INC_STATS(sock_net(sk),
	ts ? LINUX_MIB_TCPTSREORDER : LINUX_MIB_TCPSACKREORDER);		ts ? LINUX_MIB_TCPTSREORDER : LINUX_MIB_TCPSACKREORDER);
	}		}
	@@ -1871,6 +1871,7 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend)

	tp->reordering = min_t(u32, tp->packets_out + addend,		tp->reordering = min_t(u32, tp->packets_out + addend,
	sock_net(sk)->ipv4.sysctl_tcp_max_reordering);		sock_net(sk)->ipv4.sysctl_tcp_max_reordering);
			tp->reord_seen++;
	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRENOREORDER);		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRENOREORDER);
	}		}

net/ipv4/tcp_recovery.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ static u32 tcp_rack_reo_wnd(const struct sock *sk)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);

	if (!tp->rack.reord) {		if (!tp->reord_seen) {
	/* If reordering has not been observed, be aggressive during		/* If reordering has not been observed, be aggressive during
	* the recovery or starting the recovery by DUPACK threshold.		* the recovery or starting the recovery by DUPACK threshold.
	*/		*/

Original line number	Original line	Diff line number	Diff line
	@@ -220,8 +220,7 @@ struct tcp_sock {
	#define TCP_RACK_RECOVERY_THRESH 16		#define TCP_RACK_RECOVERY_THRESH 16
	u8 reo_wnd_persist:5, /* No. of recovery since last adj */		u8 reo_wnd_persist:5, /* No. of recovery since last adj */
	dsack_seen:1, /* Whether DSACK seen after last adj */		dsack_seen:1, /* Whether DSACK seen after last adj */
	advanced:1, /* mstamp advanced since last lost marking */		advanced:1; /* mstamp advanced since last lost marking */
	reord:1; /* reordering detected */
	} rack;		} rack;
	u16 advmss; /* Advertised MSS */		u16 advmss; /* Advertised MSS */
	u8 compressed_ack;		u8 compressed_ack;
	@@ -267,6 +266,7 @@ struct tcp_sock {
	u8 ecn_flags; /* ECN status bits. */		u8 ecn_flags; /* ECN status bits. */
	u8 keepalive_probes; /* num of allowed keep alive probes */		u8 keepalive_probes; /* num of allowed keep alive probes */
	u32 reordering; /* Packet reordering metric. */		u32 reordering; /* Packet reordering metric. */
			u32 reord_seen; /* number of data packet reordering events */
	u32 snd_up; /* Urgent pointer */		u32 snd_up; /* Urgent pointer */

	/*		/*