X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Facceptor.c;h=908623730a3f324e5e651c04d94781620d2610b9;hp=198b057fd6363454402a8cd9c2dfd85ab3b4c1b2;hb=26adc2e13a877507b483b2d3c3e873fbd13d2596;hpb=e5c35288861cf8ca4aecc30747b61069f9d80bb5 diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 198b057..9086237 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,123 +35,145 @@ */ #define DEBUG_SUBSYSTEM S_LNET + +#ifdef HAVE_COMPAT_RDMA +#include +#endif +#include +#include #include -#ifdef __KERNEL__ +static int accept_port = 988; +static int accept_backlog = 127; +static int accept_timeout = 5; + +static struct { + int pta_shutdown; + struct socket *pta_sock; + struct completion pta_signal; +} lnet_acceptor_state = { + .pta_shutdown = 1 +}; + +int +lnet_acceptor_port(void) +{ + return accept_port; +} + +static inline int +lnet_accept_magic(__u32 magic, __u32 constant) +{ + return (magic == constant || + magic == __swab32(constant)); +} + +EXPORT_SYMBOL(lnet_acceptor_port); + static char *accept = "secure"; + CFS_MODULE_PARM(accept, "s", charp, 0444, "Accept connections (secure|all|none)"); - -static int accept_port = 988; CFS_MODULE_PARM(accept_port, "i", int, 0444, "Acceptor's port (same on all nodes)"); - -static int accept_backlog = 127; CFS_MODULE_PARM(accept_backlog, "i", int, 0444, "Acceptor's listen backlog"); - -static int accept_timeout = 5; CFS_MODULE_PARM(accept_timeout, "i", int, 0644, - "Acceptor's timeout (seconds)"); + "Acceptor's timeout (seconds)"); -struct { - int pta_shutdown; - cfs_socket_t *pta_sock; - struct semaphore pta_signal; -} lnet_acceptor_state; +static char *accept_type = NULL; -int -lnet_acceptor_timeout(void) +static int +lnet_acceptor_get_tunables(void) { - return accept_timeout; + /* Userland acceptor uses 'accept_type' instead of 'accept', due to + * conflict with 'accept(2)', but kernel acceptor still uses 'accept' + * for compatibility. Hence the trick. */ + accept_type = accept; + return 0; } -EXPORT_SYMBOL(lnet_acceptor_timeout); int -lnet_acceptor_port(void) +lnet_acceptor_timeout(void) { - return accept_port; + return accept_timeout; } -EXPORT_SYMBOL(lnet_acceptor_port); +EXPORT_SYMBOL(lnet_acceptor_timeout); void -lnet_connect_console_error (int rc, lnet_nid_t peer_nid, +lnet_connect_console_error (int rc, lnet_nid_t peer_nid, __u32 peer_ip, int peer_port) { switch (rc) { /* "normal" errors */ case -ECONNREFUSED: - CDEBUG(D_NETERROR, "Connection to %s at host %u.%u.%u.%u " - "on port %d was refused: " - "check that Lustre is running on that node.\n", - libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port); + CNETERR("Connection to %s at host %pI4h on port %d was " + "refused: check that Lustre is running on that node.\n", + libcfs_nid2str(peer_nid), &peer_ip, peer_port); break; case -EHOSTUNREACH: case -ENETUNREACH: - CDEBUG(D_NETERROR, "Connection to %s at host %u.%u.%u.%u " - "was unreachable: the network or that node may " - "be down, or Lustre may be misconfigured.\n", - libcfs_nid2str(peer_nid), HIPQUAD(peer_ip)); + CNETERR("Connection to %s at host %pI4h " + "was unreachable: the network or that node may " + "be down, or Lustre may be misconfigured.\n", + libcfs_nid2str(peer_nid), &peer_ip); break; case -ETIMEDOUT: - CDEBUG(D_NETERROR, "Connection to %s at host %u.%u.%u.%u on " - "port %d took too long: that node may be hung " - "or experiencing high load.\n", - libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port); + CNETERR("Connection to %s at host %pI4h on " + "port %d took too long: that node may be hung " + "or experiencing high load.\n", + libcfs_nid2str(peer_nid), &peer_ip, peer_port); break; case -ECONNRESET: - LCONSOLE_ERROR_MSG(0x11b, "Connection to %s at host %u.%u.%u.%u" + LCONSOLE_ERROR_MSG(0x11b, "Connection to %s at host %pI4h" " on port %d was reset: " "is it running a compatible version of " "Lustre and is %s one of its NIDs?\n", - libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port, - libcfs_nid2str(peer_nid)); + libcfs_nid2str(peer_nid), &peer_ip, + peer_port, libcfs_nid2str(peer_nid)); break; case -EPROTO: LCONSOLE_ERROR_MSG(0x11c, "Protocol error connecting to %s at " - "host %u.%u.%u.%u on port %d: is it running " + "host %pI4h on port %d: is it running " "a compatible version of Lustre?\n", - libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port); + libcfs_nid2str(peer_nid), &peer_ip, + peer_port); break; case -EADDRINUSE: LCONSOLE_ERROR_MSG(0x11d, "No privileged ports available to " - "connect to %s at host %u.%u.%u.%u on port " + "connect to %s at host %pI4h on port " "%d\n", libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port); + &peer_ip, peer_port); break; default: LCONSOLE_ERROR_MSG(0x11e, "Unexpected error %d connecting to %s" - " at host %u.%u.%u.%u on port %d\n", rc, + " at host %pI4h on port %d\n", rc, libcfs_nid2str(peer_nid), - HIPQUAD(peer_ip), peer_port); + &peer_ip, peer_port); break; } } EXPORT_SYMBOL(lnet_connect_console_error); int -lnet_connect(cfs_socket_t **sockp, lnet_nid_t peer_nid, +lnet_connect(struct socket **sockp, lnet_nid_t peer_nid, __u32 local_ip, __u32 peer_ip, int peer_port) { lnet_acceptor_connreq_t cr; - cfs_socket_t *sock; + struct socket *sock; int rc; int port; int fatal; CLASSERT (sizeof(cr) <= 16); /* not too big to be on the stack */ - for (port = LNET_ACCEPTOR_MAX_RESERVED_PORT; - port >= LNET_ACCEPTOR_MIN_RESERVED_PORT; + for (port = LNET_ACCEPTOR_MAX_RESERVED_PORT; + port >= LNET_ACCEPTOR_MIN_RESERVED_PORT; --port) { /* Iterate through reserved ports. */ - rc = libcfs_sock_connect(&sock, &fatal, - local_ip, port, + rc = lnet_sock_connect(&sock, &fatal, + local_ip, port, peer_ip, peer_port); if (rc != 0) { if (fatal) @@ -167,7 +189,7 @@ lnet_connect(cfs_socket_t **sockp, lnet_nid_t peer_nid, if (the_lnet.ln_testprotocompat != 0) { /* single-shot proto check */ - LNET_LOCK(); + lnet_net_lock(LNET_LOCK_EX); if ((the_lnet.ln_testprotocompat & 4) != 0) { cr.acr_version++; the_lnet.ln_testprotocompat &= ~4; @@ -176,38 +198,31 @@ lnet_connect(cfs_socket_t **sockp, lnet_nid_t peer_nid, cr.acr_magic = LNET_PROTO_MAGIC; the_lnet.ln_testprotocompat &= ~8; } - LNET_UNLOCK(); + lnet_net_unlock(LNET_LOCK_EX); } - rc = libcfs_sock_write(sock, &cr, sizeof(cr), + rc = lnet_sock_write(sock, &cr, sizeof(cr), accept_timeout); if (rc != 0) goto failed_sock; - + *sockp = sock; return 0; } rc = -EADDRINUSE; goto failed; - - failed_sock: - libcfs_sock_release(sock); - failed: - lnet_connect_console_error(rc, peer_nid, peer_ip, peer_port); - return rc; -} -EXPORT_SYMBOL(lnet_connect); -static inline int -lnet_accept_magic(__u32 magic, __u32 constant) -{ - return (magic == constant || - magic == __swab32(constant)); +failed_sock: + sock_release(sock); +failed: + lnet_connect_console_error(rc, peer_nid, peer_ip, peer_port); + return rc; } +EXPORT_SYMBOL(lnet_connect); -int -lnet_accept(cfs_socket_t *sock, __u32 magic) +static int +lnet_accept(struct socket *sock, __u32 magic) { lnet_acceptor_connreq_t cr; __u32 peer_ip; @@ -218,8 +233,8 @@ lnet_accept(cfs_socket_t *sock, __u32 magic) char *str; LASSERT (sizeof(cr) <= 16); /* not too big for the stack */ - - rc = libcfs_sock_getaddr(sock, 1, &peer_ip, &peer_port); + + rc = lnet_sock_getaddr(sock, true, &peer_ip, &peer_port); LASSERT (rc == 0); /* we succeeded before */ if (!lnet_accept_magic(magic, LNET_PROTO_ACCEPTOR_MAGIC)) { @@ -233,45 +248,41 @@ lnet_accept(cfs_socket_t *sock, __u32 magic) memset (&cr, 0, sizeof(cr)); cr.acr_magic = LNET_PROTO_ACCEPTOR_MAGIC; cr.acr_version = LNET_PROTO_ACCEPTOR_VERSION; - rc = libcfs_sock_write(sock, &cr, sizeof(cr), + rc = lnet_sock_write(sock, &cr, sizeof(cr), accept_timeout); if (rc != 0) CERROR("Error sending magic+version in response" - "to LNET magic from %u.%u.%u.%u: %d\n", - HIPQUAD(peer_ip), rc); + "to LNET magic from %pI4h: %d\n", + &peer_ip, rc); return -EPROTO; } if (magic == le32_to_cpu(LNET_PROTO_TCP_MAGIC)) str = "'old' socknal/tcpnal"; - else if (lnet_accept_magic(magic, LNET_PROTO_RA_MAGIC)) - str = "'old' ranal"; - else if (lnet_accept_magic(magic, LNET_PROTO_OPENIB_MAGIC)) - str = "'old' openibnal"; else str = "unrecognised"; - - LCONSOLE_ERROR_MSG(0x11f, "Refusing connection from %u.%u.%u.%u" + + LCONSOLE_ERROR_MSG(0x11f, "Refusing connection from %pI4h" " magic %08x: %s acceptor protocol\n", - HIPQUAD(peer_ip), magic, str); + &peer_ip, magic, str); return -EPROTO; } flip = (magic != LNET_PROTO_ACCEPTOR_MAGIC); - rc = libcfs_sock_read(sock, &cr.acr_version, + rc = lnet_sock_read(sock, &cr.acr_version, sizeof(cr.acr_version), accept_timeout); if (rc != 0) { CERROR("Error %d reading connection request version from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); + "%pI4h\n", rc, &peer_ip); return -EIO; } if (flip) __swab32s(&cr.acr_version); - + if (cr.acr_version != LNET_PROTO_ACCEPTOR_VERSION) { /* future version compatibility! * An acceptor-specific protocol rev will first send a version @@ -283,23 +294,23 @@ lnet_accept(cfs_socket_t *sock, __u32 magic) cr.acr_magic = LNET_PROTO_ACCEPTOR_MAGIC; cr.acr_version = LNET_PROTO_ACCEPTOR_VERSION; - rc = libcfs_sock_write(sock, &cr, sizeof(cr), + rc = lnet_sock_write(sock, &cr, sizeof(cr), accept_timeout); if (rc != 0) CERROR("Error sending magic+version in response" - "to version %d from %u.%u.%u.%u: %d\n", - peer_version, HIPQUAD(peer_ip), rc); + "to version %d from %pI4h: %d\n", + peer_version, &peer_ip, rc); return -EPROTO; } - rc = libcfs_sock_read(sock, &cr.acr_nid, + rc = lnet_sock_read(sock, &cr.acr_nid, sizeof(cr) - offsetof(lnet_acceptor_connreq_t, acr_nid), accept_timeout); if (rc != 0) { CERROR("Error %d reading connection request from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); + "%pI4h\n", rc, &peer_ip); return -EIO; } @@ -311,49 +322,47 @@ lnet_accept(cfs_socket_t *sock, __u32 magic) ni->ni_nid != cr.acr_nid) { /* right NET, wrong NID! */ if (ni != NULL) lnet_ni_decref(ni); - LCONSOLE_ERROR_MSG(0x120, "Refusing connection from %u.%u.%u.%u" - " for %s: No matching NI\n", - HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid)); + LCONSOLE_ERROR_MSG(0x120, "Refusing connection from %pI4h " + "for %s: No matching NI\n", + &peer_ip, libcfs_nid2str(cr.acr_nid)); return -EPERM; } if (ni->ni_lnd->lnd_accept == NULL) { /* This catches a request for the loopback LND */ lnet_ni_decref(ni); - LCONSOLE_ERROR_MSG(0x121, "Refusing connection from %u.%u.%u.%u" - " for %s: NI doesn not accept IP connections\n", - HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid)); + LCONSOLE_ERROR_MSG(0x121, "Refusing connection from %pI4h " + "for %s: NI doesn not accept IP connections\n", + &peer_ip, libcfs_nid2str(cr.acr_nid)); return -EPERM; } - CDEBUG(D_NET, "Accept %s from %u.%u.%u.%u\n", - libcfs_nid2str(cr.acr_nid), HIPQUAD(peer_ip)); + CDEBUG(D_NET, "Accept %s from %pI4h\n", + libcfs_nid2str(cr.acr_nid), &peer_ip); rc = ni->ni_lnd->lnd_accept(ni, sock); + lnet_ni_decref(ni); return rc; } - -int + +static int lnet_acceptor(void *arg) { - char name[16]; - cfs_socket_t *newsock; - int rc; - __u32 magic; - __u32 peer_ip; - int peer_port; + struct socket *newsock; + int rc; + __u32 magic; + __u32 peer_ip; + int peer_port; int secure = (int)((long_ptr_t)arg); - LASSERT (lnet_acceptor_state.pta_sock == NULL); + LASSERT (lnet_acceptor_state.pta_sock == NULL); - snprintf(name, sizeof(name), "acceptor_%03d", accept_port); - cfs_daemonize(name); - cfs_block_allsigs(); + cfs_block_allsigs(); - rc = libcfs_sock_listen(&lnet_acceptor_state.pta_sock, - 0, accept_port, accept_backlog); - if (rc != 0) { + rc = lnet_sock_listen(&lnet_acceptor_state.pta_sock, + 0, accept_port, accept_backlog); + if (rc != 0) { if (rc == -EADDRINUSE) LCONSOLE_ERROR_MSG(0x122, "Can't start acceptor on port" " %d: port already in use\n", @@ -363,456 +372,158 @@ lnet_acceptor(void *arg) "%d: unexpected error %d\n", accept_port, rc); - lnet_acceptor_state.pta_sock = NULL; + lnet_acceptor_state.pta_sock = NULL; } else { - LCONSOLE(0, "Accept %s, port %d\n", accept, accept_port); + LCONSOLE(0, "Accept %s, port %d\n", accept_type, accept_port); } - + /* set init status and unblock parent */ lnet_acceptor_state.pta_shutdown = rc; - mutex_up(&lnet_acceptor_state.pta_signal); - - if (rc != 0) - return rc; + complete(&lnet_acceptor_state.pta_signal); - while (!lnet_acceptor_state.pta_shutdown) { - - rc = libcfs_sock_accept(&newsock, lnet_acceptor_state.pta_sock); + if (rc != 0) + return rc; + + while (!lnet_acceptor_state.pta_shutdown) { + + rc = lnet_sock_accept(&newsock, lnet_acceptor_state.pta_sock); if (rc != 0) { if (rc != -EAGAIN) { CWARN("Accept error %d: pausing...\n", rc); - cfs_pause(cfs_time_seconds(1)); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); } continue; } - rc = libcfs_sock_getaddr(newsock, 1, &peer_ip, &peer_port); - if (rc != 0) { - CERROR("Can't determine new connection's address\n"); - goto failed; + /* maybe we're waken up with lnet_sock_abort_accept() */ + if (lnet_acceptor_state.pta_shutdown) { + sock_release(newsock); + break; } + rc = lnet_sock_getaddr(newsock, true, &peer_ip, &peer_port); + if (rc != 0) { + CERROR("Can't determine new connection's address\n"); + goto failed; + } + if (secure && peer_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) { - CERROR("Refusing connection from %u.%u.%u.%u: " - "insecure port %d\n", - HIPQUAD(peer_ip), peer_port); + CERROR("Refusing connection from %pI4h: " + "insecure port %d\n", &peer_ip, peer_port); goto failed; } - rc = libcfs_sock_read(newsock, &magic, sizeof(magic), - accept_timeout); - if (rc != 0) { + rc = lnet_sock_read(newsock, &magic, sizeof(magic), + accept_timeout); + if (rc != 0) { CERROR("Error %d reading connection request from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); - goto failed; - } + "%pI4h\n", rc, &peer_ip); + goto failed; + } rc = lnet_accept(newsock, magic); if (rc != 0) goto failed; - + continue; - - failed: - libcfs_sock_release(newsock); + +failed: + sock_release(newsock); } - - libcfs_sock_release(lnet_acceptor_state.pta_sock); - lnet_acceptor_state.pta_sock = NULL; - LCONSOLE(0, "Acceptor stopping\n"); - + sock_release(lnet_acceptor_state.pta_sock); + lnet_acceptor_state.pta_sock = NULL; + + CDEBUG(D_NET, "Acceptor stopping\n"); + /* unblock lnet_acceptor_stop() */ - mutex_up(&lnet_acceptor_state.pta_signal); + complete(&lnet_acceptor_state.pta_signal); return 0; } -int -lnet_acceptor_start(void) +static inline int +accept2secure(const char *acc, long *sec) { - long pid; - long secure; - - LASSERT (lnet_acceptor_state.pta_sock == NULL); - init_mutex_locked(&lnet_acceptor_state.pta_signal); - - if (!strcmp(accept, "secure")) { - secure = 1; - } else if (!strcmp(accept, "all")) { - secure = 0; - } else if (!strcmp(accept, "none")) { + if (!strcmp(acc, "secure")) { + *sec = 1; + return 1; + } else if (!strcmp(acc, "all")) { + *sec = 0; + return 1; + } else if (!strcmp(acc, "none")) { return 0; } else { LCONSOLE_ERROR_MSG(0x124, "Can't parse 'accept=\"%s\"'\n", - accept); + acc); return -EINVAL; } - - if (lnet_count_acceptor_nis() == 0) /* not required */ - return 0; - - pid = cfs_kernel_thread(lnet_acceptor, (void *)(ulong_ptr_t)secure, 0); - if (pid < 0) { - CERROR("Can't start acceptor thread: %ld\n", pid); - return -ESRCH; - } - - mutex_down(&lnet_acceptor_state.pta_signal); /* wait for acceptor to startup */ - - if (!lnet_acceptor_state.pta_shutdown) { - /* started OK */ - LASSERT (lnet_acceptor_state.pta_sock != NULL); - return 0; - } - - LASSERT (lnet_acceptor_state.pta_sock == NULL); - return -ENETDOWN; -} - -void -lnet_acceptor_stop(void) -{ - if (lnet_acceptor_state.pta_sock == NULL) /* not running */ - return; - - lnet_acceptor_state.pta_shutdown = 1; - libcfs_sock_abort_accept(lnet_acceptor_state.pta_sock); - - /* block until acceptor signals exit */ - mutex_down(&lnet_acceptor_state.pta_signal); -} - -#else /* __KERNEL__ */ -#ifdef HAVE_LIBPTHREAD - -static char *accept_type; -static int accept_port = 988; -static int accept_backlog; -static int accept_timeout; - -struct { - int pta_shutdown; - int pta_sock; - struct cfs_completion pta_completion; -} lnet_acceptor_state; - -int -lnet_acceptor_port(void) -{ - return accept_port; -} - -int -lnet_parse_int_tunable(int *value, char *name, int dflt) -{ - char *env = getenv(name); - char *end; - - if (env == NULL) { - *value = dflt; - return 0; - } - - *value = strtoull(env, &end, 0); - if (*end == 0) - return 0; - - CERROR("Can't parse tunable %s=%s\n", name, env); - return -EINVAL; -} - -int -lnet_parse_string_tunable(char **value, char *name, char *dflt) -{ - char *env = getenv(name); - - if (env == NULL) - *value = dflt; - else - *value = env; - - return 0; } int -lnet_acceptor_get_tunables() -{ - int rc; - rc = lnet_parse_string_tunable(&accept_type, "LNET_ACCEPT", "secure"); - - if (rc != 0) - return rc; - - rc = lnet_parse_int_tunable(&accept_port, "LNET_ACCEPT_PORT", 988); - - if (rc != 0) - return rc; - - rc = lnet_parse_int_tunable(&accept_backlog, "LNET_ACCEPT_BACKLOG", 127); - - if (rc != 0) - return rc; - - rc = lnet_parse_int_tunable(&accept_timeout, "LNET_ACCEPT_TIMEOUT", 5); - - if (rc != 0) - return rc; - - CDEBUG(D_NET, "accept_type = %s\n", accept_type); - CDEBUG(D_NET, "accept_port = %d\n", accept_port); - CDEBUG(D_NET, "accept_backlog = %d\n", accept_backlog); - CDEBUG(D_NET, "accept_timeout = %d\n", accept_timeout); - return 0; -} - -static inline int -lnet_accept_magic(__u32 magic, __u32 constant) -{ - return (magic == constant || - magic == __swab32(constant)); -} - -/* user-land lnet_accept() isn't used by any LND's directly. So, we don't - * do it visible outside acceptor.c and we can change its prototype - * freely */ -static int -lnet_accept(int sock, __u32 magic, __u32 peer_ip, int peer_port) -{ - int rc, flip; - lnet_acceptor_connreq_t cr; - lnet_ni_t *ni; - - if (!lnet_accept_magic(magic, LNET_PROTO_ACCEPTOR_MAGIC)) { - LCONSOLE_ERROR("Refusing connection from %u.%u.%u.%u magic %08x: " - "unsupported acceptor protocol\n", - HIPQUAD(peer_ip), magic); - return -EPROTO; - } - - flip = (magic != LNET_PROTO_ACCEPTOR_MAGIC); - - rc = libcfs_sock_read(sock, &cr.acr_version, - sizeof(cr.acr_version), - accept_timeout); - if (rc != 0) { - CERROR("Error %d reading connection request version from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); - return -EIO; - } - - if (flip) - __swab32s(&cr.acr_version); - - if (cr.acr_version != LNET_PROTO_ACCEPTOR_VERSION) - return -EPROTO; - - rc = libcfs_sock_read(sock, &cr.acr_nid, - sizeof(cr) - - offsetof(lnet_acceptor_connreq_t, acr_nid), - accept_timeout); - if (rc != 0) { - CERROR("Error %d reading connection request from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); - return -EIO; - } - - if (flip) - __swab64s(&cr.acr_nid); - - ni = lnet_net2ni(LNET_NIDNET(cr.acr_nid)); - - if (ni == NULL || /* no matching net */ - ni->ni_nid != cr.acr_nid) { /* right NET, wrong NID! */ - if (ni != NULL) - lnet_ni_decref(ni); - LCONSOLE_ERROR("Refusing connection from %u.%u.%u.%u for %s: " - " No matching NI\n", - HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid)); - return -EPERM; - } - - if (ni->ni_lnd->lnd_accept == NULL) { - lnet_ni_decref(ni); - LCONSOLE_ERROR("Refusing connection from %u.%u.%u.%u for %s: " - " NI doesn not accept IP connections\n", - HIPQUAD(peer_ip), libcfs_nid2str(cr.acr_nid)); - return -EPERM; - } - - CDEBUG(D_NET, "Accept %s from %u.%u.%u.%u\n", - libcfs_nid2str(cr.acr_nid), HIPQUAD(peer_ip)); - - rc = ni->ni_lnd->lnd_accept(ni, sock); - - lnet_ni_decref(ni); - return rc; -} - -int -lnet_acceptor(void *arg) +lnet_acceptor_start(void) { - char name[16]; - int secure = (int)((unsigned long)arg); - int rc; - int newsock; - __u32 peer_ip; - int peer_port; - __u32 magic; - - snprintf(name, sizeof(name), "acceptor_%03d", accept_port); - cfs_daemonize(name); - cfs_block_allsigs(); + struct task_struct *task; + int rc; + long rc2; + long secure; - rc = libcfs_sock_listen(&lnet_acceptor_state.pta_sock, - 0, accept_port, accept_backlog); - if (rc != 0) { - if (rc == -EADDRINUSE) - LCONSOLE_ERROR("Can't start acceptor on port %d: " - "port already in use\n", - accept_port); - else - LCONSOLE_ERROR("Can't start acceptor on port %d: " - "unexpected error %d\n", - accept_port, rc); + /* if acceptor is already running return immediately */ + if (!lnet_acceptor_state.pta_shutdown) + return 0; - } else { - LCONSOLE(0, "Accept %s, port %d\n", accept_type, accept_port); - } - - /* set init status and unblock parent */ - lnet_acceptor_state.pta_shutdown = rc; - cfs_complete(&lnet_acceptor_state.pta_completion); + LASSERT (lnet_acceptor_state.pta_sock == NULL); + rc = lnet_acceptor_get_tunables(); if (rc != 0) return rc; - while (!lnet_acceptor_state.pta_shutdown) { + init_completion(&lnet_acceptor_state.pta_signal); + rc = accept2secure(accept_type, &secure); + if (rc <= 0) + return rc; - rc = libcfs_sock_accept(&newsock, lnet_acceptor_state.pta_sock, - &peer_ip, &peer_port); - if (rc != 0) - continue; + if (lnet_count_acceptor_nis() == 0) /* not required */ + return 0; - /* maybe we're waken up with libcfs_sock_abort_accept() */ - if (lnet_acceptor_state.pta_shutdown) { - libcfs_sock_release(newsock); - break; - } + task = kthread_run(lnet_acceptor, (void *)(ulong_ptr_t)secure, + "acceptor_%03ld", secure); + if (IS_ERR(task)) { + rc2 = PTR_ERR(task); + CERROR("Can't start acceptor thread: %ld\n", rc2); - if (secure && peer_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) { - CERROR("Refusing connection from %u.%u.%u.%u: " - "insecure port %d\n", - HIPQUAD(peer_ip), peer_port); - goto failed; - } + return -ESRCH; + } - rc = libcfs_sock_read(newsock, &magic, sizeof(magic), - accept_timeout); - if (rc != 0) { - CERROR("Error %d reading connection request from " - "%u.%u.%u.%u\n", rc, HIPQUAD(peer_ip)); - goto failed; - } + /* wait for acceptor to startup */ + wait_for_completion(&lnet_acceptor_state.pta_signal); - rc = lnet_accept(newsock, magic, peer_ip, peer_port); - if (rc != 0) - goto failed; - - continue; - - failed: - libcfs_sock_release(newsock); - } - - libcfs_sock_release(lnet_acceptor_state.pta_sock); - LCONSOLE(0,"Acceptor stopping\n"); + if (!lnet_acceptor_state.pta_shutdown) { + /* started OK */ + LASSERT(lnet_acceptor_state.pta_sock != NULL); + return 0; + } - /* unblock lnet_acceptor_stop() */ - cfs_complete(&lnet_acceptor_state.pta_completion); + LASSERT(lnet_acceptor_state.pta_sock == NULL); - return 0; + return -ENETDOWN; } -static int skip_waiting_for_completion; - -int -lnet_acceptor_start(void) +void +lnet_acceptor_stop(void) { - long secure; - int rc; - - rc = lnet_acceptor_get_tunables(); - if (rc != 0) - return rc; + struct sock *sk; - /* Do nothing if we're liblustre clients */ - if ((the_lnet.ln_pid & LNET_PID_USERFLAG) != 0) - return 0; - - cfs_init_completion(&lnet_acceptor_state.pta_completion); - - if (!strcmp(accept_type, "secure")) { - secure = 1; - } else if (!strcmp(accept_type, "all")) { - secure = 0; - } else if (!strcmp(accept_type, "none")) { - skip_waiting_for_completion = 1; - return 0; - } else { - LCONSOLE_ERROR ("Can't parse 'accept_type=\"%s\"'\n", accept_type); - cfs_fini_completion(&lnet_acceptor_state.pta_completion); - return -EINVAL; - } - - if (lnet_count_acceptor_nis() == 0) { /* not required */ - skip_waiting_for_completion = 1; - return 0; - } - - rc = cfs_create_thread(lnet_acceptor, (void *)secure); - if (rc != 0) { - CERROR("Can't start acceptor thread: %d\n", rc); - cfs_fini_completion(&lnet_acceptor_state.pta_completion); - return rc; - } + if (lnet_acceptor_state.pta_shutdown) /* not running */ + return; - /* wait for acceptor to startup */ - cfs_wait_for_completion(&lnet_acceptor_state.pta_completion); + lnet_acceptor_state.pta_shutdown = 1; - if (!lnet_acceptor_state.pta_shutdown) - return 0; - - cfs_fini_completion(&lnet_acceptor_state.pta_completion); - return -ENETDOWN; -} + sk = lnet_acceptor_state.pta_sock->sk; -void -lnet_acceptor_stop(void) -{ - /* Do nothing if we're liblustre clients */ - if ((the_lnet.ln_pid & LNET_PID_USERFLAG) != 0) - return; - - if (!skip_waiting_for_completion) { - lnet_acceptor_state.pta_shutdown = 1; - libcfs_sock_abort_accept(accept_port); - - /* block until acceptor signals exit */ - cfs_wait_for_completion(&lnet_acceptor_state.pta_completion); - } - - cfs_fini_completion(&lnet_acceptor_state.pta_completion); -} -#else -int -lnet_acceptor_start(void) -{ - return 0; -} + /* awake any sleepers using safe method */ + sk->sk_state_change(sk); -void -lnet_acceptor_stop(void) -{ + /* block until acceptor signals exit */ + wait_for_completion(&lnet_acceptor_state.pta_signal); } -#endif /* !HAVE_LIBPTHREAD */ -#endif /* !__KERNEL__ */