Netdev List
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: "Neal Cardwell" <ncardwell@google.com>,
	"Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Cc: "Pasi Kärkkäinen" <pasik@iki.fi>,
	"David Miller" <davem@davemloft.net>,
	"Hannes Frederic Sowa" <hannes@stressinduktion.org>,
	"Stephen Hemminger" <stephen@networkplumber.org>,
	Netdev <netdev@vger.kernel.org>,
	"Yuchung Cheng" <ycheng@google.com>
Subject: [PATCH] tcp: frto should not set snd_cwnd to 0
Date: Sun, 03 Feb 2013 11:13:05 -0800	[thread overview]
Message-ID: <1359918785.30177.111.camel@edumazet-glaptop> (raw)
In-Reply-To: <1359826377.30177.86.camel@edumazet-glaptop>

From: Eric Dumazet <edumazet@google.com>

Commit 9dc274151a548 (tcp: fix ABC in tcp_slow_start())
uncovered a bug in FRTO code :
tcp_process_frto() is setting snd_cwnd to 0 if the number
of in flight packets is 0.

As Neal pointed out, if no packet is in flight we lost our
chance to disambiguate whether a loss timeout was spurious.

We should assume it was a proper loss.

Reported-by: Pasi Kärkkäinen <pasik@iki.fi>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: Yuchung Cheng <ycheng@google.com>
---
 net/ipv4/tcp_input.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 8aca4ee..680c422 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3484,7 +3484,8 @@ static bool tcp_process_frto(struct sock *sk, int flag)
 	    ((tp->frto_counter >= 2) && (flag & FLAG_RETRANS_DATA_ACKED)))
 		tp->undo_marker = 0;
 
-	if (!before(tp->snd_una, tp->frto_highmark)) {
+	if (!before(tp->snd_una, tp->frto_highmark) ||
+	    !tcp_packets_in_flight(tp)) {
 		tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 2 : 3), flag);
 		return true;
 	}

  reply	other threads:[~2013-02-03 19:13 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-23 16:12 Linux 3.6.x kernel crash in tcp_slow_start / bictcp_cong_avoid with wfica Pasi Kärkkäinen
2013-01-23 21:44 ` Hannes Frederic Sowa
2013-01-23 21:51   ` Pasi Kärkkäinen
2013-01-23 22:00     ` Hannes Frederic Sowa
2013-01-24  7:14       ` Pasi Kärkkäinen
2013-01-23 22:25     ` Eric Dumazet
2013-01-23 23:26     ` Stephen Hemminger
2013-01-23 23:41       ` Hannes Frederic Sowa
2013-01-23 23:47         ` Eric Dumazet
2013-01-24  6:59           ` Pasi Kärkkäinen
2013-01-24 13:51           ` Hannes Frederic Sowa
2013-02-02  3:51             ` Eric Dumazet
2013-02-02 14:28               ` Pasi Kärkkäinen
2013-02-02 15:14                 ` [PATCH] tcp: tcp_process_frto() should not set snd_cwnd to 0 Eric Dumazet
2013-02-02 15:57                   ` Neal Cardwell
2013-02-02 17:32                     ` Eric Dumazet
2013-02-03 19:13                       ` Eric Dumazet [this message]
2013-02-03 21:01                         ` [PATCH] tcp: frto " David Miller
2013-02-04 12:14                         ` Ilpo Järvinen
2013-02-04 15:07                           ` Eric Dumazet
2013-02-05 19:44                             ` Eric Dumazet
2013-02-05 19:49                           ` Neal Cardwell
2013-02-06 20:55                             ` David Miller
2013-02-06 21:13                               ` Pasi Kärkkäinen
2013-02-06 21:19                                 ` David Miller
2013-02-06 21:21                                   ` Pasi Kärkkäinen
2013-02-02 15:23                 ` [PATCH] tcp: fix an infinite loop in tcp_slow_start() Eric Dumazet
2013-02-03 21:01                   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359918785.30177.111.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=davem@davemloft.net \
    --cc=hannes@stressinduktion.org \
    --cc=ilpo.jarvinen@helsinki.fi \
    --cc=ncardwell@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=pasik@iki.fi \
    --cc=stephen@networkplumber.org \
    --cc=ycheng@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox