*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* libcfs/libcfs/util/nidstrings.c
*
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.
*
* \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;
.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_min_max = cfs_num_min_max,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
},
{
.nf_type = SOCKLND,
.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_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
},
{
.nf_type = O2IBLND,
.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_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
},
{
.nf_type = GNILND,
.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_min_max = cfs_num_min_max,
+ .nf_expand_addrrange = libcfs_num_addr_range_expand
},
{
.nf_type = GNIIPLND,
.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_min_max = cfs_ip_min_max,
+ .nf_expand_addrrange = libcfs_ip_addr_range_expand
},
{
.nf_type = PTL4LND,
.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_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
}
};
if (libcfs_str2net_internal(str, &net) != NULL)
return net;
- return LNET_NIDNET(LNET_NID_ANY);
+ return LNET_NET_ANY;
}
lnet_nid_t
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,
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) {
rc = cfs_ip_ar_min_max(ar, &tmp_min_ip_addr,
&tmp_max_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