diff options
| author |   Eric Dumazet <edumazet@google.com> | 2018-05-10 14:59:43 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-11 12:24:37 -0400 |
| commit | 73a6bab5aa2a83cb7df85805e08bc03b4065aea7 (patch) | |
| tree | 7f542e5b0873c4dc56003c784c2df12fed79364c /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'dsa-Plug-in-PHYLINK-support' (diff) | |
| download | linux-dev-73a6bab5aa2a83cb7df85805e08bc03b4065aea7.tar.xz linux-dev-73a6bab5aa2a83cb7df85805e08bc03b4065aea7.zip | |
tcp: switch pacing timer to softirq based hrtimer
linux-4.16 got support for softirq based hrtimers.
TCP can switch its pacing hrtimer to this variant, since this
avoids going through a tasklet and some atomic operations.
pacing timer logic looks like other (jiffies based) tcp timers.
v2: use hrtimer_try_to_cancel() in tcp_clear_xmit_timers()
to correctly release reference on socket if needed.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index f7d944855f8e..92bdf64fffae 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -713,6 +713,6 @@ 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_MODE_ABS_PINNED); + HRTIMER_MODE_ABS_PINNED_SOFT); tcp_sk(sk)->pacing_timer.function = tcp_pace_kick; } |