Commit 32efcc06 authored by Abdul Kabbani's avatar Abdul Kabbani Committed by David S. Miller
Browse files

tcp: export count for rehash attempts 



Using IPv6 flow-label to swiftly route around avoid congested or
disconnected network path can greatly improve TCP reliability.

This patch adds SNMP counters and a OPT_STATS counter to track both
host-level and connection-level statistics. Network administrators
can use these counters to evaluate the impact of this new ability better.

Export count for rehash attempts to
1) two SNMP counters: TcpTimeoutRehash (rehash due to timeouts),
   and TcpDuplicateDataRehash (rehash due to receiving duplicate
   packets)
2) Timestamping API SOF_TIMESTAMPING_OPT_STATS.

Signed-off-by: default avatarAbdul Kabbani <akabbani@google.com>
Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarKevin(Yudong) Yang <yyd@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6efca894

include/linux/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ struct tcp_sock { 
#define BPF_SOCK_OPS_TEST_FLAG(TP, ARG) 0

#endif



	u16 timeout_rehash;	/* Timeout-triggered rehash attempts */



	u32 rcv_ooopack; /* Received out-of-order packets, for tcpinfo */



/* Receiver side RTT estimation */

include/uapi/linux/snmp.h

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ enum 
	LINUX_MIB_TCPRCVQDROP,			/* TCPRcvQDrop */

	LINUX_MIB_TCPWQUEUETOOBIG,		/* TCPWqueueTooBig */

	LINUX_MIB_TCPFASTOPENPASSIVEALTKEY,	/* TCPFastOpenPassiveAltKey */

	LINUX_MIB_TCPTIMEOUTREHASH,		/* TCPTimeoutRehash */

	LINUX_MIB_TCPDUPLICATEDATAREHASH,	/* TCPDuplicateDataRehash */

	__LINUX_MIB_MAX

};

include/uapi/linux/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ enum { 
	TCP_NLA_DSACK_DUPS,	/* DSACK blocks received */

	TCP_NLA_REORD_SEEN,	/* reordering events seen */

	TCP_NLA_SRTT,		/* smoothed RTT in usecs */

	TCP_NLA_TIMEOUT_REHASH, /* Timeout-triggered rehash attempts */

};



/* for TCP_MD5SIG socket option */

net/ipv4/proc.c

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

	SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG),

	SNMP_MIB_ITEM("TCPFastOpenPassiveAltKey", LINUX_MIB_TCPFASTOPENPASSIVEALTKEY),

	SNMP_MIB_ITEM("TcpTimeoutRehash", LINUX_MIB_TCPTIMEOUTREHASH),

	SNMP_MIB_ITEM("TcpDuplicateDataRehash", LINUX_MIB_TCPDUPLICATEDATAREHASH),

	SNMP_MIB_SENTINEL

};

net/ipv4/tcp.c

+2 −0
Original line number Diff line number Diff line
@@ -3337,6 +3337,7 @@ static size_t tcp_opt_stats_get_size(void) 
		nla_total_size(sizeof(u32)) + /* TCP_NLA_DSACK_DUPS */

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

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

		nla_total_size(sizeof(u16)) + /* TCP_NLA_TIMEOUT_REHASH */

		0;

}
@@ -3391,6 +3392,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 
	nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp->dsack_dups);

	nla_put_u32(stats, TCP_NLA_REORD_SEEN, tp->reord_seen);

	nla_put_u32(stats, TCP_NLA_SRTT, tp->srtt_us >> 3);

	nla_put_u16(stats, TCP_NLA_TIMEOUT_REHASH, tp->timeout_rehash);



	return stats;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE