X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fconfig.c;h=a5661f9c3e9638e1d9d43223d7d0888ec4b99b27;hp=cd5e21103cc0d44147a437634def005619d979f6;hb=38c845dfcb6412a5ef15fb1de9b5cc1d48b91b53;hpb=ed88907a96ba81d3558e71ade9def98bdc785169 diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index cd5e211..a5661f9 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -1,64 +1,71 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (c) 2005 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_LNET #include -typedef struct { /* tmp struct for parsing routes */ - struct list_head ltb_list; /* stash on lists */ - int ltb_size; /* allocated size */ - char ltb_text[0]; /* text buffer */ -} lnet_text_buf_t; +/* tmp struct for parsing routes */ +struct lnet_text_buf { + struct list_head ltb_list; /* stash on lists */ + int ltb_size; /* allocated size */ + char ltb_text[0]; /* text buffer */ +}; static int lnet_tbnob = 0; /* track text buf allocation */ #define LNET_MAX_TEXTBUF_NOB (64<<10) /* bound allocation */ #define LNET_SINGLE_TEXTBUF_NOB (4<<10) -typedef struct { - struct list_head lre_list; /* stash in a list */ - int lre_min; /* min value */ - int lre_max; /* max value */ - int lre_stride; /* stride */ -} lnet_range_expr_t; - -static int lnet_re_alloc = 0; /* track expr allocation */ - -void +void lnet_syntax(char *name, char *str, int offset, int width) { static char dots[LNET_SINGLE_TEXTBUF_NOB]; static char dashes[LNET_SINGLE_TEXTBUF_NOB]; - + memset(dots, '.', sizeof(dots)); dots[sizeof(dots)-1] = 0; memset(dashes, '-', sizeof(dashes)); dashes[sizeof(dashes)-1] = 0; - - LCONSOLE_ERROR("Error parsing '%s=\"%s\"'\n", name, str); - LCONSOLE_ERROR("here...........%.*s..%.*s|%.*s|\n", - (int)strlen(name), dots, offset, dots, - (width < 1) ? 0 : width - 1, dashes); + + LCONSOLE_ERROR_MSG(0x10f, "Error parsing '%s=\"%s\"'\n", name, str); + LCONSOLE_ERROR_MSG(0x110, "here...........%.*s..%.*s|%.*s|\n", + (int)strlen(name), dots, offset, dots, + (width < 1) ? 0 : width - 1, dashes); } -int +int lnet_issep (char c) { switch (c) { @@ -72,123 +79,195 @@ lnet_issep (char c) } int -lnet_iswhite (char c) +lnet_net_unique(__u32 net, struct list_head *nilist) { - switch (c) { - case ' ': - case '\t': - case '\n': - case '\r': - return 1; - default: - return 0; - } -} + struct list_head *tmp; + lnet_ni_t *ni; -char * -lnet_trimwhite(char *str) -{ - char *end; - - while (lnet_iswhite(*str)) - str++; - - end = str + strlen(str); - while (end > str) { - if (!lnet_iswhite(end[-1])) - break; - end--; + list_for_each(tmp, nilist) { + ni = list_entry(tmp, lnet_ni_t, ni_list); + + if (LNET_NIDNET(ni->ni_nid) == net) + return 0; } - *end = 0; - return str; + return 1; } -int -lnet_net_unique(__u32 net, struct list_head *nilist) +void +lnet_ni_free(struct lnet_ni *ni) { - struct list_head *tmp; - lnet_ni_t *ni; + int i; - list_for_each (tmp, nilist) { - ni = list_entry(tmp, lnet_ni_t, ni_list); + if (ni->ni_refs != NULL) + cfs_percpt_free(ni->ni_refs); - if (LNET_NIDNET(ni->ni_nid) == net) - return 0; - } - - return 1; + if (ni->ni_tx_queues != NULL) + cfs_percpt_free(ni->ni_tx_queues); + + if (ni->ni_cpts != NULL) + cfs_expr_list_values_free(ni->ni_cpts, ni->ni_ncpts); + +#ifndef __KERNEL__ +# ifdef HAVE_LIBPTHREAD + pthread_mutex_destroy(&ni->ni_lock); +# endif +#endif + for (i = 0; i < LNET_MAX_INTERFACES && + ni->ni_interfaces[i] != NULL; i++) { + LIBCFS_FREE(ni->ni_interfaces[i], + strlen(ni->ni_interfaces[i]) + 1); + } + LIBCFS_FREE(ni, sizeof(*ni)); } lnet_ni_t * -lnet_new_ni(__u32 net, struct list_head *nilist) +lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist) { - lnet_ni_t *ni; + struct lnet_tx_queue *tq; + struct lnet_ni *ni; + int rc; + int i; if (!lnet_net_unique(net, nilist)) { - LCONSOLE_ERROR("Duplicate network specified: %s\n", - libcfs_net2str(net)); + LCONSOLE_ERROR_MSG(0x111, "Duplicate network specified: %s\n", + libcfs_net2str(net)); return NULL; } - + LIBCFS_ALLOC(ni, sizeof(*ni)); if (ni == NULL) { CERROR("Out of memory creating network %s\n", libcfs_net2str(net)); return NULL; } - - /* zero counters/flags, NULL pointers... */ - memset(ni, 0, sizeof(*ni)); - /* LND will fill in the address part of the NID */ - ni->ni_nid = LNET_MKNID(net, 0); - CFS_INIT_LIST_HEAD(&ni->ni_txq); +#ifdef __KERNEL__ + spin_lock_init(&ni->ni_lock); +#else +# ifdef HAVE_LIBPTHREAD + pthread_mutex_init(&ni->ni_lock, NULL); +# endif +#endif + INIT_LIST_HEAD(&ni->ni_cptlist); + ni->ni_refs = cfs_percpt_alloc(lnet_cpt_table(), + sizeof(*ni->ni_refs[0])); + if (ni->ni_refs == NULL) + goto failed; + + ni->ni_tx_queues = cfs_percpt_alloc(lnet_cpt_table(), + sizeof(*ni->ni_tx_queues[0])); + if (ni->ni_tx_queues == NULL) + goto failed; + + cfs_percpt_for_each(tq, i, ni->ni_tx_queues) + INIT_LIST_HEAD(&tq->tq_delayed); + + if (el == NULL) { + ni->ni_cpts = NULL; + ni->ni_ncpts = LNET_CPT_NUMBER; + } else { + rc = cfs_expr_list_values(el, LNET_CPT_NUMBER, &ni->ni_cpts); + if (rc <= 0) { + CERROR("Failed to set CPTs for NI %s: %d\n", + libcfs_net2str(net), rc); + goto failed; + } + + LASSERT(rc <= LNET_CPT_NUMBER); + if (rc == LNET_CPT_NUMBER) { + LIBCFS_FREE(ni->ni_cpts, rc * sizeof(ni->ni_cpts[0])); + ni->ni_cpts = NULL; + } - list_add_tail(&ni->ni_list, nilist); - return ni; + ni->ni_ncpts = rc; + } + + /* LND will fill in the address part of the NID */ + ni->ni_nid = LNET_MKNID(net, 0); + ni->ni_last_alive = cfs_time_current_sec(); + list_add_tail(&ni->ni_list, nilist); + return ni; + failed: + lnet_ni_free(ni); + return NULL; } int lnet_parse_networks(struct list_head *nilist, char *networks) { - int tokensize = strlen(networks) + 1; - char *tokens; - char *str; - lnet_ni_t *ni; - __u32 net; - int nnets = 0; + struct cfs_expr_list *el = NULL; + int tokensize; + char *tokens; + char *str; + char *tmp; + struct lnet_ni *ni; + __u32 net; + int nnets = 0; + + if (networks == NULL) { + CERROR("networks string is undefined\n"); + return -EINVAL; + } if (strlen(networks) > LNET_SINGLE_TEXTBUF_NOB) { /* _WAY_ conservative */ - LCONSOLE_ERROR("Can't parse networks: string too long\n"); + LCONSOLE_ERROR_MSG(0x112, "Can't parse networks: string too " + "long\n"); return -EINVAL; } - LIBCFS_ALLOC(tokens, tokensize); - if (tokens == NULL) { - CERROR("Can't allocate net tokens\n"); + tokensize = strlen(networks) + 1; + + LIBCFS_ALLOC(tokens, tokensize); + if (tokens == NULL) { + CERROR("Can't allocate net tokens\n"); return -ENOMEM; - } + } - the_lnet.ln_network_tokens = tokens; - the_lnet.ln_network_tokens_nob = tokensize; - memcpy (tokens, networks, tokensize); - str = tokens; - - /* Add in the loopback network */ - ni = lnet_new_ni(LNET_MKNET(LOLND, 0), nilist); - if (ni == NULL) - goto failed; - - while (str != NULL && *str != 0) { - char *comma = strchr(str, ','); - char *bracket = strchr(str, '('); - int niface; - char *iface; + memcpy(tokens, networks, tokensize); + str = tmp = tokens; + + /* Add in the loopback network */ + ni = lnet_ni_alloc(LNET_MKNET(LOLND, 0), NULL, nilist); + if (ni == NULL) + goto failed; + + while (str != NULL && *str != 0) { + char *comma = strchr(str, ','); + char *bracket = strchr(str, '('); + char *square = strchr(str, '['); + char *iface; + int niface; + int rc; + + /* NB we don't check interface conflicts here; it's the LNDs + * responsibility (if it cares at all) */ + + if (square != NULL && (comma == NULL || square < comma)) { + /* i.e: o2ib0(ib0)[1,2], number between square + * brackets are CPTs this NI needs to be bond */ + if (bracket != NULL && bracket > square) { + tmp = square; + goto failed_syntax; + } + + tmp = strchr(square, ']'); + if (tmp == NULL) { + tmp = square; + goto failed_syntax; + } + + rc = cfs_expr_list_parse(square, tmp - square + 1, + 0, LNET_CPT_NUMBER - 1, &el); + if (rc != 0) { + tmp = square; + goto failed_syntax; + } - /* NB we don't check interface conflicts here; it's the LNDs - * responsibility (if it cares at all) */ + while (square <= tmp) + *square++ = ' '; + } if (bracket == NULL || (comma != NULL && comma < bracket)) { @@ -197,51 +276,52 @@ lnet_parse_networks(struct list_head *nilist, char *networks) if (comma != NULL) *comma++ = 0; - net = libcfs_str2net(lnet_trimwhite(str)); - + net = libcfs_str2net(cfs_trimwhite(str)); + if (net == LNET_NIDNET(LNET_NID_ANY)) { - lnet_syntax("networks", networks, - str - tokens, strlen(str)); - LCONSOLE_ERROR("Unrecognised network type\n"); - goto failed; + LCONSOLE_ERROR_MSG(0x113, "Unrecognised network" + " type\n"); + tmp = str; + goto failed_syntax; } - if (LNET_NETTYP(net) != LOLND && /* loopback is implicit */ - lnet_new_ni(net, nilist) == NULL) - goto failed; + if (LNET_NETTYP(net) != LOLND && /* LO is implicit */ + lnet_ni_alloc(net, el, nilist) == NULL) + goto failed; + + if (el != NULL) { + cfs_expr_list_free(el); + el = NULL; + } str = comma; continue; } *bracket = 0; - net = libcfs_str2net(lnet_trimwhite(str)); + net = libcfs_str2net(cfs_trimwhite(str)); if (net == LNET_NIDNET(LNET_NID_ANY)) { - lnet_syntax("networks", networks, - str - tokens, strlen(str)); - goto failed; - } - - if (nnets > 0 && - the_lnet.ln_ptlcompat > 0) { - LCONSOLE_ERROR("Only 1 network supported when " - "'portals_compatible' is set\n"); - goto failed; - } + tmp = str; + goto failed_syntax; + } + + nnets++; + ni = lnet_ni_alloc(net, el, nilist); + if (ni == NULL) + goto failed; - nnets++; - ni = lnet_new_ni(net, nilist); - if (ni == NULL) - goto failed; + if (el != NULL) { + cfs_expr_list_free(el); + el = NULL; + } - niface = 0; + niface = 0; iface = bracket + 1; bracket = strchr(iface, ')'); if (bracket == NULL) { - lnet_syntax("networks", networks, - iface - tokens, strlen(iface)); - goto failed; + tmp = iface; + goto failed_syntax; } *bracket = 0; @@ -249,21 +329,35 @@ lnet_parse_networks(struct list_head *nilist, char *networks) comma = strchr(iface, ','); if (comma != NULL) *comma++ = 0; - - iface = lnet_trimwhite(iface); + + iface = cfs_trimwhite(iface); if (*iface == 0) { - lnet_syntax("networks", networks, - iface - tokens, strlen(iface)); - goto failed; + tmp = iface; + goto failed_syntax; } - if (niface == LNET_MAX_INTERFACES) { - LCONSOLE_ERROR("Too many interfaces for net %s\n", - libcfs_net2str(net)); - goto failed; - } + if (niface == LNET_MAX_INTERFACES) { + LCONSOLE_ERROR_MSG(0x115, "Too many interfaces " + "for net %s\n", + libcfs_net2str(net)); + goto failed; + } - ni->ni_interfaces[niface++] = iface; + /* Allocate a seperate piece of memory and copy + * into it the string, so we don't have + * a depencency on the tokens string. This way we + * can free the tokens at the end of the function. + * The newly allocated ni_interfaces[] can be + * freed when freeing the NI */ + LIBCFS_ALLOC(ni->ni_interfaces[niface], + strlen(iface) + 1); + if (ni->ni_interfaces[niface] == NULL) { + CERROR("Can't allocate net interface name\n"); + goto failed; + } + strncpy(ni->ni_interfaces[niface], iface, + strlen(iface)); + niface++; iface = comma; } while (iface != NULL); @@ -271,48 +365,52 @@ lnet_parse_networks(struct list_head *nilist, char *networks) comma = strchr(bracket + 1, ','); if (comma != NULL) { *comma = 0; - str = lnet_trimwhite(str); + str = cfs_trimwhite(str); if (*str != 0) { - lnet_syntax("networks", networks, - str - tokens, strlen(str)); - goto failed; + tmp = str; + goto failed_syntax; } str = comma + 1; continue; } - - str = lnet_trimwhite(str); + + str = cfs_trimwhite(str); if (*str != 0) { - lnet_syntax("networks", networks, - str - tokens, strlen(str)); - goto failed; - } + tmp = str; + goto failed_syntax; + } } - LASSERT (!list_empty(nilist)); - return 0; + LASSERT(!list_empty(nilist)); + LIBCFS_FREE(tokens, tokensize); + return 0; + + failed_syntax: + lnet_syntax("networks", networks, (int)(tmp - tokens), strlen(tmp)); failed: - while (!list_empty(nilist)) { - ni = list_entry(nilist->next, lnet_ni_t, ni_list); - - list_del(&ni->ni_list); - LIBCFS_FREE(ni, sizeof(*ni)); - } + while (!list_empty(nilist)) { + ni = list_entry(nilist->next, lnet_ni_t, ni_list); + + list_del(&ni->ni_list); + lnet_ni_free(ni); + } + + if (el != NULL) + cfs_expr_list_free(el); + LIBCFS_FREE(tokens, tokensize); - the_lnet.ln_network_tokens = NULL; - return -EINVAL; + return -EINVAL; } -lnet_text_buf_t * -lnet_new_text_buf (int str_len) +struct lnet_text_buf *lnet_new_text_buf(int str_len) { - lnet_text_buf_t *ltb; - int nob; + struct lnet_text_buf *ltb; + int nob; - /* NB allocate space for the terminating 0 */ - nob = offsetof(lnet_text_buf_t, ltb_text[str_len + 1]); + /* NB allocate space for the terminating 0 */ + nob = offsetof(struct lnet_text_buf, ltb_text[str_len + 1]); if (nob > LNET_SINGLE_TEXTBUF_NOB) { /* _way_ conservative for "route net gateway..." */ CERROR("text buffer too big\n"); @@ -323,19 +421,19 @@ lnet_new_text_buf (int str_len) CERROR("Too many text buffers\n"); return NULL; } - + LIBCFS_ALLOC(ltb, nob); if (ltb == NULL) return NULL; ltb->ltb_size = nob; - ltb->ltb_text[0] = 0; + ltb->ltb_text[0] = 0; lnet_tbnob += nob; return ltb; } void -lnet_free_text_buf (lnet_text_buf_t *ltb) +lnet_free_text_buf(struct lnet_text_buf *ltb) { lnet_tbnob -= ltb->ltb_size; LIBCFS_FREE(ltb, ltb->ltb_size); @@ -344,11 +442,11 @@ lnet_free_text_buf (lnet_text_buf_t *ltb) void lnet_free_text_bufs(struct list_head *tbs) { - lnet_text_buf_t *ltb; - + struct lnet_text_buf *ltb; + while (!list_empty(tbs)) { - ltb = list_entry(tbs->next, lnet_text_buf_t, ltb_list); - + ltb = list_entry(tbs->next, struct lnet_text_buf, ltb_list); + list_del(<b->ltb_list); lnet_free_text_buf(ltb); } @@ -357,11 +455,11 @@ lnet_free_text_bufs(struct list_head *tbs) void lnet_print_text_bufs(struct list_head *tbs) { - struct list_head *tmp; - lnet_text_buf_t *ltb; + struct list_head *tmp; + struct lnet_text_buf *ltb; - list_for_each (tmp, tbs) { - ltb = list_entry(tmp, lnet_text_buf_t, ltb_list); + list_for_each(tmp, tbs) { + ltb = list_entry(tmp, struct lnet_text_buf, ltb_list); CDEBUG(D_WARNING, "%s\n", ltb->ltb_text); } @@ -370,37 +468,37 @@ lnet_print_text_bufs(struct list_head *tbs) } int -lnet_str2tbs_sep (struct list_head *tbs, char *str) +lnet_str2tbs_sep(struct list_head *tbs, char *str) { struct list_head pending; char *sep; int nob; int i; - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; INIT_LIST_HEAD(&pending); /* Split 'str' into separate commands */ for (;;) { /* skip leading whitespace */ - while (lnet_iswhite(*str)) + while (cfs_iswhite(*str)) str++; - + /* scan for separator or comment */ for (sep = str; *sep != 0; sep++) if (lnet_issep(*sep) || *sep == '#') break; - nob = sep - str; + nob = (int)(sep - str); if (nob > 0) { ltb = lnet_new_text_buf(nob); if (ltb == NULL) { lnet_free_text_bufs(&pending); return -1; } - + for (i = 0; i < nob; i++) - if (lnet_iswhite(str[i])) + if (cfs_iswhite(str[i])) ltb->ltb_text[i] = ' '; else ltb->ltb_text[i] = str[i]; @@ -416,7 +514,7 @@ lnet_str2tbs_sep (struct list_head *tbs, char *str) sep++; } while (*sep != 0 && !lnet_issep(*sep)); } - + if (*sep == 0) break; @@ -428,13 +526,13 @@ lnet_str2tbs_sep (struct list_head *tbs, char *str) } int -lnet_expand1tb (struct list_head *list, - char *str, char *sep1, char *sep2, +lnet_expand1tb(struct list_head *list, + char *str, char *sep1, char *sep2, char *item, int itemlen) { - int len1 = sep1 - str; + int len1 = (int)(sep1 - str); int len2 = strlen(sep2 + 1); - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; LASSERT (*sep1 == '['); LASSERT (*sep2 == ']'); @@ -442,34 +540,34 @@ lnet_expand1tb (struct list_head *list, ltb = lnet_new_text_buf(len1 + itemlen + len2); if (ltb == NULL) return -ENOMEM; - + memcpy(ltb->ltb_text, str, len1); memcpy(<b->ltb_text[len1], item, itemlen); memcpy(<b->ltb_text[len1+itemlen], sep2 + 1, len2); ltb->ltb_text[len1 + itemlen + len2] = 0; - + list_add_tail(<b->ltb_list, list); return 0; } int -lnet_str2tbs_expand (struct list_head *tbs, char *str) +lnet_str2tbs_expand(struct list_head *tbs, char *str) { - char num[16]; + char num[16]; struct list_head pending; - char *sep; - char *sep2; - char *parsed; - char *enditem; - int lo; - int hi; - int stride; - int i; - int nob; - int scanned; + char *sep; + char *sep2; + char *parsed; + char *enditem; + int lo; + int hi; + int stride; + int i; + int nob; + int scanned; INIT_LIST_HEAD(&pending); - + sep = strchr(str, '['); if (sep == NULL) /* nothing to expand */ return 0; @@ -493,12 +591,12 @@ lnet_str2tbs_expand (struct list_head *tbs, char *str) /* simple string enumeration */ if (lnet_expand1tb(&pending, str, sep, sep2, - parsed, enditem - parsed) != 0) + parsed, (int)(enditem - parsed)) != 0) goto failed; - + continue; } - + stride = 1; } @@ -506,27 +604,27 @@ lnet_str2tbs_expand (struct list_head *tbs, char *str) if (enditem != parsed + scanned) /* no trailing junk */ goto failed; - - if (hi < 0 || lo < 0 || stride < 0 || hi < lo || + + if (hi < 0 || lo < 0 || stride < 0 || hi < lo || (hi - lo) % stride != 0) goto failed; - + for (i = lo; i <= hi; i += stride) { snprintf(num, sizeof(num), "%d", i); nob = strlen(num); if (nob + 1 == sizeof(num)) goto failed; - - if (lnet_expand1tb(&pending, str, sep, sep2, + + if (lnet_expand1tb(&pending, str, sep, sep2, num, nob) != 0) goto failed; } } - + list_splice(&pending, tbs->prev); return 1; - + failed: lnet_free_text_bufs(&pending); return -1; @@ -537,12 +635,43 @@ lnet_parse_hops (char *str, unsigned int *hops) { int len = strlen(str); int nob = len; - + return (sscanf(str, "%u%n", hops, &nob) >= 1 && nob == len && *hops > 0 && *hops < 256); } +#define LNET_PRIORITY_SEPARATOR (':') + +int +lnet_parse_priority(char *str, unsigned int *priority, char **token) +{ + int nob; + char *sep; + int len; + + sep = strchr(str, LNET_PRIORITY_SEPARATOR); + if (sep == NULL) { + *priority = 0; + return 0; + } + len = strlen(sep + 1); + + if ((sscanf((sep+1), "%u%n", priority, &nob) < 1) || (len != nob)) { + /* Update the caller's token pointer so it treats the found + priority as the token to report in the error message. */ + *token += sep - str + 1; + return -1; + } + + CDEBUG(D_NET, "gateway %s, priority %d, nob %d\n", str, *priority, nob); + + /* + * Change priority separator to \0 to be able to parse NID + */ + *sep = '\0'; + return 0; +} int lnet_parse_route (char *str, int *im_a_router) @@ -556,26 +685,27 @@ lnet_parse_route (char *str, int *im_a_router) struct list_head *tmp2; __u32 net; lnet_nid_t nid; - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; int rc; char *sep; char *token = str; int ntokens = 0; - int myrc = -1; - unsigned int hops; - int got_hops = 0; + int myrc = -1; + unsigned int hops; + int got_hops = 0; + unsigned int priority = 0; - CFS_INIT_LIST_HEAD(&gateways); - CFS_INIT_LIST_HEAD(&nets); + INIT_LIST_HEAD(&gateways); + INIT_LIST_HEAD(&nets); /* save a copy of the string for error messages */ - strncpy(cmd, str, sizeof(cmd) - 1); - cmd[sizeof(cmd) - 1] = 0; + strncpy(cmd, str, sizeof(cmd)); + cmd[sizeof(cmd) - 1] = '\0'; sep = str; for (;;) { /* scan for token start */ - while (lnet_iswhite(*sep)) + while (cfs_iswhite(*sep)) sep++; if (*sep == 0) { if (ntokens < (got_hops ? 3 : 2)) @@ -587,11 +717,11 @@ lnet_parse_route (char *str, int *im_a_router) token = sep++; /* scan for token end */ - while (*sep != 0 && !lnet_iswhite(*sep)) + while (*sep != 0 && !cfs_iswhite(*sep)) sep++; if (*sep != 0) *sep++ = 0; - + if (ntokens == 1) { tmp2 = &nets; /* expanding nets */ } else if (ntokens == 2 && @@ -601,7 +731,7 @@ lnet_parse_route (char *str, int *im_a_router) } else { tmp2 = &gateways; /* expanding gateways */ } - + ltb = lnet_new_text_buf(strlen(token)); if (ltb == NULL) goto out; @@ -609,16 +739,16 @@ lnet_parse_route (char *str, int *im_a_router) strcpy(ltb->ltb_text, token); tmp1 = <b->ltb_list; list_add_tail(tmp1, tmp2); - + while (tmp1 != tmp2) { - ltb = list_entry(tmp1, lnet_text_buf_t, ltb_list); + ltb = list_entry(tmp1, struct lnet_text_buf, ltb_list); rc = lnet_str2tbs_expand(tmp1->next, ltb->ltb_text); if (rc < 0) goto token_error; tmp1 = tmp1->next; - + if (rc > 0) { /* expanded! */ list_del(<b->ltb_list); lnet_free_text_buf(ltb); @@ -631,6 +761,11 @@ lnet_parse_route (char *str, int *im_a_router) LNET_NETTYP(net) == LOLND) goto token_error; } else { + rc = lnet_parse_priority(ltb->ltb_text, + &priority, &token); + if (rc < 0) + goto token_error; + nid = libcfs_str2nid(ltb->ltb_text); if (nid == LNET_NID_ANY || LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) @@ -639,44 +774,44 @@ lnet_parse_route (char *str, int *im_a_router) } } - if (!got_hops) - hops = 1; + if (!got_hops) + hops = 1; - LASSERT (!list_empty(&nets)); - LASSERT (!list_empty(&gateways)); + LASSERT(!list_empty(&nets)); + LASSERT(!list_empty(&gateways)); - list_for_each (tmp1, &nets) { - ltb = list_entry(tmp1, lnet_text_buf_t, ltb_list); + list_for_each(tmp1, &nets) { + ltb = list_entry(tmp1, struct lnet_text_buf, ltb_list); net = libcfs_str2net(ltb->ltb_text); LASSERT (net != LNET_NIDNET(LNET_NID_ANY)); - list_for_each (tmp2, &gateways) { - ltb = list_entry(tmp2, lnet_text_buf_t, ltb_list); + list_for_each(tmp2, &gateways) { + ltb = list_entry(tmp2, struct lnet_text_buf, ltb_list); nid = libcfs_str2nid(ltb->ltb_text); - LASSERT (nid != LNET_NID_ANY); + LASSERT(nid != LNET_NID_ANY); - if (lnet_islocalnid(nid)) { - *im_a_router = 1; - continue; - } - - rc = lnet_add_route (net, hops, nid); - if (rc != 0) { - CERROR("Can't create route " - "to %s via %s\n", - libcfs_net2str(net), - libcfs_nid2str(nid)); - goto out; - } + if (lnet_islocalnid(nid)) { + *im_a_router = 1; + continue; + } + + rc = lnet_add_route(net, hops, nid, priority); + if (rc != 0) { + CERROR("Can't create route " + "to %s via %s\n", + libcfs_net2str(net), + libcfs_nid2str(nid)); + goto out; + } } } - myrc = 0; - goto out; - - token_error: - lnet_syntax("routes", cmd, token - str, strlen(token)); - out: + myrc = 0; + goto out; + +token_error: + lnet_syntax("routes", cmd, (int)(token - str), strlen(token)); +out: lnet_free_text_bufs(&nets); lnet_free_text_bufs(&gateways); return myrc; @@ -685,10 +820,10 @@ lnet_parse_route (char *str, int *im_a_router) int lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router) { - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; while (!list_empty(tbs)) { - ltb = list_entry(tbs->next, lnet_text_buf_t, ltb_list); + ltb = list_entry(tbs->next, struct lnet_text_buf, ltb_list); if (lnet_parse_route(ltb->ltb_text, im_a_router) < 0) { lnet_free_text_bufs(tbs); @@ -705,20 +840,12 @@ lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router) int lnet_parse_routes (char *routes, int *im_a_router) { - struct list_head tbs; - int rc = 0; + struct list_head tbs; + int rc = 0; *im_a_router = 0; - if (the_lnet.ln_ptlcompat > 0 && - routes[0] != 0) { - /* Can't route when running in compatibility mode */ - LCONSOLE_ERROR("Route tables are not supported when " - "'portals_compatible' is set\n"); - return -EINVAL; - } - - CFS_INIT_LIST_HEAD(&tbs); + INIT_LIST_HEAD(&tbs); if (lnet_str2tbs_sep(&tbs, routes) < 0) { CERROR("Error parsing routes\n"); @@ -731,195 +858,22 @@ lnet_parse_routes (char *routes, int *im_a_router) return rc; } -void -lnet_print_range_exprs(struct list_head *exprs) -{ - struct list_head *e; - lnet_range_expr_t *lre; - - list_for_each(e, exprs) { - lre = list_entry(exprs->next, lnet_range_expr_t, lre_list); - - CDEBUG(D_WARNING, "%d-%d/%d\n", - lre->lre_min, lre->lre_max, lre->lre_stride); - } - - CDEBUG(D_WARNING, "%d allocated\n", lnet_re_alloc); -} - int -lnet_new_range_expr(struct list_head *exprs, int min, int max, int stride) +lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) { - lnet_range_expr_t *lre; - - CDEBUG(D_NET, "%d-%d/%d\n", min, max, stride); - - if (min < 0 || min > 255 || min > max || stride < 0) - return -EINVAL; - - LIBCFS_ALLOC(lre, sizeof(*lre)); - if (lre == NULL) - return -ENOMEM; - - lnet_re_alloc++; - - lre->lre_min = min; - lre->lre_max = max; - lre->lre_stride = stride; - - list_add(&lre->lre_list, exprs); - return 0; -} - -void -lnet_destroy_range_exprs(struct list_head *exprs) -{ - lnet_range_expr_t *lre; - - while (!list_empty(exprs)) { - lre = list_entry(exprs->next, lnet_range_expr_t, lre_list); - - list_del(&lre->lre_list); - LIBCFS_FREE(lre, sizeof(*lre)); - lnet_re_alloc--; - } -} - -int -lnet_parse_range_expr(struct list_head *exprs, char *str) -{ - int nob = strlen(str); - char *sep; - int n; - int x; - int y; - int z; - int rc; - - if (nob == 0) - return -EINVAL; - - if (!strcmp(str, "*")) /* match all */ - return lnet_new_range_expr(exprs, 0, 255, 1); - - n = nob; - if (sscanf(str, "%u%n", &x, &n) >= 1 && n == nob) { - /* simple number */ - return lnet_new_range_expr(exprs, x, x, 1); - } - - /* Has to be an expansion */ - if (!(str[0] == '[' && nob > 2 && str[nob-1] == ']')) - return -EINVAL; - - nob -= 2; - str++; - str[nob] = 0; - - do { - /* Comma separated list of expressions... */ - sep = strchr(str, ','); - if (sep != NULL) - *sep++ = 0; - - nob = strlen(str); - n = nob; - if (sscanf(str, "%u%n", &x, &n) >= 1 && n == nob) { - /* simple number */ - rc = lnet_new_range_expr(exprs, x, x, 1); - if (rc != 0) - return rc; - - continue; - } - - n = nob; - if (sscanf(str, "%u-%u%n", &x, &y, &n) >= 2 && n == nob) { - /* simple range */ - rc = lnet_new_range_expr(exprs, x, y, 1); - if (rc != 0) - return rc; - continue; - } - - n = nob; - if (sscanf(str, "%u-%u/%u%n", &x, &y, &z, &n) >= 3 && n == nob) { - /* strided range */ - rc = lnet_new_range_expr(exprs, x, y, z); - if (rc != 0) - return rc; - continue; - } - - return -EINVAL; - - } while ((str = sep) != NULL); + struct list_head list = LIST_HEAD_INIT(list); + int rc; + int i; - return 0; -} - -int -lnet_match_network_token(char *token, __u32 *ipaddrs, int nip) -{ - struct list_head exprs[4]; - struct list_head *e; - lnet_range_expr_t *re; - char *str; - int i; - int j; - __u32 ip; - int n; - int match; - int rc; - - for (i = 0; i < 4; i++) - CFS_INIT_LIST_HEAD(&exprs[i]); - - for (i = 0; i < 4; i++) { - str = token; - if (i != 3) { - token = strchr(token, '.'); - if (token == NULL) { - rc = -EINVAL; - goto out; - } - *token++ = 0; - } + rc = cfs_ip_addr_parse(token, len, &list); + if (rc != 0) + return rc; - rc = lnet_parse_range_expr(&exprs[i], str); - if (rc != 0) { - LASSERT (rc < 0); - goto out; - } - } + for (rc = i = 0; !rc && i < nip; i++) + rc = cfs_ip_addr_match(ipaddrs[i], &list); - for (match = i = 0; !match && i < nip; i++) { - ip = ipaddrs[i]; - - for (match = 1, j = 0; match && j < 4; j++) { - n = (ip >> (8 * (3 - j))) & 0xff; - match = 0; - - list_for_each(e, &exprs[j]) { - re = list_entry(e, lnet_range_expr_t, lre_list); - - if (re->lre_min <= n && - re->lre_max >= n && - (n - re->lre_min) % re->lre_stride == 0) { - match = 1; - break; - } - } - } - } - - rc = match ? 1 : 0; + cfs_ip_addr_free(&list); - out: - for (i = 0; i < 4; i++) - lnet_destroy_range_exprs(&exprs[i]); - LASSERT (lnet_re_alloc == 0); - return rc; } @@ -943,44 +897,44 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) sep = tokens; for (;;) { /* scan for token start */ - while (lnet_iswhite(*sep)) + while (cfs_iswhite(*sep)) sep++; if (*sep == 0) break; - + token = sep++; - + /* scan for token end */ - while (*sep != 0 && !lnet_iswhite(*sep)) + while (*sep != 0 && !cfs_iswhite(*sep)) sep++; if (*sep != 0) *sep++ = 0; - + if (ntokens++ == 0) { net = token; continue; } len = strlen(token); - - rc = lnet_match_network_token(token, ipaddrs, nip); + + rc = lnet_match_network_token(token, len, ipaddrs, nip); if (rc < 0) { lnet_syntax("ip2nets", net_entry, - token - tokens, len); + (int)(token - tokens), len); return rc; } matched |= (rc != 0); } - + if (!matched) return 0; - + strcpy(net_entry, net); /* replace with matched net */ return 1; } -__u32 +__u32 lnet_netspec2net(char *netspec) { char *bracket = strchr(netspec, '('); @@ -993,7 +947,7 @@ lnet_netspec2net(char *netspec) if (bracket != NULL) *bracket = '('; - + return net; } @@ -1003,28 +957,28 @@ lnet_splitnets(char *source, struct list_head *nets) int offset = 0; int offset2; int len; - lnet_text_buf_t *tb; - lnet_text_buf_t *tb2; - struct list_head *t; + struct lnet_text_buf *tb; + struct lnet_text_buf *tb2; + struct list_head *t; char *sep; char *bracket; __u32 net; - LASSERT (!list_empty(nets)); - LASSERT (nets->next == nets->prev); /* single entry */ - - tb = list_entry(nets->next, lnet_text_buf_t, ltb_list); + LASSERT(!list_empty(nets)); + LASSERT(nets->next == nets->prev); /* single entry */ + + tb = list_entry(nets->next, struct lnet_text_buf, ltb_list); for (;;) { sep = strchr(tb->ltb_text, ','); bracket = strchr(tb->ltb_text, '('); - if (sep != NULL && - bracket != NULL && - bracket < sep) { + if (sep != NULL && + bracket != NULL && + bracket < sep) { /* netspec lists interfaces... */ - offset2 = offset + (bracket - tb->ltb_text); + offset2 = offset + (int)(bracket - tb->ltb_text); len = strlen(bracket); bracket = strchr(bracket + 1, ')'); @@ -1048,12 +1002,12 @@ lnet_splitnets(char *source, struct list_head *nets) return -EINVAL; } - list_for_each(t, nets) { - tb2 = list_entry(t, lnet_text_buf_t, ltb_list); + list_for_each(t, nets) { + tb2 = list_entry(t, struct lnet_text_buf, ltb_list); if (tb2 == tb) continue; - + if (net == lnet_netspec2net(tb2->ltb_text)) { /* duplicate network */ lnet_syntax("ip2nets", source, offset, @@ -1061,68 +1015,71 @@ lnet_splitnets(char *source, struct list_head *nets) return -EINVAL; } } - + if (sep == NULL) return 0; - offset += sep - tb->ltb_text; - tb2 = lnet_new_text_buf(strlen(sep)); - if (tb2 == NULL) - return -ENOMEM; - - strcpy(tb2->ltb_text, sep); - list_add_tail(&tb2->ltb_list, nets); + offset += (int)(sep - tb->ltb_text); + len = strlen(sep); + tb2 = lnet_new_text_buf(len); + if (tb2 == NULL) + return -ENOMEM; - tb = tb2; - } + strncpy(tb2->ltb_text, sep, len); + tb2->ltb_text[len] = '\0'; + list_add_tail(&tb2->ltb_list, nets); + + tb = tb2; + } } int lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) { - static char networks[LNET_SINGLE_TEXTBUF_NOB]; - static char source[LNET_SINGLE_TEXTBUF_NOB]; - - struct list_head raw_entries; - struct list_head matched_nets; - struct list_head current_nets; - struct list_head *t; - struct list_head *t2; - lnet_text_buf_t *tb; - lnet_text_buf_t *tb2; - __u32 net1; - __u32 net2; - int len; - int count; - int dup; - int rc; - - CFS_INIT_LIST_HEAD(&raw_entries); + static char networks[LNET_SINGLE_TEXTBUF_NOB]; + static char source[LNET_SINGLE_TEXTBUF_NOB]; + + struct list_head raw_entries; + struct list_head matched_nets; + struct list_head current_nets; + struct list_head *t; + struct list_head *t2; + struct lnet_text_buf *tb; + struct lnet_text_buf *tb2; + __u32 net1; + __u32 net2; + int len; + int count; + int dup; + int rc; + + INIT_LIST_HEAD(&raw_entries); if (lnet_str2tbs_sep(&raw_entries, ip2nets) < 0) { CERROR("Error parsing ip2nets\n"); LASSERT (lnet_tbnob == 0); return -EINVAL; } - CFS_INIT_LIST_HEAD(&matched_nets); - CFS_INIT_LIST_HEAD(¤t_nets); + INIT_LIST_HEAD(&matched_nets); + INIT_LIST_HEAD(¤t_nets); networks[0] = 0; count = 0; len = 0; rc = 0; - while (!list_empty(&raw_entries)) { - tb = list_entry(raw_entries.next, lnet_text_buf_t, ltb_list); + while (!list_empty(&raw_entries)) { + tb = list_entry(raw_entries.next, struct lnet_text_buf, + ltb_list); - strncpy(source, tb->ltb_text, sizeof(source)-1); - source[sizeof(source)-1] = 0; + strncpy(source, tb->ltb_text, sizeof(source)); + source[sizeof(source) - 1] = '\0'; /* replace ltb_text with the network(s) add on match */ rc = lnet_match_network_tokens(tb->ltb_text, ipaddrs, nip); if (rc < 0) break; - list_del(&tb->ltb_list); + list_del(&tb->ltb_list); if (rc == 0) { /* no match */ lnet_free_text_buf(tb); @@ -1130,55 +1087,56 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) } /* split into separate networks */ - CFS_INIT_LIST_HEAD(¤t_nets); - list_add(&tb->ltb_list, ¤t_nets); + INIT_LIST_HEAD(¤t_nets); + list_add(&tb->ltb_list, ¤t_nets); rc = lnet_splitnets(source, ¤t_nets); if (rc < 0) break; dup = 0; - list_for_each (t, ¤t_nets) { - tb = list_entry(t, lnet_text_buf_t, ltb_list); + list_for_each(t, ¤t_nets) { + tb = list_entry(t, struct lnet_text_buf, ltb_list); net1 = lnet_netspec2net(tb->ltb_text); - LASSERT (net1 != LNET_NIDNET(LNET_NID_ANY)); - - list_for_each(t2, &matched_nets) { - tb2 = list_entry(t2, lnet_text_buf_t, ltb_list); - net2 = lnet_netspec2net(tb2->ltb_text); - LASSERT (net2 != LNET_NIDNET(LNET_NID_ANY)); - - if (net1 == net2) { - dup = 1; - break; - } - } + LASSERT(net1 != LNET_NIDNET(LNET_NID_ANY)); + + list_for_each(t2, &matched_nets) { + tb2 = list_entry(t2, struct lnet_text_buf, + ltb_list); + net2 = lnet_netspec2net(tb2->ltb_text); + LASSERT(net2 != LNET_NIDNET(LNET_NID_ANY)); + + if (net1 == net2) { + dup = 1; + break; + } + } - if (dup) - break; - } + if (dup) + break; + } if (dup) { lnet_free_text_bufs(¤t_nets); continue; } - list_for_each_safe(t, t2, ¤t_nets) { - tb = list_entry(t, lnet_text_buf_t, ltb_list); - - list_del(&tb->ltb_list); - list_add_tail(&tb->ltb_list, &matched_nets); + list_for_each_safe(t, t2, ¤t_nets) { + tb = list_entry(t, struct lnet_text_buf, ltb_list); + + list_del(&tb->ltb_list); + list_add_tail(&tb->ltb_list, &matched_nets); + + len += snprintf(networks + len, sizeof(networks) - len, + "%s%s", (len == 0) ? "" : ",", + tb->ltb_text); - len += snprintf(networks + len, sizeof(networks) - len, - "%s%s", (len == 0) ? "" : ",", - tb->ltb_text); - if (len >= sizeof(networks)) { CERROR("Too many matched networks\n"); rc = -E2BIG; goto out; } } - + count++; } @@ -1190,7 +1148,7 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) if (rc < 0) return rc; - + *networksp = networks; return count; } @@ -1217,7 +1175,7 @@ lnet_ipaddr_enumerate (__u32 **ipaddrsp) if (nif <= 0) return nif; - + LIBCFS_ALLOC(ipaddrs, nif * sizeof(*ipaddrs)); if (ipaddrs == NULL) { CERROR("Can't allocate ipaddrs[%d]\n", nif); @@ -1228,8 +1186,8 @@ lnet_ipaddr_enumerate (__u32 **ipaddrsp) for (i = nip = 0; i < nif; i++) { if (!strcmp(ifnames[i], "lo")) continue; - - rc = libcfs_ipif_query(ifnames[i], &up, + + rc = libcfs_ipif_query(ifnames[i], &up, &ipaddrs[nip], &netmask); if (rc != 0) { CWARN("Can't query interface %s: %d\n", @@ -1257,8 +1215,8 @@ lnet_ipaddr_enumerate (__u32 **ipaddrsp) CERROR("Can't allocate ipaddrs[%d]\n", nip); nip = -ENOMEM; } else { - memcpy(ipaddrs2, ipaddrs, - nip * sizeof(*ipaddrs)); + memcpy(ipaddrs2, ipaddrs, + nip * sizeof(*ipaddrs)); *ipaddrsp = ipaddrs2; rc = nip; } @@ -1276,14 +1234,14 @@ lnet_parse_ip2nets (char **networksp, char *ip2nets) int rc; if (nip < 0) { - LCONSOLE_ERROR("Error %d enumerating local IP interfaces " - "for ip2nets to match\n", nip); + LCONSOLE_ERROR_MSG(0x117, "Error %d enumerating local IP " + "interfaces for ip2nets to match\n", nip); return nip; } if (nip == 0) { - LCONSOLE_ERROR("No local IP interfaces " - "for ip2nets to match\n"); + LCONSOLE_ERROR_MSG(0x118, "No local IP interfaces " + "for ip2nets to match\n"); return -ENOENT; } @@ -1291,13 +1249,13 @@ lnet_parse_ip2nets (char **networksp, char *ip2nets) lnet_ipaddr_free_enumeration(ipaddrs, nip); if (rc < 0) { - LCONSOLE_ERROR("Error %d parsing ip2nets\n", rc); + LCONSOLE_ERROR_MSG(0x119, "Error %d parsing ip2nets\n", rc); return rc; } if (rc == 0) { - LCONSOLE_ERROR("ip2nets does not match " - "any local IP interfaces\n"); + LCONSOLE_ERROR_MSG(0x11a, "ip2nets does not match " + "any local IP interfaces\n"); return -ENOENT; } @@ -1305,7 +1263,7 @@ lnet_parse_ip2nets (char **networksp, char *ip2nets) } int -lnet_set_ip_niaddr (lnet_ni_t *ni) +lnet_set_ip_niaddr (lnet_ni_t *ni) { __u32 net = LNET_NIDNET(ni->ni_nid); char **names; @@ -1328,7 +1286,7 @@ lnet_set_ip_niaddr (lnet_ni_t *ni) libcfs_net2str(net)); return -EPERM; } - + rc = libcfs_ipif_query(ni->ni_interfaces[0], &up, &ip, &netmask); if (rc != 0) { @@ -1342,14 +1300,14 @@ lnet_set_ip_niaddr (lnet_ni_t *ni) libcfs_net2str(net), ni->ni_interfaces[0]); return -ENETDOWN; } - + ni->ni_nid = LNET_MKNID(net, ip); return 0; } n = libcfs_ipif_enumerate(&names); if (n <= 0) { - CERROR("Net %s can't enumerate interfaces: %d\n", + CERROR("Net %s can't enumerate interfaces: %d\n", libcfs_net2str(net), n); return 0; } @@ -1357,15 +1315,15 @@ lnet_set_ip_niaddr (lnet_ni_t *ni) for (i = 0; i < n; i++) { if (!strcmp(names[i], "lo")) /* skip the loopback IF */ continue; - + rc = libcfs_ipif_query(names[i], &up, &ip, &netmask); - + if (rc != 0) { CWARN("Net %s can't query interface %s: %d\n", libcfs_net2str(net), names[i], rc); continue; } - + if (!up) { CWARN("Net %s ignoring interface %s (down)\n", libcfs_net2str(net), names[i]);