Commit ce3d9544 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

net: add sock_set_keepalive 



Add a helper to directly set the SO_KEEPALIVE sockopt from kernel space
without going through a fake uaccess.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 783da70e

fs/dlm/lowcomms.c

+1 −5
Original line number Diff line number Diff line
@@ -1142,11 +1142,7 @@ static struct socket *tcp_create_listen_sock(struct connection *con, 
		con->sock = NULL;

		goto create_out;

	}

	result = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,

				 (char *)&one, sizeof(one));

	if (result < 0) {

		log_print("Set keepalive failed: %d", result);

	}

	sock_set_keepalive(sock->sk);



	result = sock->ops->listen(sock, 5);

	if (result < 0) {

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -2691,6 +2691,7 @@ void sock_def_readable(struct sock *sk); 
int sock_bindtoindex(struct sock *sk, int ifindex);

void sock_enable_timestamps(struct sock *sk);

void sock_no_linger(struct sock *sk);

void sock_set_keepalive(struct sock *sk);

void sock_set_priority(struct sock *sk, u32 priority);

void sock_set_reuseaddr(struct sock *sk);

void sock_set_sndtimeo(struct sock *sk, s64 secs);

net/core/sock.c

+10 −0
Original line number Diff line number Diff line
@@ -779,6 +779,16 @@ void sock_enable_timestamps(struct sock *sk) 
}

EXPORT_SYMBOL(sock_enable_timestamps);



void sock_set_keepalive(struct sock *sk)

{

	lock_sock(sk);

	if (sk->sk_prot->keepalive)

		sk->sk_prot->keepalive(sk, true);

	sock_valbool_flag(sk, SOCK_KEEPOPEN, true);

	release_sock(sk);

}

EXPORT_SYMBOL(sock_set_keepalive);



/*

 *	This is meant for all protocols to use and covers goings on

 *	at the socket level. Everything here is generic.

net/rds/tcp_listen.c

+1 −5
Original line number Diff line number Diff line
@@ -43,13 +43,9 @@ int rds_tcp_keepalive(struct socket *sock) 
	/* values below based on xs_udp_default_timeout */

	int keepidle = 5; /* send a probe 'keepidle' secs after last data */

	int keepcnt = 5; /* number of unack'ed probes before declaring dead */

	int keepalive = 1;

	int ret = 0;



	ret = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,

				(char *)&keepalive, sizeof(keepalive));

	if (ret < 0)

		goto bail;

	sock_set_keepalive(sock->sk);



	ret = kernel_setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT,

				(char *)&keepcnt, sizeof(keepcnt));

net/sunrpc/xprtsock.c

+1 −3
Original line number Diff line number Diff line
@@ -2110,7 +2110,6 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt, 
	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);

	unsigned int keepidle;

	unsigned int keepcnt;

	unsigned int opt_on = 1;

	unsigned int timeo;



	spin_lock(&xprt->transport_lock);
@@ -2122,8 +2121,7 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt, 
	spin_unlock(&xprt->transport_lock);



	/* TCP Keepalive options */

	kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,

			(char *)&opt_on, sizeof(opt_on));

	sock_set_keepalive(sock->sk);

	kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE,

			(char *)&keepidle, sizeof(keepidle));

	kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE