return 0;
}
- LIBCFS_ALLOC(addrrange, sizeof(struct addrrange));
+ CFS_ALLOC_PTR(addrrange);
if (addrrange == NULL)
return -ENOMEM;
list_add_tail(&addrrange->ar_link, &nidrange->nr_addrranges);
return nr;
}
- LIBCFS_ALLOC(nr, sizeof(struct nidrange));
+ CFS_ALLOC_PTR(nr);
if (nr == NULL)
return NULL;
list_add_tail(&nr->nr_link, nidlist);
cfs_expr_list_free_list(&ar->ar_numaddr_ranges);
list_del(&ar->ar_link);
- LIBCFS_FREE(ar, sizeof(struct addrrange));
+ CFS_FREE_PTR(ar);
}
}
nr = list_entry(pos, struct nidrange, nr_link);
free_addrranges(&nr->nr_addrranges);
list_del(pos);
- LIBCFS_FREE(nr, sizeof(struct nidrange));
+ CFS_FREE_PTR(nr);
}
}
EXPORT_SYMBOL(cfs_free_nidlist);
}
EXPORT_SYMBOL(cfs_print_nidlist);
-/**
- * Determines minimum and maximum addresses for a single
- * numeric address range
- *
- * \param ar
- * \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 int cfs_ip_ar_min_max(struct addrrange *ar, __u32 *min_nid,
- __u32 *max_nid)
-{
- 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;
-
- re_count++;
- }
-
- cur_octet++;
- }
-
- if (min_nid != NULL)
- *min_nid = ((min_ip[0] << 24) | (min_ip[1] << 16) |
- (min_ip[2] << 8) | min_ip[3]);
-
- if (max_nid != NULL)
- *max_nid = ((max_ip[0] << 24) | (max_ip[1] << 16) |
- (max_ip[2] << 8) | max_ip[3]);
-
- return 0;
-}
-
-/**
- * Determines minimum and maximum addresses for a single
- * numeric address range
- *
- * \param ar
- * \param[out] *min_nid __u32 representation of min NID
- * \param[out] *max_nid __u32 representation of max NID
- * \retval -EINVAL unsupported LNET range
- */
-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;
-
- 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++;
- }
- }
-
- if (min_nid != NULL)
- *min_nid = min_addr;
- if (max_nid != NULL)
- *max_nid = max_addr;
-
- return 0;
-}
-
-/**
- * Takes a linked list of nidrange expressions, determines the minimum
- * and maximum nid and creates appropriate nid structures
- *
- * \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
- */
-int cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid,
- char *max_nid, size_t nidstr_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;
-
- 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_addr2str(min_addr, min_addr_str, sizeof(min_addr_str));
- nf->nf_addr2str(max_addr, max_addr_str, sizeof(max_addr_str));
-
- snprintf(min_nid, nidstr_length, "%s@%s%d", min_addr_str, lndname,
- netnum);
- snprintf(max_nid, nidstr_length, "%s@%s%d", max_addr_str, lndname,
- netnum);
-
- return 0;
-}
-EXPORT_SYMBOL(cfs_nidrange_find_min_max);
-
-/**
- * Determines the min and max NID values for num LNDs
- *
- * \param *nidlist
- * \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 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;
- 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) {
- 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;
- }
- }
- if (max_nid != NULL)
- *max_nid = max_addr;
- if (min_nid != NULL)
- *min_nid = min_addr;
-
- return 0;
-}
-
-/**
- * Takes an nidlist and determines the minimum and maximum
- * ip addresses.
- *
- * \param *nidlist
- * \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 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;
- 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) {
- 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 (max_nid != NULL)
- *max_nid = max_ip_addr;
- if (min_nid != NULL)
- *min_nid = min_ip_addr;
-
- return 0;
-}
-
static int
libcfs_lo_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;
.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_match_addr = libcfs_num_match
+ },
{ .nf_type = SOCKLND,
.nf_name = "tcp",
.nf_modname = "ksocklnd",
.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_match_addr = cfs_ip_addr_match
+ },
{ .nf_type = O2IBLND,
.nf_name = "o2ib",
.nf_modname = "ko2iblnd",
.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_match_addr = cfs_ip_addr_match
+ },
{ .nf_type = GNILND,
.nf_name = "gni",
.nf_modname = "kgnilnd",
.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_match_addr = libcfs_num_match
+ },
{ .nf_type = GNIIPLND,
.nf_name = "gip",
.nf_modname = "kgnilnd",
.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_match_addr = cfs_ip_addr_match
+ },
{ .nf_type = PTL4LND,
.nf_name = "ptlf",
.nf_modname = "kptl4lnd",
.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_match_addr = libcfs_num_match
+ },
};
static const size_t libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
static struct netstrfns *
+type2net_info(__u32 net_type)
+{
+ int i;
+
+ for (i = 0; i < libcfs_nnetstrfns; i++) {
+ if (libcfs_netstrfns[i].nf_type == net_type)
+ return &libcfs_netstrfns[i];
+ }
+
+ return NULL;
+}
+
+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;
+}
+
+int
+cfs_match_nid_net(lnet_nid_t nid, __u32 net_type,
+ struct list_head *net_num_list,
+ struct list_head *addr)
+{
+ __u32 address;
+ struct netstrfns *nf;
+
+ if (!addr || !net_num_list)
+ return 0;
+
+ nf = type2net_info(LNET_NETTYP(LNET_NIDNET(nid)));
+ if (!nf || !net_num_list || !addr)
+ return 0;
+
+ address = LNET_NIDADDR(nid);
+
+ /* if either the address or net number don't match then no match */
+ if (!nf->nf_match_addr(address, addr) ||
+ !cfs_match_net(LNET_NIDNET(nid), net_type, net_num_list))
+ return 0;
+
+ return 1;
+}
+EXPORT_SYMBOL(cfs_match_nid_net);
+
+static struct netstrfns *
libcfs_lnd2netstrfns(__u32 lnd)
{
int i;
if (libcfs_str2net_internal(str, &net) != NULL)
return net;
- return LNET_NIDNET(LNET_NID_ANY);
+ return LNET_NET_ANY;
}
EXPORT_SYMBOL(libcfs_str2net);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff