tcp_yeah: don't set ssthresh below 2

nealcardwell · davem330 · commit 83d15e70c4d8 · 2016-01-11T17:25:16.000-05:00
For tcp_yeah, use an ssthresh floor of 2, the same floor used by Reno
and CUBIC, per RFC 5681 (equation 4).

tcp_yeah_ssthresh() was sometimes returning a 0 or negative ssthresh
value if the intended reduction is as big or bigger than the current
cwnd. Congestion control modules should never return a zero or
negative ssthresh. A zero ssthresh generally results in a zero cwnd,
causing the connection to stall. A negative ssthresh value will be
interpreted as a u32 and will set a target cwnd for PRR near 4
billion.

Oleksandr Natalenko reported that a system using tcp_yeah with ECN
could see a warning about a prior_cwnd of 0 in
tcp_cwnd_reduction(). Testing verified that this was due to
tcp_yeah_ssthresh() misbehaving in this way.

Reported-by: Oleksandr Natalenko &lt;oleksandr@natalenko.name&gt;
Signed-off-by: Neal Cardwell &lt;ncardwell@google.com&gt;
Signed-off-by: Yuchung Cheng &lt;ycheng@google.com&gt;
Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
@@ -219,7 +219,7 @@ static u32 tcp_yeah_ssthresh(struct sock *sk)
 	yeah->fast_count = 0;
 	yeah->reno_count = max(yeah->reno_count>>1, 2U);
 
-	return tp->snd_cwnd - reduction;
+	return max_t(int, tp->snd_cwnd - reduction, 2);
 }
 
 static struct tcp_congestion_ops tcp_yeah __read_mostly = {

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ static u32 tcp_yeah_ssthresh(struct sock *sk)`
`219`	`219`	`yeah->fast_count = 0;`
`220`	`220`	`yeah->reno_count = max(yeah->reno_count>>1, 2U);`
`221`	`221`
`222`		`- return tp->snd_cwnd - reduction;`
	`222`	`+ return max_t(int, tp->snd_cwnd - reduction, 2);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`static struct tcp_congestion_ops tcp_yeah __read_mostly = {`