X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-socket.c;h=642d8b53bb2b22115ec91b0fe8fe96b8341835b5;hb=d45a032d9a5c6929f62e00e75d8fb0103cc0fbb4;hp=0a10a38146e20ed3b9e77c53632325934248f8bf;hpb=d66bba81fc641f8b3f7f8d01fe5da0d6406b7ed0;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c index 0a10a38..642d8b5 100644 --- a/lnet/lnet/lib-socket.c +++ b/lnet/lnet/lib-socket.c @@ -43,203 +43,32 @@ #include #include -static int -lnet_sock_ioctl(int cmd, unsigned long arg) -{ - struct socket *sock; - int rc; - -#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); +/* + * 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 (rc != 0) { - CERROR("Can't create socket: %d\n", rc); - return rc; - } - - if (cmd == SIOCGIFFLAGS) { - /* This cmd is used only to get IFF_UP flag */ - struct ifreq *ifr = (struct ifreq *) arg; - struct net_device *dev; - - dev = dev_get_by_name(sock_net(sock->sk), ifr->ifr_name); - if (dev) { - ifr->ifr_flags = dev->flags; - dev_put(dev); - rc = 0; - } else { - rc = -ENODEV; - } - } else { - rc = kernel_sock_ioctl(sock, cmd, arg); - } - sock_release(sock); - - 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 */ - struct net_device *dev; - struct socket *sock; - char **names; - int toobig; - int nalloc; - int nfound; - int rc; - int nob; - int i; - - nalloc = 16; /* first guess at max interfaces */ - toobig = 0; - nfound = 0; - -#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); +#ifndef SO_RCVTIMEO +#define SO_RCVTIMEO SO_RCVTIMEO_OLD #endif - if (rc) { - CERROR("Can't create socket: %d\n", rc); - return rc; - } - - for_each_netdev(sock_net(sock->sk), dev) - nfound++; - - if (nfound == 0) - goto out_release_sock; - - LIBCFS_ALLOC(names, nfound * sizeof(*names)); - if (names == NULL) { - rc = -ENOMEM; - goto out_release_sock; - } - - i = 0; - for_each_netdev(sock_net(sock->sk), dev) { - nob = strnlen(dev->name, IFNAMSIZ); - if (nob == IFNAMSIZ) { - /* no space for terminating NULL */ - CERROR("interface name %.*s too long (%d max)\n", - nob, dev->name, IFNAMSIZ); - rc = -ENAMETOOLONG; - goto out_free_names; - } - - LIBCFS_ALLOC(names[i], IFNAMSIZ); - if (!names[i]) { - rc = -ENOMEM; - goto out_free_names; - } - - memcpy(names[i], dev->name, nob); - names[i][nob] = 0; - i++; - } - - *namesp = names; - rc = i; - -out_free_names: - if (rc < 0) - lnet_ipif_free_enumeration(names, nfound); -out_release_sock: - sock_release(sock); - return rc; -} -EXPORT_SYMBOL(lnet_ipif_enumerate); int lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout) { int rc; - long jiffies_left = timeout * msecs_to_jiffies(MSEC_PER_SEC); + long jiffies_left = cfs_time_seconds(timeout); unsigned long then; struct timeval tv; @@ -258,15 +87,7 @@ lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout) if (timeout != 0) { /* Set send timeout to remaining time */ - tv = (struct timeval) { - .tv_sec = jiffies_left / - msecs_to_jiffies(MSEC_PER_SEC), - .tv_usec = ((jiffies_left % - msecs_to_jiffies(MSEC_PER_SEC)) * - USEC_PER_SEC) / - msecs_to_jiffies(MSEC_PER_SEC) - }; - + jiffies_to_timeval(jiffies_left, &tv); rc = kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv)); if (rc != 0) { @@ -306,7 +127,7 @@ int lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout) { int rc; - long jiffies_left = timeout * msecs_to_jiffies(MSEC_PER_SEC); + long jiffies_left = cfs_time_seconds(timeout); unsigned long then; struct timeval tv; @@ -323,13 +144,7 @@ lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout) }; /* Set receive timeout to remaining time */ - tv = (struct timeval) { - .tv_sec = jiffies_left / msecs_to_jiffies(MSEC_PER_SEC), - .tv_usec = ((jiffies_left % - msecs_to_jiffies(MSEC_PER_SEC)) * - USEC_PER_SEC) / - msecs_to_jiffies(MSEC_PER_SEC) - }; + jiffies_to_timeval(jiffies_left, &tv); rc = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv)); if (rc != 0) { @@ -362,7 +177,7 @@ EXPORT_SYMBOL(lnet_sock_read); static int lnet_sock_create(struct socket **sockp, int *fatal, - __u32 local_ip, int local_port) + __u32 local_ip, int local_port, struct net *ns) { struct sockaddr_in locaddr; struct socket *sock; @@ -373,7 +188,7 @@ lnet_sock_create(struct socket **sockp, int *fatal, *fatal = 1; #ifdef HAVE_SOCK_CREATE_KERN_USE_NET - rc = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, 0, &sock); + rc = sock_create_kern(ns, PF_INET, SOCK_STREAM, 0, &sock); #else rc = sock_create_kern(PF_INET, SOCK_STREAM, 0, &sock); #endif @@ -453,14 +268,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; @@ -491,12 +310,12 @@ EXPORT_SYMBOL(lnet_sock_getbuf); int lnet_sock_listen(struct socket **sockp, - __u32 local_ip, int local_port, int backlog) + __u32 local_ip, int local_port, int backlog, struct net *ns) { int fatal; int rc; - rc = lnet_sock_create(sockp, &fatal, local_ip, local_port); + rc = lnet_sock_create(sockp, &fatal, local_ip, local_port, ns); if (rc != 0) { if (!fatal) CERROR("Can't create socket: port %d already in use\n", @@ -513,13 +332,6 @@ lnet_sock_listen(struct socket **sockp, return rc; } -#ifndef HAVE_SK_SLEEP -static inline wait_queue_head_t *sk_sleep(struct sock *sk) -{ - return sk->sk_sleep; -} -#endif - int lnet_sock_accept(struct socket **newsockp, struct socket *sock) { @@ -570,12 +382,13 @@ failed: int lnet_sock_connect(struct socket **sockp, int *fatal, __u32 local_ip, int local_port, - __u32 peer_ip, int peer_port) + __u32 peer_ip, int peer_port, + struct net *ns) { struct sockaddr_in srvaddr; int rc; - rc = lnet_sock_create(sockp, fatal, local_ip, local_port); + rc = lnet_sock_create(sockp, fatal, local_ip, local_port, ns); if (rc != 0) return rc;