]> Gentwo Git Trees - linux/.git/commit
tcp: introduce icsk->icsk_keepalive_timer
authorEric Dumazet <edumazet@google.com>
Mon, 24 Nov 2025 17:50:12 +0000 (17:50 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 26 Nov 2025 03:28:29 +0000 (19:28 -0800)
commit08dfe370239e53494453cee1e2ded2cdaa1efd12
tree878e15683ddc34dbcef1e14ca85c088aba1c34b5
parent27e8257a86516682e2ec5d7543a8909c37ae8b00
tcp: introduce icsk->icsk_keepalive_timer

sk->sk_timer has been used for TCP keepalives.

Keepalive timers are not in fast path, we want to use sk->sk_timer
storage for retransmit timers, for better cache locality.

Create icsk->icsk_keepalive_timer and change keepalive
code to no longer use sk->sk_timer.

Added space is reclaimed in the following patch.

This includes changes to MPTCP, which was also using sk_timer.

Alias icsk->mptcp_tout_timer and icsk->icsk_keepalive_timer
for inet_sk_diag_fill() sake.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20251124175013.1473655-4-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Documentation/networking/net_cachelines/inet_connection_sock.rst
include/net/inet_connection_sock.h
net/ipv4/inet_connection_sock.c
net/ipv4/inet_diag.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_timer.c
net/ipv6/tcp_ipv6.c
net/mptcp/protocol.c
net/mptcp/protocol.h
tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c
tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c