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 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_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_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_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_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_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_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
}
};
* 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;
+
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;
}
int cfs_ip_addr_parse(char *str, int len, struct list_head *list);
int cfs_ip_addr_match(__u32 addr, struct list_head *list);
-bool cfs_nidrange_is_contiguous(struct list_head *nidlist);
-void cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid,
+int cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid,
char *max_nid, size_t nidstr_length);
struct netstrfns {
int (*nf_print_addrlist)(char *buffer, int count,
struct list_head *list);
int (*nf_match_addr)(__u32 addr, struct list_head *list);
- bool (*nf_is_contiguous)(struct list_head *nidlist);
- void (*nf_min_max)(struct list_head *nidlist, __u32 *min_nid,
+ int (*nf_min_max)(struct list_head *nidlist, __u32 *min_nid,
__u32 *max_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
+ * \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;
}
/**
* 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;
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;
-}
-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));
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 *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;
}
/**
* 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
.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",
.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_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",
.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_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_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},
};
&nidlist) <= 0)
return -EINVAL;
- if (!cfs_nidrange_is_contiguous(&nidlist))
- return -EINVAL;
+ rc = cfs_nidrange_find_min_max(&nidlist, nidstr[0], nidstr[1],
+ LNET_NIDSTR_SIZE);
+ if (rc < 0)
+ return rc;
- cfs_nidrange_find_min_max(&nidlist, nidstr[0], nidstr[1],
- LNET_NIDSTR_SIZE);
snprintf(nidrange_str, sizeof(nidrange_str), "%s:%s",
nidstr[0], nidstr[1]);
}
run_test 10b "delete range from the correct nodemap"
+test_10c() { #LU-8912
+ [ $(lustre_version_code mgs) -lt $(version_code 2.10.57) ] &&
+ skip "Need MGS >= 2.10.57" && return
+
+ local nm="nodemap_lu8912"
+ local nid_range="10.210.[32-47].[0-255]@o2ib3"
+ local start_nid="10.210.32.0@o2ib3"
+ local end_nid="10.210.47.255@o2ib3"
+ local start_nid_found
+ local end_nid_found
+
+ do_facet mgs $LCTL nodemap_del $nm 2>/dev/null
+ do_facet mgs $LCTL nodemap_add $nm || error "Add $nm failed"
+ do_facet mgs $LCTL nodemap_add_range --name $nm --range $nid_range ||
+ error "Add range $nid_range to $nm failed"
+
+ start_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+ awk -F '[,: ]' /start_nid/'{ print $9 }')
+ [ "$start_nid" == "$start_nid_found" ] ||
+ error "start_nid: $start_nid_found != $start_nid"
+ end_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+ awk -F '[,: ]' /end_nid/'{ print $13 }')
+ [ "$end_nid" == "$end_nid_found" ] ||
+ error "end_nid: $end_nid_found != $end_nid"
+
+ do_facet mgs $LCTL nodemap_del $nm || error "Delete $nm failed"
+ return 0
+}
+run_test 10c "verfify contiguous range support"
+
test_11() {
local rc
return -1;
}
- if (!cfs_nidrange_is_contiguous(&nidlist)) {
- fprintf(stderr, "error: %s: nodemap ranges must be "
- "contiguous\n", jt_cmdname(argv[0]));
- return -1;
+ rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+ LNET_NIDSTR_SIZE);
+ if (rc < 0) {
+ errno = -rc;
+ if (rc == -EINVAL)
+ fprintf(stderr, "error: %s: nid range uses "
+ "currently unsupported features\n",
+ jt_cmdname(argv[0]));
+ else if (rc == -ERANGE)
+ fprintf(stderr, "error: %s: nodemap ranges must be "
+ "contiguous\n", jt_cmdname(argv[0]));
+
+ return rc;
}
- cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
- LNET_NIDSTR_SIZE);
snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0],
return -1;
}
- if (!cfs_nidrange_is_contiguous(&nidlist)) {
- fprintf(stderr, "error: %s: nodemap ranges must be "
- "contiguous\n", jt_cmdname(argv[0]));
- return -1;
+ rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+ LNET_NIDSTR_SIZE);
+ if (rc < 0) {
+ errno = -rc;
+ if (rc == -EINVAL)
+ fprintf(stderr, "error: %s: nid range uses "
+ "currently unsupported features\n",
+ jt_cmdname(argv[0]));
+ else if (rc == -ERANGE)
+ fprintf(stderr, "error: %s: nodemap ranges must be "
+ "contiguous\n", jt_cmdname(argv[0]));
+
+ return rc;
}
- cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
- LNET_NIDSTR_SIZE);
snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0],
git://git.whamcloud.com / fs / lustre-release.git / commitdiff