*
* 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
*/
* 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, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* libcfs/libcfs/util/nidstrings.c
*
#include <string.h>
#include <libcfs/util/string.h>
-#include <lnet/types.h>
-#include <lnet/nidstr.h>
+#include <linux/lnet/lnet-types.h>
+#include <linux/lnet/nidstr.h>
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
return rc;
}
+int
+cfs_expr2str(struct list_head *list, char *str, size_t size)
+{
+ struct cfs_expr_list *expr;
+ struct cfs_range_expr *range;
+ char tmp[LNET_NIDSTR_SIZE];
+ size_t len;
+ bool first;
+ bool bracket = false;
+ char *format;
+ char *tmpc;
+
+ list_for_each_entry(expr, list, el_link) {
+ first = true;
+ list_for_each_entry(range, &expr->el_exprs, re_link) {
+ if (range->re_lo == range->re_hi) {
+ snprintf(tmp,
+ LNET_NIDSTR_SIZE,
+ "%u.", range->re_lo);
+ } else if (range->re_lo < range->re_hi) {
+ if (range->re_stride > 1) {
+ if (first)
+ format = "[%u-%u/%u,";
+ else
+ format = "%u-%u/%u,";
+ snprintf(tmp, LNET_NIDSTR_SIZE,
+ format, range->re_lo,
+ range->re_hi, range->re_stride);
+ bracket = true;
+ } else {
+ if (first)
+ format = "[%u-%u,";
+ else
+ format = "%u-%u,";
+ snprintf(tmp, LNET_NIDSTR_SIZE,
+ format, range->re_lo,
+ range->re_hi);
+ bracket = true;
+ }
+ } else {
+ return -EINVAL;
+ }
+ len = strlen(tmp);
+ size -= (len + 1);
+ if (size < 0)
+ return -ENOBUFS;
+
+ strncat(str, tmp, size + len);
+ first = false;
+ }
+ if (bracket) {
+ tmpc = str + (strlen(str) - 1);
+ size -= 1;
+ if (size < 0)
+ return -ENOBUFS;
+ *tmpc = ']';
+ *(tmpc+1) = '.';
+ bracket = false;
+ }
+ }
+
+ /*
+ * get rid of the trailing '.' at the end of the string
+ * only if we actually had something on the list passed in.
+ * otherwise we could write outside the array
+ */
+ if (!list_empty(list))
+ str[strlen(str)-1] = '\0';
+ return size;
+}
+
+static int
+libcfs_num_addr_range_expand(struct list_head *addrranges, __u32 *addrs,
+ int max_addrs)
+{
+ struct cfs_expr_list *expr_list;
+ struct cfs_range_expr *range;
+ int i;
+ int max_idx = max_addrs - 1;
+ int addrs_idx = max_idx;
+
+ list_for_each_entry(expr_list, addrranges, el_link) {
+ list_for_each_entry(range, &expr_list->el_exprs, re_link) {
+ for (i = range->re_lo; i <= range->re_hi;
+ i += range->re_stride) {
+ if (addrs_idx < 0)
+ return -1;
+
+ addrs[addrs_idx] = i;
+ addrs_idx--;
+ }
+ }
+ }
+
+ return max_idx - addrs_idx;
+}
+
+static int
+libcfs_ip_addr_range_expand(struct list_head *addrranges, __u32 *addrs,
+ int max_addrs)
+{
+ int rc = 0;
+
+ rc = cfs_ip_addr_range_gen(addrs, max_addrs, addrranges);
+
+ if (rc == -1)
+ return rc;
+ else
+ return max_addrs - rc - 1;
+}
+
static int
libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
{
list_for_each_entry(el, list, el_link) {
assert(j++ < 4);
if (i != 0)
- i += snprintf(buffer + i, count - i, ".");
+ i += scnprintf(buffer + i, count - i, ".");
i += cfs_expr_list_print(buffer + i, count - i, el);
}
return i;
}
+static int
+cfs_ip_addr_range_gen_recurse(__u32 *ip_list, int *count, int shift,
+ __u32 result, struct list_head *head_el,
+ struct cfs_expr_list *octet_el)
+{
+ __u32 value = 0;
+ int i;
+ struct cfs_expr_list *next_octet_el;
+ struct cfs_range_expr *octet_expr;
+
+ /*
+ * each octet can have multiple expressions so we need to traverse
+ * all of the expressions
+ */
+ list_for_each_entry(octet_expr, &octet_el->el_exprs, re_link) {
+ for (i = octet_expr->re_lo; i <= octet_expr->re_hi; i++) {
+ if (((i - octet_expr->re_lo) % octet_expr->re_stride) == 0) {
+ /*
+ * we have a hit calculate the result and
+ * pass it forward to the next iteration
+ * of the recursion.
+ */
+ next_octet_el =
+ list_entry(octet_el->el_link.next,
+ typeof(*next_octet_el),
+ el_link);
+ value = result | (i << (shift * 8));
+ if (next_octet_el->el_link.next != head_el) {
+ /*
+ * We still have more octets in
+ * the IP address so traverse
+ * that. We're doing a depth first
+ * recursion here.
+ */
+ if (cfs_ip_addr_range_gen_recurse(ip_list, count,
+ shift - 1, value,
+ head_el,
+ next_octet_el) == -1)
+ return -1;
+ } else {
+ /*
+ * We have hit a leaf so store the
+ * calculated IP address in the
+ * list. If we have run out of
+ * space stop the recursion.
+ */
+ if (*count == -1)
+ return -1;
+ /* add ip to the list */
+ ip_list[*count] = value;
+ (*count)--;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+/*
+ * only generate maximum of count ip addresses from the given expression
+ */
+int
+cfs_ip_addr_range_gen(__u32 *ip_list, int count, struct list_head *ip_addr_expr)
+{
+ struct cfs_expr_list *octet_el;
+ int idx = count - 1;
+
+ octet_el = list_entry(ip_addr_expr->next, typeof(*octet_el), el_link);
+
+ (void) cfs_ip_addr_range_gen_recurse(ip_list, &idx, 3, 0, &octet_el->el_link, octet_el);
+
+ return idx;
+}
+
/**
* Matches address (\a addr) against address set encoded in \a list.
*
snprintf(str, size, "%u", addr);
}
-static void
-libcfs_hexnum_addr2str(__u32 addr, char *str, size_t size)
-{
- snprintf(str, size, "0x%x", addr);
-}
-
static int
libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
{
* \retval 0 if \a str parsed to numeric address
* \retval errno otherwise
*/
-static int
+int
libcfs_num_parse(char *str, int len, struct list_head *list)
{
struct cfs_expr_list *el;
return cfs_expr_list_match(addr, el);
}
-static bool cfs_ip_is_contiguous(struct list_head *nidlist);
-static void cfs_ip_min_max(struct list_head *nidlist, __u32 *min, __u32 *max);
-static bool cfs_num_is_contiguous(struct list_head *nidlist);
-static void cfs_num_min_max(struct list_head *nidlist, __u32 *min, __u32 *max);
-
-static struct netstrfns libcfs_netstrfns[] = {
- {/* .nf_type */ LOLND,
- /* .nf_name */ "lo",
- /* .nf_modname */ "klolnd",
- /* .nf_addr2str */ libcfs_decnum_addr2str,
- /* .nf_str2addr */ libcfs_lo_str2addr,
- /* .nf_parse_addr*/ 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",
- /* .nf_modname */ "ksocklnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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",
- /* .nf_modname */ "ko2iblnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ CIBLND,
- /* .nf_name */ "cib",
- /* .nf_modname */ "kciblnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ OPENIBLND,
- /* .nf_name */ "openib",
- /* .nf_modname */ "kopeniblnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ IIBLND,
- /* .nf_name */ "iib",
- /* .nf_modname */ "kiiblnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ VIBLND,
- /* .nf_name */ "vib",
- /* .nf_modname */ "kviblnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ RALND,
- /* .nf_name */ "ra",
- /* .nf_modname */ "kralnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ QSWLND,
- /* .nf_name */ "elan",
- /* .nf_modname */ "kqswlnd",
- /* .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_is_contiguous */ cfs_num_is_contiguous,
- /* .nf_min_max */ cfs_num_min_max},
- {/* .nf_type */ GMLND,
- /* .nf_name */ "gm",
- /* .nf_modname */ "kgmlnd",
- /* .nf_addr2str */ libcfs_hexnum_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_is_contiguous */ cfs_num_is_contiguous,
- /* .nf_min_max */ cfs_num_min_max},
- {/* .nf_type */ MXLND,
- /* .nf_name */ "mx",
- /* .nf_modname */ "kmxlnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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 */ PTLLND,
- /* .nf_name */ "ptl",
- /* .nf_modname */ "kptllnd",
- /* .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_is_contiguous */ cfs_num_is_contiguous,
- /* .nf_min_max */ cfs_num_min_max},
- {/* .nf_type */ GNILND,
- /* .nf_name */ "gni",
- /* .nf_modname */ "kgnilnd",
- /* .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_is_contiguous */ cfs_num_is_contiguous,
- /* .nf_min_max */ cfs_num_min_max},
- {/* .nf_type */ GNIIPLND,
- /* .nf_name */ "gip",
- /* .nf_modname */ "kgnilnd",
- /* .nf_addr2str */ libcfs_ip_addr2str,
- /* .nf_str2addr */ libcfs_ip_str2addr,
- /* .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},
+static int cfs_ip_min_max(struct list_head *nidlist, __u32 *min, __u32 *max);
+static int cfs_num_min_max(struct list_head *nidlist, __u32 *min, __u32 *max);
+
+static struct netstrfns libcfs_netstrfns[] = {
+ {
+ .nf_type = LOLND,
+ .nf_name = "lo",
+ .nf_modname = "klolnd",
+ .nf_addr2str = libcfs_decnum_addr2str,
+ .nf_str2addr = libcfs_lo_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,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
+ },
+ {
+ .nf_type = SOCKLND,
+ .nf_name = "tcp",
+ .nf_modname = "ksocklnd",
+ .nf_addr2str = libcfs_ip_addr2str,
+ .nf_str2addr = libcfs_ip_str2addr,
+ .nf_parse_addrlist = cfs_ip_addr_parse,
+ .nf_print_addrlist = libcfs_ip_addr_range_print,
+ .nf_match_addr = cfs_ip_addr_match,
+ .nf_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
+ },
+ {
+ .nf_type = O2IBLND,
+ .nf_name = "o2ib",
+ .nf_modname = "ko2iblnd",
+ .nf_addr2str = libcfs_ip_addr2str,
+ .nf_str2addr = libcfs_ip_str2addr,
+ .nf_parse_addrlist = cfs_ip_addr_parse,
+ .nf_print_addrlist = libcfs_ip_addr_range_print,
+ .nf_match_addr = cfs_ip_addr_match,
+ .nf_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
+ },
+ {
+ .nf_type = GNILND,
+ .nf_name = "gni",
+ .nf_modname = "kgnilnd",
+ .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,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
+ },
+ {
+ .nf_type = GNIIPLND,
+ .nf_name = "gip",
+ .nf_modname = "kgnilnd",
+ .nf_addr2str = libcfs_ip_addr2str,
+ .nf_str2addr = libcfs_ip_str2addr,
+ .nf_parse_addrlist = cfs_ip_addr_parse,
+ .nf_print_addrlist = libcfs_ip_addr_range_print,
+ .nf_match_addr = cfs_ip_addr_match,
+ .nf_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
+ },
+ {
+ .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,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
+ },
+ {
+ .nf_type = KFILND,
+ .nf_name = "kfi",
+ .nf_modname = "kkfilnd",
+ .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,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
+ }
};
static const size_t libcfs_nnetstrfns =
if (libcfs_str2net_internal(str, &net) != NULL)
return net;
- return LNET_NIDNET(LNET_NID_ANY);
+ return LNET_NET_ANY;
}
lnet_nid_t
}
char *
-libcfs_id2str(lnet_process_id_t id)
+libcfs_id2str(struct lnet_process_id id)
{
char *str = libcfs_next_nidstring();
return 0;
}
+static __u32
+libcfs_net_str_len(const char *str)
+{
+ int i;
+ struct netstrfns *nf = NULL;
+
+ for (i = 0; i < libcfs_nnetstrfns; i++) {
+ nf = &libcfs_netstrfns[i];
+ if (!strncmp(str, nf->nf_name, strlen(nf->nf_name)))
+ return strlen(nf->nf_name);
+ }
+
+ return 0;
+}
+
+int
+parse_net_range(char *str, __u32 len, struct list_head *net_num,
+ __u32 *net_type)
+{
+ struct cfs_lstr next;
+ __u32 net_type_len;
+ __u32 net;
+ char *bracket;
+ char *star;
+
+ if (!str)
+ return -EINVAL;
+
+ next.ls_str = str;
+ next.ls_len = len;
+
+ net_type_len = libcfs_net_str_len(str);
+
+ if (net_type_len < len) {
+ char c = str[net_type_len];
+
+ str[net_type_len] = '\0';
+ net = libcfs_str2net(str);
+ str[net_type_len] = c;
+ } else {
+ net = libcfs_str2net(str);
+ }
+
+ if (net == LNET_NIDNET(LNET_NID_ANY))
+ return -EINVAL;
+
+ *net_type = LNET_NETTYP(net);
+
+ /*
+ * the net is either followed with an absolute number, *, or an
+ * expression enclosed in []
+ */
+ bracket = strchr(next.ls_str, '[');
+ star = strchr(next.ls_str, '*');
+
+ /* "*[" pattern not allowed */
+ if (bracket && star && star < bracket)
+ return -EINVAL;
+
+ if (!bracket) {
+ next.ls_str = str + net_type_len;
+ next.ls_len = strlen(next.ls_str);
+ } else {
+ next.ls_str = bracket;
+ next.ls_len = strlen(bracket);
+ }
+
+ /* if there is no net number just return */
+ if (next.ls_len == 0)
+ return 0;
+
+ return libcfs_num_parse(next.ls_str, next.ls_len,
+ net_num);
+}
+
+int
+parse_address(struct cfs_lstr *src, const __u32 net_type,
+ struct list_head *addr)
+{
+ int i;
+ struct netstrfns *nf = NULL;
+
+ for (i = 0; i < libcfs_nnetstrfns; i++) {
+ nf = &libcfs_netstrfns[i];
+ if (net_type == nf->nf_type)
+ return nf->nf_parse_addrlist(src->ls_str, src->ls_len,
+ addr);
+ }
+
+ return -EINVAL;
+}
+
+int
+cfs_parse_nid_parts(char *str, struct list_head *addr,
+ struct list_head *net_num, __u32 *net_type)
+{
+ struct cfs_lstr next;
+ struct cfs_lstr addrrange;
+ bool found = false;
+ int rc;
+
+ if (!str)
+ return -EINVAL;
+
+ next.ls_str = str;
+ next.ls_len = strlen(str);
+
+ rc = cfs_gettok(&next, '@', &addrrange);
+ if (!rc)
+ return -EINVAL;
+
+ if (!next.ls_str) {
+ /* only net is present */
+ next.ls_str = str;
+ next.ls_len = strlen(str);
+ } else {
+ found = true;
+ }
+
+ /* assume only net is present */
+ rc = parse_net_range(next.ls_str, next.ls_len, net_num, net_type);
+
+ /*
+ * if we successfully parsed the net range and there is no
+ * address, or if we fail to parse the net range then return
+ */
+ if ((!rc && !found) || rc)
+ return rc;
+
+ return parse_address(&addrrange, *net_type, addr);
+}
+
/**
* Frees addrrange structures of \a list.
*
return 0;
}
+int
+cfs_match_net(__u32 net_id, __u32 net_type, struct list_head *net_num_list)
+{
+ __u32 net_num;
+
+ if (!net_num_list)
+ return 0;
+
+ if (net_type != LNET_NETTYP(net_id))
+ return 0;
+
+ net_num = LNET_NETNUM(net_id);
+
+ /*
+ * if there is a net number but the list passed in is empty, then
+ * there is no match.
+ */
+ if (!net_num && list_empty(net_num_list))
+ return 1;
+ else if (list_empty(net_num_list))
+ return 0;
+
+ if (!libcfs_num_match(net_num, net_num_list))
+ return 0;
+
+ return 1;
+}
+
/**
* Print the network part of the nidrange \a nr into the specified \a buffer.
*
struct netstrfns *nf = nr->nr_netstrfns;
if (nr->nr_netnum == 0)
- return snprintf(buffer, count, "@%s", nf->nf_name);
+ return scnprintf(buffer, count, "@%s", nf->nf_name);
else
- return snprintf(buffer, count, "@%s%u",
- nf->nf_name, nr->nr_netnum);
+ return scnprintf(buffer, count, "@%s%u",
+ nf->nf_name, nr->nr_netnum);
}
list_for_each_entry(ar, addrranges, ar_link) {
if (i != 0)
- i += snprintf(buffer + i, count - i, " ");
+ i += scnprintf(buffer + i, count - i, " ");
i += nf->nf_print_addrlist(buffer + i, count - i,
&ar->ar_numaddr_ranges);
i += cfs_print_network(buffer + i, count - i, nr);
list_for_each_entry(nr, nidlist, nr_link) {
if (i != 0)
- i += snprintf(buffer + i, count - i, " ");
+ i += scnprintf(buffer + i, count - i, " ");
if (nr->nr_all != 0) {
assert(list_empty(&nr->nr_addrranges));
- i += snprintf(buffer + i, count - i, "*");
+ i += scnprintf(buffer + i, count - i, "*");
i += cfs_print_network(buffer + i, count - i, nr);
} else {
i += cfs_print_addrranges(buffer + i, count - i,
* 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;
- unsigned int min_ip[4] = {0};
- unsigned int max_ip[4] = {0};
- int re_count = 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 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;
}
/**
* 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;
- struct cfs_range_expr *re;
- unsigned int min_addr = 0;
- unsigned int max_addr = 0;
+ struct cfs_expr_list *el;
+ struct cfs_range_expr *re;
+ unsigned int min_addr = 0;
+ 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++;
}
}
*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;
-}
-
-/**
- * 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;
}
/**
* 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;
- __u32 min_addr;
- __u32 max_addr;
- char *lndname = NULL;
- char min_addr_str[IPSTRING_LENGTH];
- char max_addr_str[IPSTRING_LENGTH];
+ struct nidrange *first_nidrange;
+ int netnum;
+ struct netstrfns *nf;
+ char *lndname;
+ __u32 min_addr;
+ __u32 max_addr;
+ 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));
netnum);
snprintf(max_nid, nidstr_length, "%s@%s%d", max_addr_str, lndname,
netnum);
+
+ return 0;
}
/**
* 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 addrrange *ar;
- unsigned int tmp_min_addr = 0;
- unsigned int tmp_max_addr = 0;
- unsigned int min_addr = 0;
- unsigned int max_addr = 0;
+ 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;
}
/**
* 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 addrrange *ar;
- __u32 tmp_min_ip_addr = 0;
- __u32 tmp_max_ip_addr = 0;
- __u32 min_ip_addr = 0;
- __u32 max_ip_addr = 0;
+ 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;
+
+ if (nr->nr_all) {
+ min_ip_addr = 0;
+ max_ip_addr = 0xffffffff;
+ break;
+ }
+
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
+libcfs_expand_nidrange(struct nidrange *nr, __u32 *addrs, int max_nids)
+{
+ struct addrrange *ar;
+ int rc = 0, count = max_nids;
+ struct netstrfns *nf = nr->nr_netstrfns;
+
+ list_for_each_entry(ar, &nr->nr_addrranges, ar_link) {
+ rc = nf->nf_expand_addrrange(&ar->ar_numaddr_ranges, addrs,
+ count);
+ if (rc < 0)
+ return rc;
+
+ count -= rc;
+ }
+
+ return max_nids - count;
+}
+
+int cfs_expand_nidlist(struct list_head *nidlist, lnet_nid_t *lnet_nidlist,
+ int max_nids)
+{
+ struct nidrange *nr;
+ int rc = 0, count = max_nids;
+ int i, j = 0;
+ __u32 *addrs;
+ struct netstrfns *nf;
+ __u32 net;
+
+ addrs = calloc(max_nids, sizeof(__u32));
+ if (!addrs)
+ return -ENOMEM;
+
+ list_for_each_entry(nr, nidlist, nr_link) {
+ rc = libcfs_expand_nidrange(nr, addrs, count);
+
+ if (rc < 0) {
+ free(addrs);
+ return rc;
+ }
+
+ nf = nr->nr_netstrfns;
+ net = LNET_MKNET(nf->nf_type, nr->nr_netnum);
+
+ for (i = count - 1; i >= count - rc; i--)
+ lnet_nidlist[j++] = LNET_MKNID(net, addrs[i]);
+
+ count -= rc;
+ }
+
+ free(addrs);
+ return max_nids - count;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff