X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fconfig.c;h=a5661f9c3e9638e1d9d43223d7d0888ec4b99b27;hp=99c9ff3d491c1a6e655e796aae14d40aa57c7522;hb=38c845dfcb6412a5ef15fb1de9b5cc1d48b91b53;hpb=e069296630240947f1815e505067fd48033909f7 diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index 99c9ff3..a5661f9 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -26,6 +26,8 @@ /* * 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/ @@ -35,11 +37,12 @@ #define DEBUG_SUBSYSTEM S_LNET #include -typedef struct { /* tmp struct for parsing routes */ - cfs_list_t 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 */ @@ -50,19 +53,19 @@ 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_MSG(0x10f, "Error parsing '%s=\"%s\"'\n", name, str); - LCONSOLE_ERROR_MSG(0x110, "here...........%.*s..%.*s|%.*s|\n", + 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) { @@ -76,45 +79,50 @@ lnet_issep (char c) } int -lnet_net_unique(__u32 net, cfs_list_t *nilist) +lnet_net_unique(__u32 net, struct list_head *nilist) { - cfs_list_t *tmp; - lnet_ni_t *ni; + struct list_head *tmp; + lnet_ni_t *ni; - cfs_list_for_each (tmp, nilist) { - ni = cfs_list_entry(tmp, lnet_ni_t, ni_list); + list_for_each(tmp, nilist) { + ni = list_entry(tmp, lnet_ni_t, ni_list); - if (LNET_NIDNET(ni->ni_nid) == net) - return 0; - } + if (LNET_NIDNET(ni->ni_nid) == net) + return 0; + } - return 1; + return 1; } void lnet_ni_free(struct lnet_ni *ni) { + int i; + if (ni->ni_refs != NULL) cfs_percpt_free(ni->ni_refs); if (ni->ni_tx_queues != NULL) cfs_percpt_free(ni->ni_tx_queues); - if (ni->ni_cpts != NULL) { - LIBCFS_FREE(ni->ni_cpts, - sizeof(ni->ni_cpts[0] * ni->ni_ncpts)); - } + 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_ni_alloc(__u32 net, struct cfs_expr_list **el, cfs_list_t *nilist) +lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist) { struct lnet_tx_queue *tq; struct lnet_ni *ni; @@ -135,13 +143,13 @@ lnet_ni_alloc(__u32 net, struct cfs_expr_list **el, cfs_list_t *nilist) } #ifdef __KERNEL__ - cfs_spin_lock_init(&ni->ni_lock); + spin_lock_init(&ni->ni_lock); #else # ifdef HAVE_LIBPTHREAD pthread_mutex_init(&ni->ni_lock, NULL); # endif #endif - CFS_INIT_LIST_HEAD(&ni->ni_cptlist); + 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) @@ -153,13 +161,13 @@ lnet_ni_alloc(__u32 net, struct cfs_expr_list **el, cfs_list_t *nilist) goto failed; cfs_percpt_for_each(tq, i, ni->ni_tx_queues) - CFS_INIT_LIST_HEAD(&tq->tq_delayed); + INIT_LIST_HEAD(&tq->tq_delayed); - if (el == NULL || *el == NULL) { + 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); + 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); @@ -173,25 +181,23 @@ lnet_ni_alloc(__u32 net, struct cfs_expr_list **el, cfs_list_t *nilist) } ni->ni_ncpts = rc; - cfs_expr_list_free(*el); /* consume it */ - *el = NULL; } - /* LND will fill in the address part of the NID */ - ni->ni_nid = LNET_MKNID(net, 0); - ni->ni_last_alive = cfs_time_current(); - cfs_list_add_tail(&ni->ni_list, nilist); - return ni; + /* 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(cfs_list_t *nilist, char *networks) +lnet_parse_networks(struct list_head *nilist, char *networks) { struct cfs_expr_list *el = NULL; - int tokensize = strlen(networks) + 1; + int tokensize; char *tokens; char *str; char *tmp; @@ -199,6 +205,11 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) __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_MSG(0x112, "Can't parse networks: string too " @@ -206,15 +217,15 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) 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); + memcpy(tokens, networks, tokensize); str = tmp = tokens; /* Add in the loopback network */ @@ -275,8 +286,13 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) } if (LNET_NETTYP(net) != LOLND && /* LO is implicit */ - lnet_ni_alloc(net, &el, nilist) == NULL) - goto failed; + lnet_ni_alloc(net, el, nilist) == NULL) + goto failed; + + if (el != NULL) { + cfs_expr_list_free(el); + el = NULL; + } str = comma; continue; @@ -290,11 +306,16 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) } nnets++; - ni = lnet_ni_alloc(net, &el, nilist); - if (ni == NULL) - goto failed; + ni = lnet_ni_alloc(net, el, 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, ')'); @@ -315,14 +336,28 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) goto failed_syntax; } - if (niface == LNET_MAX_INTERFACES) { - LCONSOLE_ERROR_MSG(0x115, "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); @@ -346,16 +381,18 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) } } - LASSERT(!cfs_list_empty(nilist)); + LASSERT(!list_empty(nilist)); + + LIBCFS_FREE(tokens, tokensize); return 0; failed_syntax: lnet_syntax("networks", networks, (int)(tmp - tokens), strlen(tmp)); failed: - while (!cfs_list_empty(nilist)) { - ni = cfs_list_entry(nilist->next, lnet_ni_t, ni_list); + while (!list_empty(nilist)) { + ni = list_entry(nilist->next, lnet_ni_t, ni_list); - cfs_list_del(&ni->ni_list); + list_del(&ni->ni_list); lnet_ni_free(ni); } @@ -363,19 +400,17 @@ lnet_parse_networks(cfs_list_t *nilist, char *networks) cfs_expr_list_free(el); LIBCFS_FREE(tokens, tokensize); - the_lnet.ln_network_tokens = NULL; 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"); @@ -386,45 +421,45 @@ 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); } void -lnet_free_text_bufs(cfs_list_t *tbs) +lnet_free_text_bufs(struct list_head *tbs) { - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; - while (!cfs_list_empty(tbs)) { - ltb = cfs_list_entry(tbs->next, lnet_text_buf_t, ltb_list); + while (!list_empty(tbs)) { + ltb = list_entry(tbs->next, struct lnet_text_buf, ltb_list); - cfs_list_del(<b->ltb_list); + list_del(<b->ltb_list); lnet_free_text_buf(ltb); } } void -lnet_print_text_bufs(cfs_list_t *tbs) +lnet_print_text_bufs(struct list_head *tbs) { - cfs_list_t *tmp; - lnet_text_buf_t *ltb; + struct list_head *tmp; + struct lnet_text_buf *ltb; - cfs_list_for_each (tmp, tbs) { - ltb = cfs_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); } @@ -433,22 +468,22 @@ lnet_print_text_bufs(cfs_list_t *tbs) } int -lnet_str2tbs_sep (cfs_list_t *tbs, char *str) +lnet_str2tbs_sep(struct list_head *tbs, char *str) { - cfs_list_t pending; + struct list_head pending; char *sep; int nob; int i; - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; - CFS_INIT_LIST_HEAD(&pending); + INIT_LIST_HEAD(&pending); /* Split 'str' into separate commands */ for (;;) { /* skip leading whitespace */ while (cfs_iswhite(*str)) str++; - + /* scan for separator or comment */ for (sep = str; *sep != 0; sep++) if (lnet_issep(*sep) || *sep == '#') @@ -461,7 +496,7 @@ lnet_str2tbs_sep (cfs_list_t *tbs, char *str) lnet_free_text_bufs(&pending); return -1; } - + for (i = 0; i < nob; i++) if (cfs_iswhite(str[i])) ltb->ltb_text[i] = ' '; @@ -470,7 +505,7 @@ lnet_str2tbs_sep (cfs_list_t *tbs, char *str) ltb->ltb_text[nob] = 0; - cfs_list_add_tail(<b->ltb_list, &pending); + list_add_tail(<b->ltb_list, &pending); } if (*sep == '#') { @@ -479,25 +514,25 @@ lnet_str2tbs_sep (cfs_list_t *tbs, char *str) sep++; } while (*sep != 0 && !lnet_issep(*sep)); } - + if (*sep == 0) break; str = sep + 1; } - cfs_list_splice(&pending, tbs->prev); + list_splice(&pending, tbs->prev); return 0; } int -lnet_expand1tb (cfs_list_t *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 = (int)(sep1 - str); int len2 = strlen(sep2 + 1); - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; LASSERT (*sep1 == '['); LASSERT (*sep2 == ']'); @@ -511,27 +546,27 @@ lnet_expand1tb (cfs_list_t *list, memcpy(<b->ltb_text[len1+itemlen], sep2 + 1, len2); ltb->ltb_text[len1 + itemlen + len2] = 0; - cfs_list_add_tail(<b->ltb_list, list); + list_add_tail(<b->ltb_list, list); return 0; } int -lnet_str2tbs_expand (cfs_list_t *tbs, char *str) +lnet_str2tbs_expand(struct list_head *tbs, char *str) { - char num[16]; - cfs_list_t pending; - char *sep; - char *sep2; - char *parsed; - char *enditem; - int lo; - int hi; - int stride; - int i; - int nob; - int scanned; - - CFS_INIT_LIST_HEAD(&pending); + 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; + + INIT_LIST_HEAD(&pending); sep = strchr(str, '['); if (sep == NULL) /* nothing to expand */ @@ -558,10 +593,10 @@ lnet_str2tbs_expand (cfs_list_t *tbs, char *str) if (lnet_expand1tb(&pending, str, sep, sep2, parsed, (int)(enditem - parsed)) != 0) goto failed; - + continue; } - + stride = 1; } @@ -569,27 +604,27 @@ lnet_str2tbs_expand (cfs_list_t *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; } } - - cfs_list_splice(&pending, tbs->prev); + + list_splice(&pending, tbs->prev); return 1; - + failed: lnet_free_text_bufs(&pending); return -1; @@ -600,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) @@ -613,27 +679,28 @@ lnet_parse_route (char *str, int *im_a_router) /* static scratch buffer OK (single threaded) */ static char cmd[LNET_SINGLE_TEXTBUF_NOB]; - cfs_list_t nets; - cfs_list_t gateways; - cfs_list_t *tmp1; - cfs_list_t *tmp2; + struct list_head nets; + struct list_head gateways; + struct list_head *tmp1; + 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 (;;) { @@ -654,7 +721,7 @@ lnet_parse_route (char *str, int *im_a_router) sep++; if (*sep != 0) *sep++ = 0; - + if (ntokens == 1) { tmp2 = &nets; /* expanding nets */ } else if (ntokens == 2 && @@ -664,26 +731,26 @@ 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; strcpy(ltb->ltb_text, token); tmp1 = <b->ltb_list; - cfs_list_add_tail(tmp1, tmp2); - + list_add_tail(tmp1, tmp2); + while (tmp1 != tmp2) { - ltb = cfs_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! */ - cfs_list_del(<b->ltb_list); + list_del(<b->ltb_list); lnet_free_text_buf(ltb); continue; } @@ -694,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) @@ -702,63 +774,63 @@ lnet_parse_route (char *str, int *im_a_router) } } - if (!got_hops) - hops = 1; + if (!got_hops) + hops = 1; - LASSERT (!cfs_list_empty(&nets)); - LASSERT (!cfs_list_empty(&gateways)); + LASSERT(!list_empty(&nets)); + LASSERT(!list_empty(&gateways)); - cfs_list_for_each (tmp1, &nets) { - ltb = cfs_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)); - cfs_list_for_each (tmp2, &gateways) { - ltb = cfs_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: + myrc = 0; + goto out; + +token_error: lnet_syntax("routes", cmd, (int)(token - str), strlen(token)); - out: +out: lnet_free_text_bufs(&nets); lnet_free_text_bufs(&gateways); return myrc; } int -lnet_parse_route_tbs(cfs_list_t *tbs, int *im_a_router) +lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router) { - lnet_text_buf_t *ltb; + struct lnet_text_buf *ltb; - while (!cfs_list_empty(tbs)) { - ltb = cfs_list_entry(tbs->next, lnet_text_buf_t, ltb_list); + while (!list_empty(tbs)) { + 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); return -EINVAL; } - cfs_list_del(<b->ltb_list); + list_del(<b->ltb_list); lnet_free_text_buf(ltb); } @@ -768,12 +840,12 @@ lnet_parse_route_tbs(cfs_list_t *tbs, int *im_a_router) int lnet_parse_routes (char *routes, int *im_a_router) { - cfs_list_t tbs; - int rc = 0; + struct list_head tbs; + int rc = 0; *im_a_router = 0; - CFS_INIT_LIST_HEAD(&tbs); + INIT_LIST_HEAD(&tbs); if (lnet_str2tbs_sep(&tbs, routes) < 0) { CERROR("Error parsing routes\n"); @@ -789,7 +861,7 @@ lnet_parse_routes (char *routes, int *im_a_router) int lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) { - CFS_LIST_HEAD (list); + struct list_head list = LIST_HEAD_INIT(list); int rc; int i; @@ -829,15 +901,15 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) sep++; if (*sep == 0) break; - + token = sep++; - + /* scan for token end */ while (*sep != 0 && !cfs_iswhite(*sep)) sep++; if (*sep != 0) *sep++ = 0; - + if (ntokens++ == 0) { net = token; continue; @@ -854,10 +926,10 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) matched |= (rc != 0); } - + if (!matched) return 0; - + strcpy(net_entry, net); /* replace with matched net */ return 1; } @@ -880,30 +952,30 @@ lnet_netspec2net(char *netspec) } int -lnet_splitnets(char *source, cfs_list_t *nets) +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; - cfs_list_t *t; + struct lnet_text_buf *tb; + struct lnet_text_buf *tb2; + struct list_head *t; char *sep; char *bracket; __u32 net; - LASSERT (!cfs_list_empty(nets)); - LASSERT (nets->next == nets->prev); /* single entry */ + LASSERT(!list_empty(nets)); + LASSERT(nets->next == nets->prev); /* single entry */ - tb = cfs_list_entry(nets->next, lnet_text_buf_t, ltb_list); + 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 + (int)(bracket - tb->ltb_text); @@ -930,12 +1002,12 @@ lnet_splitnets(char *source, cfs_list_t *nets) return -EINVAL; } - cfs_list_for_each(t, nets) { - tb2 = cfs_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, @@ -948,64 +1020,66 @@ lnet_splitnets(char *source, cfs_list_t *nets) return 0; offset += (int)(sep - tb->ltb_text); - tb2 = lnet_new_text_buf(strlen(sep)); - if (tb2 == NULL) - return -ENOMEM; + len = strlen(sep); + tb2 = lnet_new_text_buf(len); + if (tb2 == NULL) + return -ENOMEM; - strcpy(tb2->ltb_text, sep); - cfs_list_add_tail(&tb2->ltb_list, nets); + strncpy(tb2->ltb_text, sep, len); + tb2->ltb_text[len] = '\0'; + list_add_tail(&tb2->ltb_list, nets); - tb = tb2; - } + 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]; - - cfs_list_t raw_entries; - cfs_list_t matched_nets; - cfs_list_t current_nets; - cfs_list_t *t; - cfs_list_t *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 (!cfs_list_empty(&raw_entries)) { - tb = cfs_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; - cfs_list_del(&tb->ltb_list); + list_del(&tb->ltb_list); if (rc == 0) { /* no match */ lnet_free_text_buf(tb); @@ -1013,56 +1087,56 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) } /* split into separate networks */ - CFS_INIT_LIST_HEAD(¤t_nets); - cfs_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; - cfs_list_for_each (t, ¤t_nets) { - tb = cfs_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)); - - cfs_list_for_each(t2, &matched_nets) { - tb2 = cfs_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; } - cfs_list_for_each_safe(t, t2, ¤t_nets) { - tb = cfs_list_entry(t, lnet_text_buf_t, ltb_list); - - cfs_list_del(&tb->ltb_list); - cfs_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++; } @@ -1141,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; }