[TCP]: remove unused argument to cong_avoid op

Stephen Hemminger · David S. Miller · commit 16751347a060 · 2007-07-18T01:46:58.000-07:00
None of the existing TCP congestion controls use the rtt value pased
in the ca_ops-&gt;cong_avoid interface.  Which is lucky because seq_rtt
could have been -1 when handling a duplicate ack.

Signed-off-by: Stephen Hemminger &lt;shemminger@linux-foundation.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -652,8 +652,7 @@ struct tcp_congestion_ops {
 	/* lower bound for congestion window (optional) */
 	u32 (*min_cwnd)(const struct sock *sk);
 	/* do new cwnd calculation (required) */
-	void (*cong_avoid)(struct sock *sk, u32 ack,
-			   u32 rtt, u32 in_flight, int good_ack);
+	void (*cong_avoid)(struct sock *sk, u32 ack, u32 in_flight, int good_ack);
 	/* call before changing ca_state (optional) */
 	void (*set_state)(struct sock *sk, u8 new_state);
 	/* call when cwnd event occurs (optional) */
@@ -684,8 +683,7 @@ extern void tcp_slow_start(struct tcp_sock *tp);
 
 extern struct tcp_congestion_ops tcp_init_congestion_ops;
 extern u32 tcp_reno_ssthresh(struct sock *sk);
-extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack,
-				u32 rtt, u32 in_flight, int flag);
+extern void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag);
 extern u32 tcp_reno_min_cwnd(const struct sock *sk);
 extern struct tcp_congestion_ops tcp_reno;
 
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
@@ -137,7 +137,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
 }
 
 static void bictcp_cong_avoid(struct sock *sk, u32 ack,
-			      u32 seq_rtt, u32 in_flight, int data_acked)
+			      u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct bictcp *ca = inet_csk_ca(sk);
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
@@ -324,8 +324,7 @@ EXPORT_SYMBOL_GPL(tcp_slow_start);
 /* This is Jacobson's slow start and congestion avoidance.
  * SIGCOMM '88, p. 328.
  */
-void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,
-			 int flag)
+void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
@@ -270,7 +270,7 @@ static inline void measure_delay(struct sock *sk)
 }
 
 static void bictcp_cong_avoid(struct sock *sk, u32 ack,
-			      u32 seq_rtt, u32 in_flight, int data_acked)
+			      u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct bictcp *ca = inet_csk_ca(sk);
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c
@@ -109,7 +109,7 @@ static void hstcp_init(struct sock *sk)
 	tp->snd_cwnd_clamp = min_t(u32, tp->snd_cwnd_clamp, 0xffffffff/128);
 }
 
-static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,
+static void hstcp_cong_avoid(struct sock *sk, u32 adk,
 			     u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
@@ -225,7 +225,7 @@ static u32 htcp_recalc_ssthresh(struct sock *sk)
 	return max((tp->snd_cwnd * ca->beta) >> 7, 2U);
 }
 
-static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
+static void htcp_cong_avoid(struct sock *sk, u32 ack, s32 rtt,
 			    u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c
@@ -85,7 +85,7 @@ static inline u32 hybla_fraction(u32 odds)
  *     o Give cwnd a new value based on the model proposed
  *     o remember increments <1
  */
-static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
+static void hybla_cong_avoid(struct sock *sk, u32 ack,
 			    u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
@@ -103,7 +103,7 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
 		return;
 
 	if (!ca->hybla_en)
-		return tcp_reno_cong_avoid(sk, ack, rtt, in_flight, flag);
+		return tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 
 	if (ca->rho == 0)
 		hybla_recalc_param(sk);
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
@@ -258,7 +258,7 @@ static void tcp_illinois_state(struct sock *sk, u8 new_state)
 /*
  * Increase window in response to successful acknowledgment.
  */
-static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
+static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack,
 				    u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
@@ -2323,11 +2323,11 @@ static inline void tcp_ack_update_rtt(struct sock *sk, const int flag,
 		tcp_ack_no_tstamp(sk, seq_rtt, flag);
 }
 
-static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
+static void tcp_cong_avoid(struct sock *sk, u32 ack,
 			   u32 in_flight, int good)
 {
 	const struct inet_connection_sock *icsk = inet_csk(sk);
-	icsk->icsk_ca_ops->cong_avoid(sk, ack, rtt, in_flight, good);
+	icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight, good);
 	tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp;
 }
 
@@ -2826,11 +2826,11 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
 		/* Advance CWND, if state allows this. */
 		if ((flag & FLAG_DATA_ACKED) && !frto_cwnd &&
 		    tcp_may_raise_cwnd(sk, flag))
-			tcp_cong_avoid(sk, ack,  seq_rtt, prior_in_flight, 0);
+			tcp_cong_avoid(sk, ack, prior_in_flight, 0);
 		tcp_fastretrans_alert(sk, prior_snd_una, prior_packets, flag);
 	} else {
 		if ((flag & FLAG_DATA_ACKED) && !frto_cwnd)
-			tcp_cong_avoid(sk, ack, seq_rtt, prior_in_flight, 1);
+			tcp_cong_avoid(sk, ack, prior_in_flight, 1);
 	}
 
 	if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP))
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
@@ -115,13 +115,12 @@ static void tcp_lp_init(struct sock *sk)
  * Will only call newReno CA when away from inference.
  * From TCP-LP's paper, this will be handled in additive increasement.
  */
-static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,
-			      int flag)
+static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag)
 {
 	struct lp *lp = inet_csk_ca(sk);
 
 	if (!(lp->flag & LP_WITHIN_INF))
-		tcp_reno_cong_avoid(sk, ack, rtt, in_flight, flag);
+		tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 }
 
 /**
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c
@@ -15,7 +15,7 @@
 #define TCP_SCALABLE_AI_CNT	50U
 #define TCP_SCALABLE_MD_SCALE	3
 
-static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack, u32 rtt,
+static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack,
 				    u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
@@ -163,13 +163,13 @@ void tcp_vegas_cwnd_event(struct sock *sk, enum tcp_ca_event event)
 EXPORT_SYMBOL_GPL(tcp_vegas_cwnd_event);
 
 static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
-				 u32 seq_rtt, u32 in_flight, int flag)
+				 u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct vegas *vegas = inet_csk_ca(sk);
 
 	if (!vegas->doing_vegas_now)
-		return tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
+		return tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 
 	/* The key players are v_beg_snd_una and v_beg_snd_nxt.
 	 *
@@ -228,7 +228,7 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
 			/* We don't have enough RTT samples to do the Vegas
 			 * calculation, so we'll behave like Reno.
 			 */
-			tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
+			tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 		} else {
 			u32 rtt, target_cwnd, diff;
 
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
@@ -115,13 +115,13 @@ static void tcp_veno_cwnd_event(struct sock *sk, enum tcp_ca_event event)
 }
 
 static void tcp_veno_cong_avoid(struct sock *sk, u32 ack,
-				u32 seq_rtt, u32 in_flight, int flag)
+				u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct veno *veno = inet_csk_ca(sk);
 
 	if (!veno->doing_veno_now)
-		return tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
+		return tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 
 	/* limited by applications */
 	if (!tcp_is_cwnd_limited(sk, in_flight))
@@ -132,7 +132,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack,
 		/* We don't have enough rtt samples to do the Veno
 		 * calculation, so we'll behave like Reno.
 		 */
-		tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
+		tcp_reno_cong_avoid(sk, ack, in_flight, flag);
 	} else {
 		u32 rtt, target_cwnd;
 
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
@@ -70,7 +70,7 @@ static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, ktime_t last)
 }
 
 static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack,
-				u32 seq_rtt, u32 in_flight, int flag)
+				u32 in_flight, int flag)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct yeah *yeah = inet_csk_ca(sk);

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`static void bictcp_cong_avoid(struct sock *sk, u32 ack,`
`140`		`- u32 seq_rtt, u32 in_flight, int data_acked)`
	`140`	`+ u32 in_flight, int data_acked)`
`141`	`141`	`{`
`142`	`142`	`struct tcp_sock *tp = tcp_sk(sk);`
`143`	`143`	`struct bictcp *ca = inet_csk_ca(sk);`
Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,7 @@ EXPORT_SYMBOL_GPL(tcp_slow_start);`
`324`	`324`	`/* This is Jacobson's slow start and congestion avoidance.`
`325`	`325`	`* SIGCOMM '88, p. 328.`
`326`	`326`	`*/`
`327`		`-void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,`
`328`		`- int flag)`
	`327`	`+void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag)`
`329`	`328`	`{`
`330`	`329`	`struct tcp_sock *tp = tcp_sk(sk);`
`331`	`330`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static inline void measure_delay(struct sock *sk)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`static void bictcp_cong_avoid(struct sock *sk, u32 ack,`
`273`		`- u32 seq_rtt, u32 in_flight, int data_acked)`
	`273`	`+ u32 in_flight, int data_acked)`
`274`	`274`	`{`
`275`	`275`	`struct tcp_sock *tp = tcp_sk(sk);`
`276`	`276`	`struct bictcp *ca = inet_csk_ca(sk);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static void hstcp_init(struct sock *sk)`
`109`	`109`	`tp->snd_cwnd_clamp = min_t(u32, tp->snd_cwnd_clamp, 0xffffffff/128);`
`110`	`110`	`}`
`111`	`111`
`112`		`-static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,`
	`112`	`+static void hstcp_cong_avoid(struct sock *sk, u32 adk,`
`113`	`113`	`u32 in_flight, int data_acked)`
`114`	`114`	`{`
`115`	`115`	`struct tcp_sock *tp = tcp_sk(sk);`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ static u32 htcp_recalc_ssthresh(struct sock *sk)`
`225`	`225`	`return max((tp->snd_cwnd * ca->beta) >> 7, 2U);`
`226`	`226`	`}`
`227`	`227`
`228`		`-static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,`
	`228`	`+static void htcp_cong_avoid(struct sock *sk, u32 ack, s32 rtt,`
`229`	`229`	`u32 in_flight, int data_acked)`
`230`	`230`	`{`
`231`	`231`	`struct tcp_sock *tp = tcp_sk(sk);`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ static void tcp_illinois_state(struct sock *sk, u8 new_state)`
`258`	`258`	`/*`
`259`	`259`	`* Increase window in response to successful acknowledgment.`
`260`	`260`	`*/`
`261`		`-static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack, u32 rtt,`
	`261`	`+static void tcp_illinois_cong_avoid(struct sock *sk, u32 ack,`
`262`	`262`	`u32 in_flight, int flag)`
`263`	`263`	`{`
`264`	`264`	`struct tcp_sock *tp = tcp_sk(sk);`
Original file line number	Diff line number	Diff line change
`@@ -2323,11 +2323,11 @@ static inline void tcp_ack_update_rtt(struct sock *sk, const int flag,`
`2323`	`2323`	`tcp_ack_no_tstamp(sk, seq_rtt, flag);`
`2324`	`2324`	`}`
`2325`	`2325`
`2326`		`-static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt,`
	`2326`	`+static void tcp_cong_avoid(struct sock *sk, u32 ack,`
`2327`	`2327`	`u32 in_flight, int good)`
`2328`	`2328`	`{`
`2329`	`2329`	`const struct inet_connection_sock *icsk = inet_csk(sk);`
`2330`		`- icsk->icsk_ca_ops->cong_avoid(sk, ack, rtt, in_flight, good);`
	`2330`	`+ icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight, good);`
`2331`	`2331`	`tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp;`
`2332`	`2332`	`}`
`2333`	`2333`
`@@ -2826,11 +2826,11 @@ static int tcp_ack(struct sock sk, struct sk_buff skb, int flag)`
`2826`	`2826`	`/* Advance CWND, if state allows this. */`
`2827`	`2827`	`if ((flag & FLAG_DATA_ACKED) && !frto_cwnd &&`
`2828`	`2828`	`tcp_may_raise_cwnd(sk, flag))`
`2829`		`- tcp_cong_avoid(sk, ack, seq_rtt, prior_in_flight, 0);`
	`2829`	`+ tcp_cong_avoid(sk, ack, prior_in_flight, 0);`
`2830`	`2830`	`tcp_fastretrans_alert(sk, prior_snd_una, prior_packets, flag);`
`2831`	`2831`	`} else {`
`2832`	`2832`	`if ((flag & FLAG_DATA_ACKED) && !frto_cwnd)`
`2833`		`- tcp_cong_avoid(sk, ack, seq_rtt, prior_in_flight, 1);`
	`2833`	`+ tcp_cong_avoid(sk, ack, prior_in_flight, 1);`
`2834`	`2834`	`}`
`2835`	`2835`
`2836`	`2836`	`if ((flag & FLAG_FORWARD_PROGRESS) \|\| !(flag&FLAG_NOT_DUP))`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,12 @@ static void tcp_lp_init(struct sock *sk)`
`115`	`115`	`* Will only call newReno CA when away from inference.`
`116`	`116`	`* From TCP-LP's paper, this will be handled in additive increasement.`
`117`	`117`	`*/`
`118`		`-static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,`
`119`		`- int flag)`
	`118`	`+static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight, int flag)`
`120`	`119`	`{`
`121`	`120`	`struct lp *lp = inet_csk_ca(sk);`
`122`	`121`
`123`	`122`	`if (!(lp->flag & LP_WITHIN_INF))`
`124`		`- tcp_reno_cong_avoid(sk, ack, rtt, in_flight, flag);`
	`123`	`+ tcp_reno_cong_avoid(sk, ack, in_flight, flag);`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#define TCP_SCALABLE_AI_CNT 50U`
`16`	`16`	`#define TCP_SCALABLE_MD_SCALE 3`
`17`	`17`
`18`		`-static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack, u32 rtt,`
	`18`	`+static void tcp_scalable_cong_avoid(struct sock *sk, u32 ack,`
`19`	`19`	`u32 in_flight, int flag)`
`20`	`20`	`{`
`21`	`21`	`struct tcp_sock *tp = tcp_sk(sk);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static void tcp_yeah_pkts_acked(struct sock *sk, u32 pkts_acked, ktime_t last)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack,`
`73`		`- u32 seq_rtt, u32 in_flight, int flag)`
	`73`	`+ u32 in_flight, int flag)`
`74`	`74`	`{`
`75`	`75`	`struct tcp_sock *tp = tcp_sk(sk);`
`76`	`76`	`struct yeah *yeah = inet_csk_ca(sk);`