Commit cc663f4d authored by Yuchung Cheng's avatar Yuchung Cheng Committed by David S. Miller

tcp: restrict F-RTO to work-around broken middle-boxes

The recent extension of F-RTO 89fe18e4 ("tcp: extend F-RTO
to catch more spurious timeouts") interacts badly with certain
broken middle-boxes.  These broken boxes modify and falsely raise
the receive window on the ACKs. During a timeout induced recovery,
F-RTO would send new data packets to probe if the timeout is false
or not. Since the receive window is falsely raised, the receiver
would silently drop these F-RTO packets. The recovery would take N
(exponentially backoff) timeouts to repair N packet losses.  A TCP
performance killer.

Due to this unfortunate situation, this patch removes this extension
to revert F-RTO back to the RFC specification.

Fixes: 89fe18e4 ("tcp: extend F-RTO to catch more spurious timeouts")
Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16cf72bb
...@@ -1935,6 +1935,7 @@ void tcp_enter_loss(struct sock *sk) ...@@ -1935,6 +1935,7 @@ void tcp_enter_loss(struct sock *sk)
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct sk_buff *skb; struct sk_buff *skb;
bool new_recovery = icsk->icsk_ca_state < TCP_CA_Recovery;
bool is_reneg; /* is receiver reneging on SACKs? */ bool is_reneg; /* is receiver reneging on SACKs? */
bool mark_lost; bool mark_lost;
...@@ -1994,15 +1995,18 @@ void tcp_enter_loss(struct sock *sk) ...@@ -1994,15 +1995,18 @@ void tcp_enter_loss(struct sock *sk)
tp->high_seq = tp->snd_nxt; tp->high_seq = tp->snd_nxt;
tcp_ecn_queue_cwr(tp); tcp_ecn_queue_cwr(tp);
/* F-RTO RFC5682 sec 3.1 step 1 mandates to disable F-RTO /* F-RTO RFC5682 sec 3.1 step 1: retransmit SND.UNA if no previous
* if a previous recovery is underway, otherwise it may incorrectly * loss recovery is underway except recurring timeout(s) on
* call a timeout spurious if some previously retransmitted packets * the same SND.UNA (sec 3.2). Disable F-RTO on path MTU probing
* are s/acked (sec 3.2). We do not apply that retriction since *
* retransmitted skbs are permanently tagged with TCPCB_EVER_RETRANS * In theory F-RTO can be used repeatedly during loss recovery.
* so FLAG_ORIG_SACK_ACKED is always correct. But we do disable F-RTO * In practice this interacts badly with broken middle-boxes that
* on PTMU discovery to avoid sending new data. * falsely raise the receive window, which results in repeated
* timeouts and stop-and-go behavior.
*/ */
tp->frto = sysctl_tcp_frto && !inet_csk(sk)->icsk_mtup.probe_size; tp->frto = sysctl_tcp_frto &&
(new_recovery || icsk->icsk_retransmits) &&
!inet_csk(sk)->icsk_mtup.probe_size;
} }
/* If ACK arrived pointing to a remembered SACK, it means that our /* If ACK arrived pointing to a remembered SACK, it means that our
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment