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: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index b79711d0aac72d7dc519b55e0de3d3a2352d7e6c..b6e6dba2815472bae58f0de0358e4d204a353275 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -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) {

diff --git a/include/net/sock.h b/include/net/sock.h
index 99ef43508d2b5ab4c42d6c0031870fb3e12753ba..dc08c176238fdc77c92a89132171e67e1f1eac95 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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);

diff --git a/net/core/sock.c b/net/core/sock.c
index e4a4dd2b3d8b30aa2f0efcd161aabdd866a27861..728f5fb156a0c43ce6f0861a5c702d02055fef95 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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.

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index bbb31b9c0b391f9e4f64605c2159f842e0b5b5d6..d8bd132769594092cfd5d6ec74aef799093024b8 100644 (file)
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -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));

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 845d0be805ece18da98e87886c08595d18252d65..30082cd0399606afa464331fe91317c782b3ee07 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -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,