X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Fnidstrings.c;h=786619ceb3fe4429ed15e72c611187ad9a70177e;hb=1cf929df259a9aaa5446a4cda637930ca5b27d7a;hp=5605d1b75d56932c807e51bbf8c6c2f6380f3a95;hpb=72708f700021c2bea897616e28fba1dfc4fd32cb;p=fs%2Flustre-release.git diff --git a/lnet/lnet/nidstrings.c b/lnet/lnet/nidstrings.c index 5605d1b..786619c 100644 --- a/lnet/lnet/nidstrings.c +++ b/lnet/lnet/nidstrings.c @@ -15,11 +15,7 @@ * * 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 - * - * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,7 +37,7 @@ #define DEBUG_SUBSYSTEM S_LNET #include -#include +#include /* max value for numeric network address */ #define MAX_NUMERIC_VALUE 0xffffffff @@ -60,8 +56,8 @@ * between getting its string and using it. */ -static char libcfs_nidstrings[LNET_NIDSTR_COUNT][LNET_NIDSTR_SIZE]; -static int libcfs_nidstring_idx; +static char libcfs_nidstrings[LNET_NIDSTR_COUNT][LNET_NIDSTR_SIZE]; +static int libcfs_nidstring_idx; static DEFINE_SPINLOCK(libcfs_nidstring_lock); @@ -70,7 +66,7 @@ static struct netstrfns *libcfs_namenum2netstrfns(const char *name); char * libcfs_next_nidstring(void) { - char *str; + char *str; unsigned long flags; spin_lock_irqsave(&libcfs_nidstring_lock, flags); @@ -88,22 +84,22 @@ EXPORT_SYMBOL(libcfs_next_nidstring); * Nid range list syntax. * \verbatim * - * :== [ ' ' ] - * :== '@' - * :== '*' | - * | + * :== [ ' ' ] + * :== '@' + * :== '*' | + * | * * :== ... * * :== | - * - * :== '[' [ ',' ] ']' + * + * :== '[' [ ',' ] ']' * :== | - * '-' | - * '-' '/' - * :== | - * :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" | - * "vib" | "ra" | "elan" | "mx" | "ptl" + * '-' | + * '-' '/' + * :== | + * :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" | + * "vib" | "ra" | "elan" | "mx" | "ptl" * \endverbatim */ @@ -249,10 +245,8 @@ parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist) { struct cfs_lstr addrrange; struct cfs_lstr net; - struct cfs_lstr tmp; struct nidrange *nr; - tmp = *src; if (cfs_gettok(src, '@', &addrrange) == 0) goto failed; @@ -462,38 +456,62 @@ EXPORT_SYMBOL(cfs_print_nidlist); * numeric address range * * \param ar - * \param min_nid - * \param max_nid + * \param[out] *min_nid __u32 representation of min NID + * \param[out] *max_nid __u32 representation of max NID + * \retval -EINVAL unsupported LNET range + * \retval -ERANGE non-contiguous LNET range */ -static void cfs_ip_ar_min_max(struct addrrange *ar, __u32 *min_nid, +static int cfs_ip_ar_min_max(struct addrrange *ar, __u32 *min_nid, __u32 *max_nid) { - struct cfs_expr_list *el; - struct cfs_range_expr *re; - __u32 tmp_ip_addr = 0; + struct cfs_expr_list *expr_list; + struct cfs_range_expr *range; unsigned int min_ip[4] = {0}; unsigned int max_ip[4] = {0}; - int re_count = 0; + int cur_octet = 0; + bool expect_full_octet = false; + + list_for_each_entry(expr_list, &ar->ar_numaddr_ranges, el_link) { + int re_count = 0; + + list_for_each_entry(range, &expr_list->el_exprs, re_link) { + /* XXX: add support for multiple & non-contig. re's */ + if (re_count > 0) + return -EINVAL; + + /* if a previous octet was ranged, then all remaining + * octets must be full for contiguous range */ + if (expect_full_octet && (range->re_lo != 0 || + range->re_hi != 255)) + return -ERANGE; + + if (range->re_stride != 1) + return -ERANGE; + + if (range->re_lo > range->re_hi) + return -EINVAL; + + if (range->re_lo != range->re_hi) + expect_full_octet = true; + + min_ip[cur_octet] = range->re_lo; + max_ip[cur_octet] = range->re_hi; - list_for_each_entry(el, &ar->ar_numaddr_ranges, el_link) { - list_for_each_entry(re, &el->el_exprs, re_link) { - min_ip[re_count] = re->re_lo; - max_ip[re_count] = re->re_hi; re_count++; } - } - tmp_ip_addr = ((min_ip[0] << 24) | (min_ip[1] << 16) | - (min_ip[2] << 8) | min_ip[3]); + cur_octet++; + } if (min_nid != NULL) - *min_nid = tmp_ip_addr; - - tmp_ip_addr = ((max_ip[0] << 24) | (max_ip[1] << 16) | - (max_ip[2] << 8) | max_ip[3]); + *min_nid = ((min_ip[0] << 24) | (min_ip[1] << 16) | + (min_ip[2] << 8) | min_ip[3]); if (max_nid != NULL) - *max_nid = tmp_ip_addr; + *max_nid = ((max_ip[0] << 24) | (max_ip[1] << 16) | + (max_ip[2] << 8) | max_ip[3]); + + return 0; } /** @@ -501,10 +519,11 @@ static void cfs_ip_ar_min_max(struct addrrange *ar, __u32 *min_nid, * numeric address range * * \param ar - * \param min_nid - * \param max_nid + * \param[out] *min_nid __u32 representation of min NID + * \param[out] *max_nid __u32 representation of max NID + * \retval -EINVAL unsupported LNET range */ -static void cfs_num_ar_min_max(struct addrrange *ar, __u32 *min_nid, +static int cfs_num_ar_min_max(struct addrrange *ar, __u32 *min_nid, __u32 *max_nid) { struct cfs_expr_list *el; @@ -513,11 +532,20 @@ static void cfs_num_ar_min_max(struct addrrange *ar, __u32 *min_nid, unsigned int max_addr = 0; list_for_each_entry(el, &ar->ar_numaddr_ranges, el_link) { + int re_count = 0; + list_for_each_entry(re, &el->el_exprs, re_link) { + if (re_count > 0) + return -EINVAL; + if (re->re_lo > re->re_hi) + return -EINVAL; + if (re->re_lo < min_addr || min_addr == 0) min_addr = re->re_lo; if (re->re_hi > max_addr) max_addr = re->re_hi; + + re_count++; } } @@ -525,174 +553,42 @@ static void cfs_num_ar_min_max(struct addrrange *ar, __u32 *min_nid, *min_nid = min_addr; if (max_nid != NULL) *max_nid = max_addr; -} - -/** - * Determines whether an expression list in an nidrange contains exactly - * one contiguous address range. Calls the correct netstrfns for the LND - * - * \param *nidlist - * - * \retval true if contiguous - * \retval false if not contiguous - */ -bool cfs_nidrange_is_contiguous(struct list_head *nidlist) -{ - struct nidrange *nr; - struct netstrfns *nf = NULL; - char *lndname = NULL; - int netnum = -1; - - list_for_each_entry(nr, nidlist, nr_link) { - nf = nr->nr_netstrfns; - if (lndname == NULL) - lndname = nf->nf_name; - if (netnum == -1) - netnum = nr->nr_netnum; - - if (strcmp(lndname, nf->nf_name) != 0 || - netnum != nr->nr_netnum) - return false; - } - - if (nf == NULL) - return false; - - if (!nf->nf_is_contiguous(nidlist)) - return false; - - return true; -} -EXPORT_SYMBOL(cfs_nidrange_is_contiguous); - -/** - * Determines whether an expression list in an num nidrange contains exactly - * one contiguous address range. - * - * \param *nidlist - * - * \retval true if contiguous - * \retval false if not contiguous - */ -static bool cfs_num_is_contiguous(struct list_head *nidlist) -{ - struct nidrange *nr; - struct addrrange *ar; - struct cfs_expr_list *el; - struct cfs_range_expr *re; - int last_hi = 0; - __u32 last_end_nid = 0; - __u32 current_start_nid = 0; - __u32 current_end_nid = 0; - - list_for_each_entry(nr, nidlist, nr_link) { - list_for_each_entry(ar, &nr->nr_addrranges, ar_link) { - cfs_num_ar_min_max(ar, ¤t_start_nid, - ¤t_end_nid); - if (last_end_nid != 0 && - (current_start_nid - last_end_nid != 1)) - return false; - last_end_nid = current_end_nid; - list_for_each_entry(el, &ar->ar_numaddr_ranges, - el_link) { - list_for_each_entry(re, &el->el_exprs, - re_link) { - if (re->re_stride > 1) - return false; - else if (last_hi != 0 && - re->re_hi - last_hi != 1) - return false; - last_hi = re->re_hi; - } - } - } - } - - return true; -} - -/** - * Determines whether an expression list in an ip nidrange contains exactly - * one contiguous address range. - * - * \param *nidlist - * - * \retval true if contiguous - * \retval false if not contiguous - */ -static bool cfs_ip_is_contiguous(struct list_head *nidlist) -{ - struct nidrange *nr; - struct addrrange *ar; - struct cfs_expr_list *el; - struct cfs_range_expr *re; - int expr_count; - int last_hi = 255; - int last_diff = 0; - __u32 last_end_nid = 0; - __u32 current_start_nid = 0; - __u32 current_end_nid = 0; - list_for_each_entry(nr, nidlist, nr_link) { - list_for_each_entry(ar, &nr->nr_addrranges, ar_link) { - last_hi = 255; - last_diff = 0; - cfs_ip_ar_min_max(ar, ¤t_start_nid, - ¤t_end_nid); - if (last_end_nid != 0 && - (current_start_nid - last_end_nid != 1)) - return false; - last_end_nid = current_end_nid; - list_for_each_entry(el, - &ar->ar_numaddr_ranges, - el_link) { - expr_count = 0; - list_for_each_entry(re, &el->el_exprs, - re_link) { - expr_count++; - if (re->re_stride > 1 || - (last_diff > 0 && last_hi != 255) || - (last_diff > 0 && last_hi == 255 && - re->re_lo > 0)) - return false; - last_hi = re->re_hi; - last_diff = re->re_hi - re->re_lo; - } - } - } - } - - return true; + return 0; } /** * Takes a linked list of nidrange expressions, determines the minimum * and maximum nid and creates appropriate nid structures * - * \param *nidlist - * \param *min_nid - * \param *max_nid + * \param[out] *min_nid string representation of min NID + * \param[out] *max_nid string representation of max NID + * \retval -EINVAL unsupported LNET range + * \retval -ERANGE non-contiguous LNET range */ -void cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid, - char *max_nid, size_t nidstr_length) +int cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid, + char *max_nid, size_t nidstr_length) { - struct nidrange *nr; - struct netstrfns *nf = NULL; - int netnum = -1; + struct nidrange *first_nidrange; + int netnum; + struct netstrfns *nf; + char *lndname; __u32 min_addr; __u32 max_addr; - char *lndname = NULL; char min_addr_str[IPSTRING_LENGTH]; char max_addr_str[IPSTRING_LENGTH]; + int rc; - list_for_each_entry(nr, nidlist, nr_link) { - nf = nr->nr_netstrfns; - lndname = nf->nf_name; - if (netnum == -1) - netnum = nr->nr_netnum; + first_nidrange = list_entry(nidlist->next, struct nidrange, nr_link); + + netnum = first_nidrange->nr_netnum; + nf = first_nidrange->nr_netstrfns; + lndname = nf->nf_name; + + rc = nf->nf_min_max(nidlist, &min_addr, &max_addr); + if (rc < 0) + return rc; - nf->nf_min_max(nidlist, &min_addr, &max_addr); - } nf->nf_addr2str(min_addr, min_addr_str, sizeof(min_addr_str)); nf->nf_addr2str(max_addr, max_addr_str, sizeof(max_addr_str)); @@ -700,6 +596,8 @@ void cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid, netnum); snprintf(max_nid, nidstr_length, "%s@%s%d", max_addr_str, lndname, netnum); + + return 0; } EXPORT_SYMBOL(cfs_nidrange_find_min_max); @@ -707,31 +605,45 @@ EXPORT_SYMBOL(cfs_nidrange_find_min_max); * Determines the min and max NID values for num LNDs * * \param *nidlist - * \param *min_nid - * \param *max_nid + * \param[out] *min_nid if provided, returns string representation of min NID + * \param[out] *max_nid if provided, returns string representation of max NID + * \retval -EINVAL unsupported LNET range + * \retval -ERANGE non-contiguous LNET range */ -static void cfs_num_min_max(struct list_head *nidlist, __u32 *min_nid, +static int cfs_num_min_max(struct list_head *nidlist, __u32 *min_nid, __u32 *max_nid) { - struct nidrange *nr; + struct nidrange *nr; struct addrrange *ar; unsigned int tmp_min_addr = 0; unsigned int tmp_max_addr = 0; unsigned int min_addr = 0; unsigned int max_addr = 0; + int nidlist_count = 0; + int rc; list_for_each_entry(nr, nidlist, nr_link) { + if (nidlist_count > 0) + return -EINVAL; + list_for_each_entry(ar, &nr->nr_addrranges, ar_link) { - cfs_num_ar_min_max(ar, &tmp_min_addr, - &tmp_max_addr); + rc = cfs_num_ar_min_max(ar, &tmp_min_addr, + &tmp_max_addr); + if (rc < 0) + return rc; + if (tmp_min_addr < min_addr || min_addr == 0) min_addr = tmp_min_addr; if (tmp_max_addr > max_addr) max_addr = tmp_min_addr; } } - *max_nid = max_addr; - *min_nid = min_addr; + if (max_nid != NULL) + *max_nid = max_addr; + if (min_nid != NULL) + *min_nid = min_addr; + + return 0; } /** @@ -739,34 +651,48 @@ static void cfs_num_min_max(struct list_head *nidlist, __u32 *min_nid, * ip addresses. * * \param *nidlist - * \param *min_nid - * \param *max_nid + * \param[out] *min_nid if provided, returns string representation of min NID + * \param[out] *max_nid if provided, returns string representation of max NID + * \retval -EINVAL unsupported LNET range + * \retval -ERANGE non-contiguous LNET range */ -static void cfs_ip_min_max(struct list_head *nidlist, __u32 *min_nid, +static int cfs_ip_min_max(struct list_head *nidlist, __u32 *min_nid, __u32 *max_nid) { - struct nidrange *nr; + struct nidrange *nr; struct addrrange *ar; __u32 tmp_min_ip_addr = 0; __u32 tmp_max_ip_addr = 0; __u32 min_ip_addr = 0; __u32 max_ip_addr = 0; + int nidlist_count = 0; + int rc; list_for_each_entry(nr, nidlist, nr_link) { + if (nidlist_count > 0) + return -EINVAL; + list_for_each_entry(ar, &nr->nr_addrranges, ar_link) { - cfs_ip_ar_min_max(ar, &tmp_min_ip_addr, - &tmp_max_ip_addr); + rc = cfs_ip_ar_min_max(ar, &tmp_min_ip_addr, + &tmp_max_ip_addr); + if (rc < 0) + return rc; + if (tmp_min_ip_addr < min_ip_addr || min_ip_addr == 0) min_ip_addr = tmp_min_ip_addr; if (tmp_max_ip_addr > max_ip_addr) max_ip_addr = tmp_max_ip_addr; } + + nidlist_count++; } - if (min_nid != NULL) - *min_nid = min_ip_addr; if (max_nid != NULL) *max_nid = max_ip_addr; + if (min_nid != NULL) + *min_nid = min_ip_addr; + + return 0; } static int @@ -900,7 +826,7 @@ libcfs_decnum_addr2str(__u32 addr, char *str, size_t size) static int libcfs_num_str2addr(const char *str, int nob, __u32 *addr) { - int n; + int n; n = nob; if (sscanf(str, "0x%x%n", addr, &n) >= 1 && n == nob) @@ -977,7 +903,6 @@ static struct netstrfns libcfs_netstrfns[] = { .nf_parse_addrlist = libcfs_num_parse, .nf_print_addrlist = libcfs_num_addr_range_print, .nf_match_addr = libcfs_num_match, - .nf_is_contiguous = cfs_num_is_contiguous, .nf_min_max = cfs_num_min_max }, { .nf_type = SOCKLND, .nf_name = "tcp", @@ -987,7 +912,6 @@ static struct netstrfns libcfs_netstrfns[] = { .nf_parse_addrlist = cfs_ip_addr_parse, .nf_print_addrlist = libcfs_ip_addr_range_print, .nf_match_addr = cfs_ip_addr_match, - .nf_is_contiguous = cfs_ip_is_contiguous, .nf_min_max = cfs_ip_min_max }, { .nf_type = O2IBLND, .nf_name = "o2ib", @@ -997,7 +921,6 @@ static struct netstrfns libcfs_netstrfns[] = { .nf_parse_addrlist = cfs_ip_addr_parse, .nf_print_addrlist = libcfs_ip_addr_range_print, .nf_match_addr = cfs_ip_addr_match, - .nf_is_contiguous = cfs_ip_is_contiguous, .nf_min_max = cfs_ip_min_max }, { .nf_type = GNILND, .nf_name = "gni", @@ -1007,7 +930,6 @@ static struct netstrfns libcfs_netstrfns[] = { .nf_parse_addrlist = libcfs_num_parse, .nf_print_addrlist = libcfs_num_addr_range_print, .nf_match_addr = libcfs_num_match, - .nf_is_contiguous = cfs_num_is_contiguous, .nf_min_max = cfs_num_min_max }, { .nf_type = GNIIPLND, .nf_name = "gip", @@ -1017,8 +939,16 @@ static struct netstrfns libcfs_netstrfns[] = { .nf_parse_addrlist = cfs_ip_addr_parse, .nf_print_addrlist = libcfs_ip_addr_range_print, .nf_match_addr = cfs_ip_addr_match, - .nf_is_contiguous = cfs_ip_is_contiguous, .nf_min_max = cfs_ip_min_max }, + { .nf_type = PTL4LND, + .nf_name = "ptlf", + .nf_modname = "kptl4lnd", + .nf_addr2str = libcfs_decnum_addr2str, + .nf_str2addr = libcfs_num_str2addr, + .nf_parse_addrlist = libcfs_num_parse, + .nf_print_addrlist = libcfs_num_addr_range_print, + .nf_match_addr = libcfs_num_match, + .nf_min_max = cfs_num_min_max}, }; static const size_t libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns); @@ -1039,7 +969,7 @@ static struct netstrfns * libcfs_namenum2netstrfns(const char *name) { struct netstrfns *nf; - int i; + int i; for (i = 0; i < libcfs_nnetstrfns; i++) { nf = &libcfs_netstrfns[i]; @@ -1209,10 +1139,10 @@ EXPORT_SYMBOL(libcfs_str2net); lnet_nid_t libcfs_str2nid(const char *str) { - const char *sep = strchr(str, '@'); + const char *sep = strchr(str, '@'); struct netstrfns *nf; - __u32 net; - __u32 addr; + __u32 net; + __u32 addr; if (sep != NULL) { nf = libcfs_str2net_internal(sep + 1, &net); @@ -1233,7 +1163,7 @@ libcfs_str2nid(const char *str) EXPORT_SYMBOL(libcfs_str2nid); char * -libcfs_id2str(lnet_process_id_t id) +libcfs_id2str(struct lnet_process_id id) { char *str = libcfs_next_nidstring();