Patchwork Fix tcp_hybla zero congestion window growth with small rho and large cwnd

login
register
mail settings
Submitter David Miller
Date Oct. 7, 2008, 10:58 p.m.
Message ID <20081007.155859.64412560.davem@davemloft.net>
Download mbox | patch
Permalink /patch/3232/
State Accepted
Headers show

Comments

David Miller - Oct. 7, 2008, 10:58 p.m.
From: Daniele Lacamera <root@danielinux.net>
Date: Sat, 04 Oct 2008 17:34:57 +0200

> Because of rounding, in certain conditions, i.e. when in congestion
> avoidance state rho is smaller than 1/128 of the current cwnd, TCP
> Hybla congestion control starves and the cwnd is kept constant
> forever.
>
> This patch forces an increment by one segment after #send_cwnd calls
> without increments(newreno behavior).
>
> Signed-off-by: Daniele Lacamera <root@danielinux.net>

I mad a slight coding style fix and then applied
your patch to net-2.6 as follows.

tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.

Because of rounding, in certain conditions, i.e. when in congestion
avoidance state rho is smaller than 1/128 of the current cwnd, TCP
Hybla congestion control starves and the cwnd is kept constant
forever.

This patch forces an increment by one segment after #send_cwnd calls
without increments(newreno behavior).

Signed-off-by: Daniele Lacamera <root@danielinux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

--
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_hybla.c b/net/ipv4/tcp_hybla.c
index bfcbd14..c209e05 100644
--- a/net/ipv4/tcp_hybla.c
+++ b/net/ipv4/tcp_hybla.c
@@ -150,7 +150,11 @@  static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
 		ca->snd_cwnd_cents -= 128;
 		tp->snd_cwnd_cnt = 0;
 	}
-
+	/* check when cwnd has not been incremented for a while */
+	if (increment == 0 && odd == 0 && tp->snd_cwnd_cnt >= tp->snd_cwnd) {
+		tp->snd_cwnd++;
+		tp->snd_cwnd_cnt = 0;
+	}
 	/* clamp down slowstart cwnd to ssthresh value. */
 	if (is_slowstart)
 		tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_ssthresh);