X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-socket.c;h=b801b4727344894aee8bf59e05b8c708c7b03e16;hb=d720fbaadad9;hp=642d8b53bb2b22115ec91b0fe8fe96b8341835b5;hpb=25929ea0d2955afc6fb1150e57fd8e527ffc6b4f;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c index 642d8b5..b801b47 100644 --- a/lnet/lnet/lib-socket.c +++ b/lnet/lnet/lib-socket.c @@ -39,6 +39,7 @@ /* For sys_open & sys_close */ #include #include +#include #include #include @@ -175,49 +176,90 @@ lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout) } EXPORT_SYMBOL(lnet_sock_read); -static int -lnet_sock_create(struct socket **sockp, int *fatal, - __u32 local_ip, int local_port, struct net *ns) +int choose_ipv4_src(__u32 *ret, int interface, __u32 dst_ipaddr, struct net *ns) +{ + struct net_device *dev; + struct in_device *in_dev; + int err; + DECLARE_CONST_IN_IFADDR(ifa); + + rcu_read_lock(); + dev = dev_get_by_index_rcu(ns, interface); + err = -EINVAL; + if (!dev || !(dev->flags & IFF_UP)) + goto out; + in_dev = __in_dev_get_rcu(dev); + if (!in_dev) + goto out; + err = -ENOENT; + in_dev_for_each_ifa_rcu(ifa, in_dev) { + if (*ret == 0 || + ((dst_ipaddr ^ ntohl(ifa->ifa_local)) + & ntohl(ifa->ifa_mask)) == 0) { + /* This address at least as good as what we + * already have + */ + *ret = ntohl(ifa->ifa_local); + err = 0; + } + } + endfor_ifa(in_dev); +out: + rcu_read_unlock(); + return err; +} +EXPORT_SYMBOL(choose_ipv4_src); + +static struct socket * +lnet_sock_create(int interface, struct sockaddr *remaddr, + 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(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; } - if (local_ip != 0 || local_port != 0) { - memset(&locaddr, 0, sizeof(locaddr)); + if (interface >= 0 || local_port != 0) { + struct sockaddr_in locaddr = {}; + locaddr.sin_family = AF_INET; + locaddr.sin_addr.s_addr = INADDR_ANY; + if (interface >= 0) { + struct sockaddr_in *sin = (void *)remaddr; + __u32 ip; + + rc = choose_ipv4_src(&ip, + interface, + ntohl(sin->sin_addr.s_addr), + ns); + if (rc) + goto failed; + locaddr.sin_addr.s_addr = htonl(ip); + } + locaddr.sin_port = htons(local_port); - locaddr.sin_addr.s_addr = (local_ip == 0) ? - INADDR_ANY : htonl(local_ip); rc = kernel_bind(sock, (struct sockaddr *)&locaddr, sizeof(locaddr)); if (rc == -EADDRINUSE) { CDEBUG(D_NET, "Port %d already in use\n", local_port); - *fatal = 0; goto failed; } if (rc != 0) { @@ -226,11 +268,11 @@ lnet_sock_create(struct socket **sockp, int *fatal, goto failed; } } - return 0; + return sock; failed: sock_release(sock); - return rc; + return ERR_PTR(rc); } int @@ -308,110 +350,63 @@ lnet_sock_getbuf(struct socket *sock, int *txbufsize, int *rxbufsize) } EXPORT_SYMBOL(lnet_sock_getbuf); -int -lnet_sock_listen(struct socket **sockp, - __u32 local_ip, int local_port, int backlog, struct net *ns) +struct socket * +lnet_sock_listen(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, ns); - if (rc != 0) { - if (!fatal) + sock = lnet_sock_create(-1, NULL, 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; -} - -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, +struct socket * +lnet_sock_connect(int interface, int local_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, ns); - if (rc != 0) - return rc; + struct socket *sock; + struct sockaddr_in srvaddr; + int rc; 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, + sock = lnet_sock_create(interface, (struct sockaddr *)&srvaddr, + local_port, ns); + if (IS_ERR(sock)) + return sock; + + 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 %d -> %pI4h/%d\n", rc, + local_port, &peer_ip, peer_port); - sock_release(*sockp); - return rc; + sock_release(sock); + return ERR_PTR(rc); }