Commit 6fd70a6b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: set TCP_KEEPINTVL locklessly 



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

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d58f2e15

net/ipv4/tcp.c

+2 −8
Original line number Diff line number Diff line
@@ -3348,9 +3348,7 @@ int tcp_sock_set_keepintvl(struct sock *sk, int val) 
	if (val < 1 || val > MAX_TCP_KEEPINTVL)

		return -EINVAL;



	lock_sock(sk);

	WRITE_ONCE(tcp_sk(sk)->keepalive_intvl, val * HZ);

	release_sock(sk);

	return 0;

}

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);

	case TCP_USER_TIMEOUT:

		return tcp_sock_set_user_timeout(sk, val);

	case TCP_KEEPINTVL:

		return tcp_sock_set_keepintvl(sk, val);

	}



	sockopt_lock_sock(sk);
@@ -3568,12 +3568,6 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
	case TCP_KEEPIDLE:

		err = tcp_sock_set_keepidle_locked(sk, val);

		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:

		if (val < 1 || val > MAX_TCP_KEEPCNT)

			err = -EINVAL;