summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-05-16 17:00:12 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-17 16:06:01 -0400
commit46bf466f08c9db0db1b77d3ecb5694926c73583a (patch)
tree6fde1cd1d871495e385d0e3091c1fa1075d951a6
parentad5ad69e6b48a7e5cc0391cc57c9e8a93a0c969c (diff)
tcp_lp: cache tcp_time_stamp
tcp_time_stamp will become slightly more expensive soon, cache its value. Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_lp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
index d6fb6c067af4..ef3122abb373 100644
--- a/net/ipv4/tcp_lp.c
+++ b/net/ipv4/tcp_lp.c
@@ -264,18 +264,19 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)
264{ 264{
265 struct tcp_sock *tp = tcp_sk(sk); 265 struct tcp_sock *tp = tcp_sk(sk);
266 struct lp *lp = inet_csk_ca(sk); 266 struct lp *lp = inet_csk_ca(sk);
267 u32 now = tcp_time_stamp;
267 u32 delta; 268 u32 delta;
268 269
269 if (sample->rtt_us > 0) 270 if (sample->rtt_us > 0)
270 tcp_lp_rtt_sample(sk, sample->rtt_us); 271 tcp_lp_rtt_sample(sk, sample->rtt_us);
271 272
272 /* calc inference */ 273 /* calc inference */
273 delta = tcp_time_stamp - tp->rx_opt.rcv_tsecr; 274 delta = now - tp->rx_opt.rcv_tsecr;
274 if ((s32)delta > 0) 275 if ((s32)delta > 0)
275 lp->inference = 3 * delta; 276 lp->inference = 3 * delta;
276 277
277 /* test if within inference */ 278 /* test if within inference */
278 if (lp->last_drop && (tcp_time_stamp - lp->last_drop < lp->inference)) 279 if (lp->last_drop && (now - lp->last_drop < lp->inference))
279 lp->flag |= LP_WITHIN_INF; 280 lp->flag |= LP_WITHIN_INF;
280 else 281 else
281 lp->flag &= ~LP_WITHIN_INF; 282 lp->flag &= ~LP_WITHIN_INF;
@@ -312,7 +313,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample)
312 tp->snd_cwnd = max(tp->snd_cwnd >> 1U, 1U); 313 tp->snd_cwnd = max(tp->snd_cwnd >> 1U, 1U);
313 314
314 /* record this drop time */ 315 /* record this drop time */
315 lp->last_drop = tcp_time_stamp; 316 lp->last_drop = now;
316} 317}
317 318
318static struct tcp_congestion_ops tcp_lp __read_mostly = { 319static struct tcp_congestion_ops tcp_lp __read_mostly = {