tcp: add tcp_sock_set_user_timeout

Add a helper to directly set the TCP_USER_TIMEOUT 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/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 4c70fe9d19ab2d3995dd22f64407046e765f31a2..79a23171946001193a550d404c5cf36814f5202a 100644 (file)
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1441,14 +1441,6 @@ static void o2net_rx_until_empty(struct work_struct *work)
        sc_put(sc);
 }
 
-static int o2net_set_usertimeout(struct socket *sock)
-{
-       int user_timeout = O2NET_TCP_USER_TIMEOUT;
-
-       return kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
-                               (void *)&user_timeout, sizeof(user_timeout));
-}
-
 static void o2net_initialize_handshake(void)
 {
        o2net_hand->o2hb_heartbeat_timeout_ms = cpu_to_be32(
@@ -1629,12 +1621,7 @@ static void o2net_start_connect(struct work_struct *work)
        }
 
        tcp_sock_set_nodelay(sc->sc_sock->sk);
-
-       ret = o2net_set_usertimeout(sock);
-       if (ret) {
-               mlog(ML_ERROR, "set TCP_USER_TIMEOUT failed with %d\n", ret);
-               goto out;
-       }
+       tcp_sock_set_user_timeout(sock->sk, O2NET_TCP_USER_TIMEOUT);
 
        o2net_register_callbacks(sc->sc_sock->sk, sc);
 
@@ -1821,12 +1808,7 @@ static int o2net_accept_one(struct socket *sock, int *more)
        new_sock->sk->sk_allocation = GFP_ATOMIC;
 
        tcp_sock_set_nodelay(new_sock->sk);
-
-       ret = o2net_set_usertimeout(new_sock);
-       if (ret) {
-               mlog(ML_ERROR, "set TCP_USER_TIMEOUT failed with %d\n", ret);
-               goto out;
-       }
+       tcp_sock_set_user_timeout(new_sock->sk, O2NET_TCP_USER_TIMEOUT);
 
        ret = new_sock->ops->getname(new_sock, (struct sockaddr *) &sin, 1);
        if (ret < 0)

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 6aa4ae5ebf3d5f62548ea565c546c95e5328428f..de682143efe4d4945533d8ab8e85d65b0386b060 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -501,5 +501,6 @@ void tcp_sock_set_cork(struct sock *sk, bool on);
 void tcp_sock_set_nodelay(struct sock *sk);
 void tcp_sock_set_quickack(struct sock *sk, int val);
 int tcp_sock_set_syncnt(struct sock *sk, int val);
+void tcp_sock_set_user_timeout(struct sock *sk, u32 val);
 
 #endif /* _LINUX_TCP_H */

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d2c67ae1da07acdb2fe02d1dca554ac0403a9656..0004bd9ae7b0a76634dde2c913a57fc749a63e2d 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2893,6 +2893,14 @@ int tcp_sock_set_syncnt(struct sock *sk, int val)
 }
 EXPORT_SYMBOL(tcp_sock_set_syncnt);
 
+void tcp_sock_set_user_timeout(struct sock *sk, u32 val)
+{
+       lock_sock(sk);
+       inet_csk(sk)->icsk_user_timeout = val;
+       release_sock(sk);
+}
+EXPORT_SYMBOL(tcp_sock_set_user_timeout);
+
 /*
  *     Socket option code for TCP.
  */

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 399848c2bcb299b965db6ee25a4fee6576a39e16..231fd6162f68da9989c5916ff0a41c607b030e93 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2115,8 +2115,7 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt,
                        (char *)&keepcnt, sizeof(keepcnt));
 
        /* TCP user timeout (see RFC5482) */
-       kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
-                       (char *)&timeo, sizeof(timeo));
+       tcp_sock_set_user_timeout(sock->sk, timeo);
 }
 
 static void xs_tcp_set_connect_timeout(struct rpc_xprt *xprt,