X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Facceptor.c;h=008e8b73e26753cc17170415e9d229b91a0b2085;hp=27a58ffca61ee6337ea125753457ead7e636d596;hb=6869932b552ac705f411de3362f01bd50c1f6f7d;hpb=70e80ade90af09300396706b8910e196a7928520 diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 27a58ff..008e8b7 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or @@ -161,35 +161,28 @@ lnet_connect(cfs_socket_t **sockp, lnet_nid_t peer_nid, CLASSERT (LNET_PROTO_ACCEPTOR_VERSION == 1); - if (the_lnet.ln_ptlcompat != 2) { - /* When portals compatibility is "strong", simply - * connect (i.e. send no acceptor connection request). - * Othewise send an acceptor connection request. I can - * have no portals peers so everyone else should - * understand my protocol. */ - cr.acr_magic = LNET_PROTO_ACCEPTOR_MAGIC; - cr.acr_version = LNET_PROTO_ACCEPTOR_VERSION; - cr.acr_nid = peer_nid; - - if (the_lnet.ln_testprotocompat != 0) { - /* single-shot proto check */ - LNET_LOCK(); - if ((the_lnet.ln_testprotocompat & 4) != 0) { - cr.acr_version++; - the_lnet.ln_testprotocompat &= ~4; - } - if ((the_lnet.ln_testprotocompat & 8) != 0) { - cr.acr_magic = LNET_PROTO_MAGIC; - the_lnet.ln_testprotocompat &= ~8; - } - LNET_UNLOCK(); + cr.acr_magic = LNET_PROTO_ACCEPTOR_MAGIC; + cr.acr_version = LNET_PROTO_ACCEPTOR_VERSION; + cr.acr_nid = peer_nid; + + if (the_lnet.ln_testprotocompat != 0) { + /* single-shot proto check */ + LNET_LOCK(); + if ((the_lnet.ln_testprotocompat & 4) != 0) { + cr.acr_version++; + the_lnet.ln_testprotocompat &= ~4; } - - rc = libcfs_sock_write(sock, &cr, sizeof(cr), - accept_timeout); - if (rc != 0) - goto failed_sock; + if ((the_lnet.ln_testprotocompat & 8) != 0) { + cr.acr_magic = LNET_PROTO_MAGIC; + the_lnet.ln_testprotocompat &= ~8; + } + LNET_UNLOCK(); } + + rc = libcfs_sock_write(sock, &cr, sizeof(cr), + accept_timeout); + if (rc != 0) + goto failed_sock; *sockp = sock; return 0; @@ -214,7 +207,7 @@ lnet_accept_magic(__u32 magic, __u32 constant) } int -lnet_accept(lnet_ni_t *blind_ni, cfs_socket_t *sock, __u32 magic) +lnet_accept(cfs_socket_t *sock, __u32 magic) { lnet_acceptor_connreq_t cr; __u32 peer_ip; @@ -224,10 +217,6 @@ lnet_accept(lnet_ni_t *blind_ni, cfs_socket_t *sock, __u32 magic) lnet_ni_t *ni; char *str; - /* CAVEAT EMPTOR: I may be called by an LND in any thread's context if - * I passed the new socket "blindly" to the single NI that needed an - * acceptor. If so, blind_ni != NULL... */ - LASSERT (sizeof(cr) <= 16); /* not too big for the stack */ rc = libcfs_sock_getaddr(sock, 1, &peer_ip, &peer_port); @@ -337,25 +326,13 @@ lnet_accept(lnet_ni_t *blind_ni, cfs_socket_t *sock, __u32 magic) return -EPERM; } - CDEBUG(D_NET, "Accept %s from %u.%u.%u.%u%s\n", - libcfs_nid2str(cr.acr_nid), HIPQUAD(peer_ip), - blind_ni == NULL ? "" : " (blind)"); - - if (blind_ni == NULL) { - /* called by the acceptor: call into the requested NI... */ - rc = ni->ni_lnd->lnd_accept(ni, sock); - } else { - /* portals_compatible set and the (only) NI called me to verify - * and skip the connection request... */ - LASSERT (the_lnet.ln_ptlcompat != 0); - LASSERT (ni == blind_ni); - rc = 0; - } + 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; } -EXPORT_SYMBOL(lnet_accept); int lnet_acceptor(void *arg) @@ -363,26 +340,13 @@ lnet_acceptor(void *arg) char name[16]; cfs_socket_t *newsock; int rc; - int n_acceptor_nis; __u32 magic; __u32 peer_ip; int peer_port; - lnet_ni_t *blind_ni = NULL; int secure = (int)((unsigned long)arg); LASSERT (lnet_acceptor_state.pta_sock == NULL); - if (the_lnet.ln_ptlcompat != 0) { - /* When portals_compatibility is enabled, peers may connect - * without sending an acceptor connection request. There is no - * ambiguity about which network the peer wants to connect to - * since there can only be 1 network, so I pass connections - * "blindly" to it. */ - n_acceptor_nis = lnet_count_acceptor_nis(&blind_ni); - LASSERT (n_acceptor_nis == 1); - LASSERT (blind_ni != NULL); - } - snprintf(name, sizeof(name), "acceptor_%03d", accept_port); cfs_daemonize(name); cfs_block_allsigs(); @@ -401,9 +365,7 @@ lnet_acceptor(void *arg) lnet_acceptor_state.pta_sock = NULL; } else { - LCONSOLE(0, "Accept %s, port %d%s\n", - accept, accept_port, - blind_ni == NULL ? "" : " (proto compatible)"); + LCONSOLE(0, "Accept %s, port %d\n", accept, accept_port); } /* set init status and unblock parent */ @@ -437,18 +399,6 @@ lnet_acceptor(void *arg) goto failed; } - if (blind_ni != NULL) { - rc = blind_ni->ni_lnd->lnd_accept(blind_ni, newsock); - if (rc != 0) { - CERROR("NI %s refused 'blind' connection from " - "%u.%u.%u.%u\n", - libcfs_nid2str(blind_ni->ni_nid), - HIPQUAD(peer_ip)); - goto failed; - } - continue; - } - rc = libcfs_sock_read(newsock, &magic, sizeof(magic), accept_timeout); if (rc != 0) { @@ -457,7 +407,7 @@ lnet_acceptor(void *arg) goto failed; } - rc = lnet_accept(NULL, newsock, magic); + rc = lnet_accept(newsock, magic); if (rc != 0) goto failed; @@ -470,10 +420,7 @@ lnet_acceptor(void *arg) libcfs_sock_release(lnet_acceptor_state.pta_sock); lnet_acceptor_state.pta_sock = NULL; - if (blind_ni != NULL) - lnet_ni_decref(blind_ni); - - LCONSOLE(0,"Acceptor stopping\n"); + LCONSOLE(0, "Acceptor stopping\n"); /* unblock lnet_acceptor_stop() */ mutex_up(&lnet_acceptor_state.pta_signal); @@ -501,7 +448,7 @@ lnet_acceptor_start(void) return -EINVAL; } - if (lnet_count_acceptor_nis(NULL) == 0) /* not required */ + if (lnet_count_acceptor_nis() == 0) /* not required */ return 0; pid = cfs_kernel_thread(lnet_acceptor, (void *)secure, 0); @@ -817,7 +764,7 @@ lnet_acceptor_start(void) return -EINVAL; } - if (lnet_count_acceptor_nis(NULL) == 0) { /* not required */ + if (lnet_count_acceptor_nis() == 0) { /* not required */ skip_waiting_for_completion = 1; return 0; }