Skip to contentSkip to conversation

Patch "tcp: record TLP and ER timer stats in v6 stats" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jun 17, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tcp: record TLP and ER timer stats in v6 stats

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tcp-record-tlp-and-er-timer-stats-in-v6-stats.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Jun 17 11:18:18 PDT 2016

From: Yuchung Cheng <[email protected]>
Date: Mon, 6 Jun 2016 15:07:18 -0700
Subject: tcp: record TLP and ER timer stats in v6 stats

From: Yuchung Cheng <[email protected]>

[ Upstream commit ce3cf4ec0305919fc69a972f6c2b2efd35d36abc ]

The v6 tcp stats scan do not provide TLP and ER timer information correctly like the v4 version . This patch fixes that.

Fixes 6ba8a3b19e76 ("tcp: Tail loss probe (TLP)")
Fixes eed530b6c676 ("tcp: early retransmit")
---
 net/ipv6/tcp_ipv6.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv6/tcp_ipv6.c +3 -1
@@ -1706,7 +1706,9 @@ static void get_tcp6_sock(struct seq_fil
 	destp = ntohs(inet->inet_dport);
 	srcp  = ntohs(inet->inet_sport);
 
-	if (icsk->icsk_pending == ICSK_TIME_RETRANS) {
+	if (icsk->icsk_pending == ICSK_TIME_RETRANS ||
+	    icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS ||
+	    icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {
 		timer_active	= 1;
 		timer_expires	= icsk->icsk_timeout;
 	} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/tcp-record-tlp-and-er-timer-stats-in-v6-stats.patch