iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: set TCP_KEEPINTVL locklessly

Browse Source 
tp->keepalive_intvl can be set locklessly, readers
are already taking care of this field being potentially
set by other threads.

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>
This commit is contained in:
Eric Dumazet 2023-08-04 14:46:13 +00:00 committed by David S. Miller
parent d58f2e15aa
commit 6fd70a6b4e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/tcp.c
View File

@ -3348,9 +3348,7 @@ int tcp_sock_set_keepintvl(struct sock *sk, int val)
if (val < 1 || val > MAX_TCP_KEEPINTVL) if (val < 1 || val > MAX_TCP_KEEPINTVL)
return -EINVAL; return -EINVAL;
lock_sock(sk);
WRITE_ONCE(tcp_sk(sk)->keepalive_intvl, val * HZ); WRITE_ONCE(tcp_sk(sk)->keepalive_intvl, val * HZ);
release_sock(sk);
return 0; return 0;
} }
EXPORT_SYMBOL(tcp_sock_set_keepintvl); EXPORT_SYMBOL(tcp_sock_set_keepintvl);
@ -3471,6 +3469,8 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
return tcp_sock_set_syncnt(sk, val); return tcp_sock_set_syncnt(sk, val);
case TCP_USER_TIMEOUT: case TCP_USER_TIMEOUT:
return tcp_sock_set_user_timeout(sk, val); return tcp_sock_set_user_timeout(sk, val);
case TCP_KEEPINTVL:
return tcp_sock_set_keepintvl(sk, val);
} }
sockopt_lock_sock(sk); sockopt_lock_sock(sk);
@ -3568,12 +3568,6 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
case TCP_KEEPIDLE: case TCP_KEEPIDLE:
err = tcp_sock_set_keepidle_locked(sk, val); err = tcp_sock_set_keepidle_locked(sk, val);
break; break;
case TCP_KEEPINTVL:
if (val < 1 || val > MAX_TCP_KEEPINTVL)
err = -EINVAL;
else
WRITE_ONCE(tp->keepalive_intvl, val * HZ);
break;
case TCP_KEEPCNT: case TCP_KEEPCNT:
if (val < 1 || val > MAX_TCP_KEEPCNT) if (val < 1 || val > MAX_TCP_KEEPCNT)
err = -EINVAL; err = -EINVAL;