* \retval -errno otherwise
*/
static int
-parse_addrange(const struct cfs_lstr *src, struct nidrange *nidrange)
+parse_addrange(char *str, struct nidrange *nidrange)
{
struct addrrange *addrrange;
- if (src->ls_len == 1 && src->ls_str[0] == '*') {
+ if (strcmp(str, "*") == 0) {
nidrange->nr_all = 1;
return 0;
}
list_add_tail(&addrrange->ar_link, &nidrange->nr_addrranges);
INIT_LIST_HEAD(&addrrange->ar_numaddr_ranges);
- return nidrange->nr_netstrfns->nf_parse_addrlist(src->ls_str,
- src->ls_len,
+ return nidrange->nr_netstrfns->nf_parse_addrlist(str, strlen(str),
&addrrange->ar_numaddr_ranges);
}
* \retval NULL if \a src does not match any network
*/
static struct nidrange *
-add_nidrange(const struct cfs_lstr *src,
- struct list_head *nidlist)
+add_nidrange(char *str, struct list_head *nidlist)
{
struct netstrfns *nf;
struct nidrange *nr;
- int endlen;
- unsigned netnum;
+ char *end;
+ unsigned int netnum;
- if (src->ls_len >= LNET_NIDSTR_SIZE)
- return NULL;
-
- nf = libcfs_namenum2netstrfns(src->ls_str);
+ nf = libcfs_namenum2netstrfns(str);
if (nf == NULL)
return NULL;
- endlen = src->ls_len - strlen(nf->nf_name);
- if (endlen == 0)
+ end = str + strlen(nf->nf_name);
+ if (!*end) {
/* network name only, e.g. "elan" or "tcp" */
netnum = 0;
- else {
+ } else {
/* e.g. "elan25" or "tcp23", refuse to parse if
* network name is not appended with decimal or
- * hexadecimal number */
- if (!cfs_str2num_check(src->ls_str + strlen(nf->nf_name),
- endlen, &netnum, 0, MAX_NUMERIC_VALUE))
+ * hexadecimal number
+ */
+ if (kstrtouint(end, 0, &netnum) != 0)
return NULL;
}
/**
* Parses \<nidrange\> token of the syntax.
*
- * \retval 1 if \a src parses to \<addrrange\> '@' \<net\>
- * \retval 0 otherwise
+ * \retval 0 if \a src parses to \<addrrange\> '@' \<net\>
+ * \retval -EINVAL otherwise
*/
static int
-parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
+parse_nidrange(char *str, struct list_head *nidlist)
{
- struct cfs_lstr addrrange;
- struct cfs_lstr net;
+ char *addrrange;
+ char *net;
struct nidrange *nr;
- if (cfs_gettok(src, '@', &addrrange) == 0)
+ addrrange = strim(strsep(&str, "@"));
+ if (!str)
goto failed;
- if (cfs_gettok(src, '@', &net) == 0 || src->ls_str != NULL)
+ net = strim(str);
+ if (strchr(net, '@') != NULL || !*net)
goto failed;
- nr = add_nidrange(&net, nidlist);
+ nr = add_nidrange(net, nidlist);
if (nr == NULL)
goto failed;
- if (parse_addrange(&addrrange, nr) != 0)
+ if (parse_addrange(addrrange, nr) != 0)
goto failed;
- return 1;
-failed:
return 0;
+failed:
+ return -EINVAL;
}
/**
static void
free_addrranges(struct list_head *list)
{
- while (!list_empty(list)) {
- struct addrrange *ar;
-
- ar = list_entry(list->next, struct addrrange, ar_link);
+ struct addrrange *ar;
+ while ((ar = list_first_entry_or_null(list,
+ struct addrrange,
+ ar_link)) != NULL) {
cfs_expr_list_free_list(&ar->ar_numaddr_ranges);
list_del(&ar->ar_link);
CFS_FREE_PTR(ar);
* str.
* \see cfs_match_nid
*
- * \retval 1 on success
- * \retval 0 otherwise
+ * \retval 0 on success
+ * \retval -errno otherwise (-ENOMEM or -EINVAL)
*/
int
-cfs_parse_nidlist(char *str, int len, struct list_head *nidlist)
+cfs_parse_nidlist(char *orig, struct list_head *nidlist)
{
- struct cfs_lstr src;
- struct cfs_lstr res;
- int rc;
+ int rc = 0;
+ char *str;
+
+ orig = kstrdup(orig, GFP_KERNEL);
+ if (!orig)
+ return -ENOMEM;
- src.ls_str = str;
- src.ls_len = len;
INIT_LIST_HEAD(nidlist);
- while (src.ls_str) {
- rc = cfs_gettok(&src, ' ', &res);
- if (rc == 0) {
- cfs_free_nidlist(nidlist);
- return 0;
- }
- rc = parse_nidrange(&res, nidlist);
- if (rc == 0) {
- cfs_free_nidlist(nidlist);
- return 0;
- }
+ str = orig;
+ while (rc == 0 && str) {
+ char *tok = strsep(&str, " ");
+
+ if (*tok)
+ rc = parse_nidrange(tok, nidlist);
}
- return 1;
+ kfree(orig);
+ if (rc)
+ cfs_free_nidlist(nidlist);
+ else if (list_empty(nidlist))
+ rc = -EINVAL;
+ return rc;
}
EXPORT_SYMBOL(cfs_parse_nidlist);
* \retval 1 on match
* \retval 0 otherwises
*/
-int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
+int cfs_match_nid(struct lnet_nid *nid, struct list_head *nidlist)
{
struct nidrange *nr;
struct addrrange *ar;
+ if (!nid_is_nid4(nid))
+ return 0;
list_for_each_entry(nr, nidlist, nr_link) {
- if (nr->nr_netstrfns->nf_type != LNET_NETTYP(LNET_NIDNET(nid)))
+ if (nr->nr_netstrfns->nf_type != nid->nid_type)
continue;
- if (nr->nr_netnum != LNET_NETNUM(LNET_NIDNET(nid)))
+ if (nr->nr_netnum != be16_to_cpu(nid->nid_num))
continue;
if (nr->nr_all)
return 1;
list_for_each_entry(ar, &nr->nr_addrranges, ar_link)
- if (nr->nr_netstrfns->nf_match_addr(LNET_NIDADDR(nid),
- &ar->ar_numaddr_ranges))
+ if (nr->nr_netstrfns->nf_match_addr(
+ be32_to_cpu(nid->nid_addr[0]),
+ &ar->ar_numaddr_ranges))
return 1;
}
return 0;
/* Used by lnet/config.c so it can't be static */
int
-cfs_ip_addr_parse(char *str, int len, struct list_head *list)
+cfs_ip_addr_parse(char *str, int len_ignored, struct list_head *list)
{
struct cfs_expr_list *el;
- struct cfs_lstr src;
- int rc;
- int i;
-
- src.ls_str = str;
- src.ls_len = len;
- i = 0;
+ int rc = 0;
+ int i = 0;
- while (src.ls_str != NULL) {
- struct cfs_lstr res;
+ str = strim(str);
+ while (rc == 0 && str) {
+ char *res;
- if (!cfs_gettok(&src, '.', &res)) {
+ res = strsep(&str, ".");
+ res = strim(res);
+ if (!*res) {
rc = -EINVAL;
- goto out;
+ } else if ((rc = cfs_expr_list_parse(res, strlen(res),
+ 0, 255, &el)) == 0) {
+ list_add_tail(&el->el_link, list);
+ i++;
}
+ }
- rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el);
- if (rc != 0)
- goto out;
+ if (rc == 0 && i == 4)
+ return 0;
+ cfs_expr_list_free_list(list);
- list_add_tail(&el->el_link, list);
- i++;
- }
+ return rc ?: -EINVAL;
+}
+
+/**
+ * Print the range expression \a re into specified \a buffer.
+ * If \a bracketed is true, expression does not need additional
+ * brackets.
+ *
+ * \retval number of characters written
+ */
+static int
+cfs_range_expr_print(char *buffer, int count, struct cfs_range_expr *expr,
+ bool bracketed)
+{
+ int i;
+ char s[] = "[";
+ char e[] = "]";
+
+ if (bracketed)
+ s[0] = e[0] = '\0';
+
+ if (expr->re_lo == expr->re_hi)
+ i = scnprintf(buffer, count, "%u", expr->re_lo);
+ else if (expr->re_stride == 1)
+ i = scnprintf(buffer, count, "%s%u-%u%s",
+ s, expr->re_lo, expr->re_hi, e);
+ else
+ i = scnprintf(buffer, count, "%s%u-%u/%u%s",
+ s, expr->re_lo, expr->re_hi,
+ expr->re_stride, e);
+ return i;
+}
+
+/**
+ * Print a list of range expressions (\a expr_list) into specified \a buffer.
+ * If the list contains several expressions, separate them with comma
+ * and surround the list with brackets.
+ *
+ * \retval number of characters written
+ */
+static int
+cfs_expr_list_print(char *buffer, int count, struct cfs_expr_list *expr_list)
+{
+ struct cfs_range_expr *expr;
+ int i = 0, j = 0;
+ int numexprs = 0;
- if (i == 4)
+ if (count <= 0)
return 0;
- rc = -EINVAL;
-out:
- cfs_expr_list_free_list(list);
+ list_for_each_entry(expr, &expr_list->el_exprs, re_link)
+ numexprs++;
- return rc;
+ if (numexprs > 1)
+ i += scnprintf(buffer + i, count - i, "[");
+
+ list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
+ if (j++ != 0)
+ i += scnprintf(buffer + i, count - i, ",");
+ i += cfs_range_expr_print(buffer + i, count - i, expr,
+ numexprs > 1);
+ }
+
+ if (numexprs > 1)
+ i += scnprintf(buffer + i, count - i, "]");
+
+ return i;
}
static int
struct cfs_expr_list *el;
LASSERT(!list_empty(numaddr));
- el = list_entry(numaddr->next, struct cfs_expr_list, el_link);
+ el = list_first_entry(numaddr, struct cfs_expr_list, el_link);
return cfs_expr_list_match(addr, el);
}
.nf_print_addrlist = libcfs_num_addr_range_print,
.nf_match_addr = libcfs_num_match
},
+ {
+ .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
+ },
};
static const size_t libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
__u32 address;
struct netstrfns *nf;
- if (!addr || !net_num_list)
+ if (!addr || list_empty(addr) || !net_num_list)
return 0;
nf = type2net_info(LNET_NETTYP(LNET_NID_NET(nid)));
- if (!nf || !net_num_list || !addr)
+ if (!nf)
return 0;
/* FIXME handle long-addr nid */
char *
libcfs_nidstr_r(const struct lnet_nid *nid, char *buf, size_t buf_size)
{
- __u32 nnum = be16_to_cpu(nid->nid_num);
- __u32 lnd = nid->nid_type;
+ __u32 nnum;
+ __u32 lnd;
struct netstrfns *nf;
if (LNET_NID_IS_ANY(nid)) {
return buf;
}
+ nnum = be16_to_cpu(nid->nid_num);
+ lnd = nid->nid_type;
nf = libcfs_lnd2netstrfns(lnd);
if (nf) {
size_t addr_len;
EXPORT_SYMBOL(libcfs_idstr);
int
+libcfs_strid(struct lnet_processid *id, const char *str)
+{
+ char *tmp = strchr(str, '-');
+
+ id->pid = LNET_PID_LUSTRE;
+ if (tmp &&
+ strncmp("LNET_PID_ANY-", str, tmp - str) != 0) {
+ char pid[LNET_NIDSTR_SIZE];
+ int rc;
+
+ strscpy(pid, str, tmp - str);
+ rc = kstrtou32(pid, 10, &id->pid);
+ if (rc < 0)
+ return rc;
+ tmp++;
+ } else {
+ tmp = (char *)str;
+ }
+
+ return libcfs_strnid(&id->nid, tmp);
+}
+EXPORT_SYMBOL(libcfs_strid);
+
+int
libcfs_str2anynid(lnet_nid_t *nidp, const char *str)
{
if (!strcmp(str, "*")) {