Whamcloud - gitweb
LU-12400 lnet: SO_SNDTIMEO, SO_RCVTIMEO removed
[fs/lustre-release.git] / lnet / lnet / lib-socket.c
index 4f8501b..4a8bf1a 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2015, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 
-static int
-kernel_sock_unlocked_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-       mm_segment_t oldfs = get_fs();
-       int err;
-
-       set_fs(KERNEL_DS);
-       err = filp->f_op->unlocked_ioctl(filp, cmd, arg);
-       set_fs(oldfs);
-
-       return err;
-}
-
-static int
-lnet_sock_ioctl(int cmd, unsigned long arg)
-{
-       struct file    *sock_filp;
-       struct socket  *sock;
-       int             fd = -1;
-       int             rc;
-
-       rc = sock_create(PF_INET, SOCK_STREAM, 0, &sock);
-       if (rc != 0) {
-               CERROR("Can't create socket: %d\n", rc);
-               return rc;
-       }
-
-#if !defined(HAVE_SOCK_ALLOC_FILE) && !defined(HAVE_SOCK_ALLOC_FILE_3ARGS)
-       fd = sock_map_fd(sock, 0);
-       if (fd < 0) {
-               rc = fd;
-               sock_release(sock);
-               goto out;
-       }
-       sock_filp = fget(fd);
-#else
-# ifdef HAVE_SOCK_ALLOC_FILE_3ARGS
-       sock_filp = sock_alloc_file(sock, 0, NULL);
-# else
-       sock_filp = sock_alloc_file(sock, 0);
-# endif
+/*
+ * kernel 5.1: commit 7f1bc6e95d7840d4305595b3e4025cddda88cee5
+ * Y2038 64-bit time.
+ *  SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING options, the
+ *  way they are currently defined, are not y2038 safe.
+ *  Subsequent patches in the series add new y2038 safe versions
+ *  of these options which provide 64 bit timestamps on all
+ *  architectures uniformly.
+ *  Hence, rename existing options with OLD tag suffixes.
+ *
+ * NOTE: When updating to timespec64 change change these to '_NEW'.
+ *
+ */
+#ifndef SO_SNDTIMEO
+#define SO_SNDTIMEO SO_SNDTIMEO_OLD
 #endif
-       if (IS_ERR(sock_filp)) {
-               rc = PTR_ERR(sock_filp);
-               sock_release(sock);
-               goto out;
-       }
-
-       rc = kernel_sock_unlocked_ioctl(sock_filp, cmd, arg);
-
-       fput(sock_filp);
-out:
-       if (fd >= 0)
-               sys_close(fd);
-       return rc;
-}
 
-int
-lnet_ipif_query(char *name, int *up, __u32 *ip, __u32 *mask)
-{
-       struct ifreq    ifr;
-       int             nob;
-       int             rc;
-       __u32           val;
-
-       nob = strnlen(name, IFNAMSIZ);
-       if (nob == IFNAMSIZ) {
-               CERROR("Interface name %s too long\n", name);
-               return -EINVAL;
-       }
-
-       CLASSERT(sizeof(ifr.ifr_name) >= IFNAMSIZ);
-
-       if (strlen(name) > sizeof(ifr.ifr_name)-1)
-               return -E2BIG;
-       strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-       rc = lnet_sock_ioctl(SIOCGIFFLAGS, (unsigned long)&ifr);
-       if (rc != 0) {
-               CERROR("Can't get flags for interface %s\n", name);
-               return rc;
-       }
-
-       if ((ifr.ifr_flags & IFF_UP) == 0) {
-               CDEBUG(D_NET, "Interface %s down\n", name);
-               *up = 0;
-               *ip = *mask = 0;
-               return 0;
-       }
-       *up = 1;
-
-       if (strlen(name) > sizeof(ifr.ifr_name)-1)
-               return -E2BIG;
-       strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-       ifr.ifr_addr.sa_family = AF_INET;
-       rc = lnet_sock_ioctl(SIOCGIFADDR, (unsigned long)&ifr);
-
-       if (rc != 0) {
-               CERROR("Can't get IP address for interface %s\n", name);
-               return rc;
-       }
-
-       val = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
-       *ip = ntohl(val);
-
-       if (strlen(name) > sizeof(ifr.ifr_name)-1)
-               return -E2BIG;
-       strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-
-       ifr.ifr_addr.sa_family = AF_INET;
-       rc = lnet_sock_ioctl(SIOCGIFNETMASK, (unsigned long)&ifr);
-       if (rc != 0) {
-               CERROR("Can't get netmask for interface %s\n", name);
-               return rc;
-       }
-
-       val = ((struct sockaddr_in *)&ifr.ifr_netmask)->sin_addr.s_addr;
-       *mask = ntohl(val);
-
-       return 0;
-}
-EXPORT_SYMBOL(lnet_ipif_query);
-
-void
-lnet_ipif_free_enumeration(char **names, int n)
-{
-       int     i;
-
-       LASSERT(n > 0);
-
-       for (i = 0; i < n && names[i] != NULL; i++)
-               LIBCFS_FREE(names[i], IFNAMSIZ);
-
-       LIBCFS_FREE(names, n * sizeof(*names));
-}
-EXPORT_SYMBOL(lnet_ipif_free_enumeration);
-
-int
-lnet_ipif_enumerate(char ***namesp)
-{
-       /* Allocate and fill in 'names', returning # interfaces/error */
-       char          **names;
-       int             toobig;
-       int             nalloc;
-       int             nfound;
-       struct ifreq   *ifr;
-       struct ifconf   ifc;
-       int             rc;
-       int             nob;
-       int             i;
-
-       nalloc = 16;    /* first guess at max interfaces */
-       toobig = 0;
-       for (;;) {
-               if (nalloc * sizeof(*ifr) > PAGE_SIZE) {
-                       toobig = 1;
-                       nalloc = PAGE_SIZE / sizeof(*ifr);
-                       CWARN("Too many interfaces: only enumerating "
-                             "first %d\n", nalloc);
-               }
-
-               LIBCFS_ALLOC(ifr, nalloc * sizeof(*ifr));
-               if (ifr == NULL) {
-                       CERROR("ENOMEM enumerating up to %d interfaces\n",
-                              nalloc);
-                       rc = -ENOMEM;
-                       goto out0;
-               }
-
-               ifc.ifc_buf = (char *)ifr;
-               ifc.ifc_len = nalloc * sizeof(*ifr);
-
-               rc = lnet_sock_ioctl(SIOCGIFCONF, (unsigned long)&ifc);
-               if (rc < 0) {
-                       CERROR("Error %d enumerating interfaces\n", rc);
-                       goto out1;
-               }
-
-               LASSERT(rc == 0);
-
-               nfound = ifc.ifc_len/sizeof(*ifr);
-               LASSERT(nfound <= nalloc);
-
-               if (nfound < nalloc || toobig)
-                       break;
-
-               LIBCFS_FREE(ifr, nalloc * sizeof(*ifr));
-               nalloc *= 2;
-       }
-
-       if (nfound == 0)
-               goto out1;
-
-       LIBCFS_ALLOC(names, nfound * sizeof(*names));
-       if (names == NULL) {
-               rc = -ENOMEM;
-               goto out1;
-       }
-
-       for (i = 0; i < nfound; i++) {
-               nob = strnlen(ifr[i].ifr_name, IFNAMSIZ);
-               if (nob == IFNAMSIZ) {
-                       /* no space for terminating NULL */
-                       CERROR("interface name %.*s too long (%d max)\n",
-                              nob, ifr[i].ifr_name, IFNAMSIZ);
-                       rc = -ENAMETOOLONG;
-                       goto out2;
-               }
-
-               LIBCFS_ALLOC(names[i], IFNAMSIZ);
-               if (names[i] == NULL) {
-                       rc = -ENOMEM;
-                       goto out2;
-               }
-
-               memcpy(names[i], ifr[i].ifr_name, nob);
-               names[i][nob] = 0;
-       }
-
-       *namesp = names;
-       rc = nfound;
-
- out2:
-       if (rc < 0)
-               lnet_ipif_free_enumeration(names, nfound);
- out1:
-       LIBCFS_FREE(ifr, nalloc * sizeof(*ifr));
- out0:
-       return rc;
-}
-EXPORT_SYMBOL(lnet_ipif_enumerate);
+#ifndef SO_RCVTIMEO
+#define SO_RCVTIMEO SO_RCVTIMEO_OLD
+#endif
 
 int
 lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout)
@@ -413,7 +201,11 @@ lnet_sock_create(struct socket **sockp, int *fatal,
        /* All errors are fatal except bind failure if the port is in use */
        *fatal = 1;
 
-       rc = sock_create(PF_INET, SOCK_STREAM, 0, &sock);
+#ifdef HAVE_SOCK_CREATE_KERN_USE_NET
+       rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock);
+#else
+       rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock);
+#endif
        *sockp = sock;
        if (rc != 0) {
                CERROR("Can't create socket: %d\n", rc);
@@ -490,14 +282,18 @@ int
 lnet_sock_getaddr(struct socket *sock, bool remote, __u32 *ip, int *port)
 {
        struct sockaddr_in sin;
-       int                len = sizeof(sin);
-       int                rc;
+       int rc;
+#ifndef HAVE_KERN_SOCK_GETNAME_2ARGS
+       int len = sizeof(sin);
+#endif
 
        if (remote)
-               rc = kernel_getpeername(sock, (struct sockaddr *)&sin, &len);
+               rc = lnet_kernel_getpeername(sock,
+                                            (struct sockaddr *)&sin, &len);
        else
-               rc = kernel_getsockname(sock, (struct sockaddr *)&sin, &len);
-       if (rc != 0) {
+               rc = lnet_kernel_getsockname(sock,
+                                            (struct sockaddr *)&sin, &len);
+       if (rc < 0) {
                CERROR("Error %d getting sock %s IP/port\n",
                        rc, remote ? "peer" : "local");
                return rc;
@@ -560,7 +356,7 @@ static inline wait_queue_head_t *sk_sleep(struct sock *sk)
 int
 lnet_sock_accept(struct socket **newsockp, struct socket *sock)
 {
-       wait_queue_t   wait;
+       wait_queue_entry_t wait;
        struct socket *newsock;
        int            rc;
 
@@ -574,7 +370,11 @@ lnet_sock_accept(struct socket **newsockp, struct socket *sock)
 
        newsock->ops = sock->ops;
 
+#ifdef HAVE_KERN_SOCK_ACCEPT_FLAG_ARG
+       rc = sock->ops->accept(sock, newsock, O_NONBLOCK, false);
+#else
        rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
+#endif
        if (rc == -EAGAIN) {
                /* Nothing ready, so wait for activity */
                init_waitqueue_entry(&wait, current);
@@ -582,7 +382,11 @@ lnet_sock_accept(struct socket **newsockp, struct socket *sock)
                set_current_state(TASK_INTERRUPTIBLE);
                schedule();
                remove_wait_queue(sk_sleep(sock->sk), &wait);
+#ifdef HAVE_KERN_SOCK_ACCEPT_FLAG_ARG
+               rc = sock->ops->accept(sock, newsock, O_NONBLOCK, false);
+#else
                rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
+#endif
        }
 
        if (rc != 0)