tcp: switch internal pacing timer to CLOCK_TAI

Eric Dumazet · davem330 · commit fd2bca2aa789 · 2018-09-21T19:37:59.000-07:00
Next patch will use tcp_wstamp_ns to feed internal
TCP pacing timer, so switch to CLOCK_TAI to share same base.

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_output.c b/net/ipv4/tcp_output.c
@@ -1007,7 +1007,7 @@ static void tcp_internal_pacing(struct sock *sk, const struct sk_buff *skb)
 	len_ns = (u64)skb->len * NSEC_PER_SEC;
 	do_div(len_ns, rate);
 	hrtimer_start(&tcp_sk(sk)->pacing_timer,
-		      ktime_add_ns(ktime_get(), len_ns),
+		      ktime_add_ns(ktime_get_tai_ns(), len_ns),
 		      HRTIMER_MODE_ABS_PINNED_SOFT);
 	sock_hold(sk);
 }
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
@@ -758,7 +758,7 @@ void tcp_init_xmit_timers(struct sock *sk)
 {
 	inet_csk_init_xmit_timers(sk, &tcp_write_timer, &tcp_delack_timer,
 				  &tcp_keepalive_timer);
-	hrtimer_init(&tcp_sk(sk)->pacing_timer, CLOCK_MONOTONIC,
+	hrtimer_init(&tcp_sk(sk)->pacing_timer, CLOCK_TAI,
 		     HRTIMER_MODE_ABS_PINNED_SOFT);
 	tcp_sk(sk)->pacing_timer.function = tcp_pace_kick;
 

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ static void tcp_internal_pacing(struct sock sk, const struct sk_buff skb)`
`1007`	`1007`	`len_ns = (u64)skb->len * NSEC_PER_SEC;`
`1008`	`1008`	`do_div(len_ns, rate);`
`1009`	`1009`	`hrtimer_start(&tcp_sk(sk)->pacing_timer,`
`1010`		`- ktime_add_ns(ktime_get(), len_ns),`
	`1010`	`+ ktime_add_ns(ktime_get_tai_ns(), len_ns),`
`1011`	`1011`	`HRTIMER_MODE_ABS_PINNED_SOFT);`
`1012`	`1012`	`sock_hold(sk);`
`1013`	`1013`	`}`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ void tcp_init_xmit_timers(struct sock *sk)`
`758`	`758`	`{`
`759`	`759`	`inet_csk_init_xmit_timers(sk, &tcp_write_timer, &tcp_delack_timer,`
`760`	`760`	`&tcp_keepalive_timer);`
`761`		`- hrtimer_init(&tcp_sk(sk)->pacing_timer, CLOCK_MONOTONIC,`
	`761`	`+ hrtimer_init(&tcp_sk(sk)->pacing_timer, CLOCK_TAI,`
`762`	`762`	`HRTIMER_MODE_ABS_PINNED_SOFT);`
`763`	`763`	`tcp_sk(sk)->pacing_timer.function = tcp_pace_kick;`
`764`	`764`