#include <libcfs/libcfs.h>
#include <lnet/lib-lnet.h>
+/*
+ * 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
+
+#ifndef SO_RCVTIMEO
+#define SO_RCVTIMEO SO_RCVTIMEO_OLD
+#endif
+
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;
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) {
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;
};
/* 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) {
}
EXPORT_SYMBOL(lnet_sock_read);
-static int
-lnet_sock_create(struct socket **sockp, int *fatal,
- __u32 local_ip, int local_port)
+static struct socket *
+lnet_sock_create(__u32 local_ip, int local_port, struct net *ns)
{
struct sockaddr_in locaddr;
struct socket *sock;
int rc;
int option;
- /* All errors are fatal except bind failure if the port is in use */
- *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
- *sockp = sock;
- if (rc != 0) {
+ if (rc) {
CERROR("Can't create socket: %d\n", rc);
- return rc;
+ return ERR_PTR(rc);
}
option = 1;
rc = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(char *)&option, sizeof(option));
- if (rc != 0) {
+ if (rc) {
CERROR("Can't set SO_REUSEADDR for socket: %d\n", rc);
goto failed;
}
sizeof(locaddr));
if (rc == -EADDRINUSE) {
CDEBUG(D_NET, "Port %d already in use\n", local_port);
- *fatal = 0;
goto failed;
}
if (rc != 0) {
goto failed;
}
}
- return 0;
+ return sock;
failed:
sock_release(sock);
- return rc;
+ return ERR_PTR(rc);
}
int
}
EXPORT_SYMBOL(lnet_sock_getbuf);
-int
-lnet_sock_listen(struct socket **sockp,
- __u32 local_ip, int local_port, int backlog)
+struct socket *
+lnet_sock_listen(__u32 local_ip, int local_port, int backlog, struct net *ns)
{
- int fatal;
- int rc;
+ struct socket *sock;
+ int rc;
- rc = lnet_sock_create(sockp, &fatal, local_ip, local_port);
- if (rc != 0) {
- if (!fatal)
+ sock = lnet_sock_create(local_ip, local_port, ns);
+ if (IS_ERR(sock)) {
+ rc = PTR_ERR(sock);
+ if (rc == -EADDRINUSE)
CERROR("Can't create socket: port %d already in use\n",
local_port);
- return rc;
+ return ERR_PTR(rc);
}
- rc = kernel_listen(*sockp, backlog);
+ rc = kernel_listen(sock, backlog);
if (rc == 0)
- return 0;
+ return sock;
CERROR("Can't set listen backlog %d: %d\n", backlog, rc);
- sock_release(*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)
-{
- wait_queue_entry_t wait;
- struct socket *newsock;
- int rc;
-
- /* XXX this should add a ref to sock->ops->owner, if
- * TCP could be a module */
- rc = sock_create_lite(PF_PACKET, sock->type, IPPROTO_TCP, &newsock);
- if (rc) {
- CERROR("Can't allocate socket\n");
- return rc;
- }
-
- 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);
- add_wait_queue(sk_sleep(sock->sk), &wait);
- 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)
- goto failed;
-
- *newsockp = newsock;
- return 0;
-
-failed:
- sock_release(newsock);
- return rc;
+ sock_release(sock);
+ return ERR_PTR(rc);
}
-int
-lnet_sock_connect(struct socket **sockp, int *fatal,
- __u32 local_ip, int local_port,
- __u32 peer_ip, int peer_port)
+struct socket *
+lnet_sock_connect(__u32 local_ip, int local_port,
+ __u32 peer_ip, int peer_port,
+ struct net *ns)
{
- struct sockaddr_in srvaddr;
- int rc;
+ struct socket *sock;
+ struct sockaddr_in srvaddr;
+ int rc;
- rc = lnet_sock_create(sockp, fatal, local_ip, local_port);
- if (rc != 0)
- return rc;
+ sock = lnet_sock_create(local_ip, local_port, ns);
+ if (IS_ERR(sock))
+ return sock;
memset(&srvaddr, 0, sizeof(srvaddr));
srvaddr.sin_family = AF_INET;
srvaddr.sin_port = htons(peer_port);
srvaddr.sin_addr.s_addr = htonl(peer_ip);
- rc = kernel_connect(*sockp, (struct sockaddr *)&srvaddr,
+ rc = kernel_connect(sock, (struct sockaddr *)&srvaddr,
sizeof(srvaddr), 0);
if (rc == 0)
- return 0;
+ return sock;
/* EADDRNOTAVAIL probably means we're already connected to the same
* peer/port on the same local port on a differently typed
* connection. Let our caller retry with a different local
* port... */
- *fatal = !(rc == -EADDRNOTAVAIL);
- CDEBUG_LIMIT(*fatal ? D_NETERROR : D_NET,
- "Error %d connecting %pI4h/%d -> %pI4h/%d\n", rc,
- &local_ip, local_port, &peer_ip, peer_port);
+ CDEBUG_LIMIT(rc == -EADDRNOTAVAIL ? D_NET : D_NETERROR,
+ "Error %d connecting %pI4h/%d -> %pI4h/%d\n", rc,
+ &local_ip, local_port, &peer_ip, peer_port);
- sock_release(*sockp);
- return rc;
+ sock_release(sock);
+ return ERR_PTR(rc);
}