Patchwork tcp: account all retransmit failures

login
register
mail settings
Submitter Yuchung Cheng
Date July 12, 2013, 6:33 p.m.
Message ID <1373653984-30249-1-git-send-email-ycheng@google.com>
Download mbox | patch
Permalink /patch/258780/
State Accepted
Delegated to: David Miller
Headers show

Comments

Yuchung Cheng - July 12, 2013, 6:33 p.m.
Change snmp RETRANSFAILS stat to include timeout retransmit failures
in addition to other loss recoveries.

Signed-off-by: Yuchung Cheng <ycheng@google.com>
---
 net/ipv4/tcp_output.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
Neal Cardwell - July 12, 2013, 6:38 p.m.
On Fri, Jul 12, 2013 at 2:33 PM, Yuchung Cheng <ycheng@google.com> wrote:
> Change snmp RETRANSFAILS stat to include timeout retransmit failures
> in addition to other loss recoveries.
>
> Signed-off-by: Yuchung Cheng <ycheng@google.com>
> ---

Acked-by: Neal Cardwell <ncardwell@google.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet - July 12, 2013, 6:55 p.m.
On Fri, 2013-07-12 at 11:33 -0700, Yuchung Cheng wrote:
> Change snmp RETRANSFAILS stat to include timeout retransmit failures
> in addition to other loss recoveries.
> 
> Signed-off-by: Yuchung Cheng <ycheng@google.com>

Acked-by: Eric Dumazet <edumazet@google.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 12, 2013, 11:16 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 12 Jul 2013 11:55:54 -0700

> On Fri, 2013-07-12 at 11:33 -0700, Yuchung Cheng wrote:
>> Change snmp RETRANSFAILS stat to include timeout retransmit failures
>> in addition to other loss recoveries.
>> 
>> Signed-off-by: Yuchung Cheng <ycheng@google.com>
> 
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 3d60949..92fde8d 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2407,6 +2407,8 @@  int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
 		 * see tcp_input.c tcp_sacktag_write_queue().
 		 */
 		TCP_SKB_CB(skb)->ack_seq = tp->snd_nxt;
+	} else {
+		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);
 	}
 	return err;
 }
@@ -2528,10 +2530,9 @@  begin_fwd:
 		if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
 			continue;
 
-		if (tcp_retransmit_skb(sk, skb)) {
-			NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);
+		if (tcp_retransmit_skb(sk, skb))
 			return;
-		}
+
 		NET_INC_STATS_BH(sock_net(sk), mib_idx);
 
 		if (tcp_in_cwnd_reduction(sk))