Commit e8834329 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: Avoid nid range related forward declarations in nidstring.c

Since forward declarations are frowned on upstream we move
the NID range handling to near the start of the nidstring.c
file.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/15086
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1af01da
...@@ -63,6 +63,8 @@ static int libcfs_nidstring_idx; ...@@ -63,6 +63,8 @@ static int libcfs_nidstring_idx;
static DEFINE_SPINLOCK(libcfs_nidstring_lock); static DEFINE_SPINLOCK(libcfs_nidstring_lock);
static struct netstrfns *libcfs_namenum2netstrfns(const char *name);
char * char *
libcfs_next_nidstring(void) libcfs_next_nidstring(void)
{ {
...@@ -80,925 +82,931 @@ libcfs_next_nidstring(void) ...@@ -80,925 +82,931 @@ libcfs_next_nidstring(void)
} }
EXPORT_SYMBOL(libcfs_next_nidstring); EXPORT_SYMBOL(libcfs_next_nidstring);
static int libcfs_lo_str2addr(const char *str, int nob, __u32 *addr) /**
{ * Nid range list syntax.
*addr = 0; * \verbatim
return 1; *
} * <nidlist> :== <nidrange> [ ' ' <nidrange> ]
* <nidrange> :== <addrrange> '@' <net>
* <addrrange> :== '*' |
* <ipaddr_range> |
* <cfs_expr_list>
* <ipaddr_range> :== <cfs_expr_list>.<cfs_expr_list>.<cfs_expr_list>.
* <cfs_expr_list>
* <cfs_expr_list> :== <number> |
* <expr_list>
* <expr_list> :== '[' <range_expr> [ ',' <range_expr>] ']'
* <range_expr> :== <number> |
* <number> '-' <number> |
* <number> '-' <number> '/' <number>
* <net> :== <netname> | <netname><number>
* <netname> :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" |
* "vib" | "ra" | "elan" | "mx" | "ptl"
* \endverbatim
*/
static void libcfs_ip_addr2str(__u32 addr, char *str) /**
{ * Structure to represent \<nidrange\> token of the syntax.
snprintf(str, LNET_NIDSTR_SIZE, "%u.%u.%u.%u", *
(addr >> 24) & 0xff, (addr >> 16) & 0xff, * One of this is created for each \<net\> parsed.
(addr >> 8) & 0xff, addr & 0xff); */
} struct nidrange {
/**
* Link to list of this structures which is built on nid range
* list parsing.
*/
struct list_head nr_link;
/**
* List head for addrrange::ar_link.
*/
struct list_head nr_addrranges;
/**
* Flag indicating that *@<net> is found.
*/
int nr_all;
/**
* Pointer to corresponding element of libcfs_netstrfns.
*/
struct netstrfns *nr_netstrfns;
/**
* Number of network. E.g. 5 if \<net\> is "elan5".
*/
int nr_netnum;
};
/**
* Structure to represent \<addrrange\> token of the syntax.
*/
struct addrrange {
/**
* Link to nidrange::nr_addrranges.
*/
struct list_head ar_link;
/**
* List head for cfs_expr_list::el_list.
*/
struct list_head ar_numaddr_ranges;
};
static int libcfs_ip_str2addr(const char *str, int nob, __u32 *addr) /**
* Parses \<addrrange\> token on the syntax.
*
* Allocates struct addrrange and links to \a nidrange via
* (nidrange::nr_addrranges)
*
* \retval 0 if \a src parses to '*' | \<ipaddr_range\> | \<cfs_expr_list\>
* \retval -errno otherwise
*/
static int
parse_addrange(const struct cfs_lstr *src, struct nidrange *nidrange)
{ {
unsigned int a; struct addrrange *addrrange;
unsigned int b;
unsigned int c;
unsigned int d;
int n = nob; /* XscanfX */
/* numeric IP? */ if (src->ls_len == 1 && src->ls_str[0] == '*') {
if (sscanf(str, "%u.%u.%u.%u%n", &a, &b, &c, &d, &n) >= 4 && nidrange->nr_all = 1;
n == nob && return 0;
(a & ~0xff) == 0 && (b & ~0xff) == 0 &&
(c & ~0xff) == 0 && (d & ~0xff) == 0) {
*addr = ((a<<24)|(b<<16)|(c<<8)|d);
return 1;
} }
return 0; LIBCFS_ALLOC(addrrange, sizeof(struct addrrange));
if (addrrange == NULL)
return -ENOMEM;
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,
&addrrange->ar_numaddr_ranges);
} }
int /**
cfs_ip_addr_parse(char *str, int len, struct list_head *list) * Finds or creates struct nidrange.
*
* Checks if \a src is a valid network name, looks for corresponding
* nidrange on the ist of nidranges (\a nidlist), creates new struct
* nidrange if it is not found.
*
* \retval pointer to struct nidrange matching network specified via \a src
* \retval NULL if \a src does not match any network
*/
static struct nidrange *
add_nidrange(const struct cfs_lstr *src,
struct list_head *nidlist)
{ {
struct cfs_expr_list *el; struct netstrfns *nf;
struct cfs_lstr src; struct nidrange *nr;
int rc; int endlen;
int i; unsigned netnum;
src.ls_str = str;
src.ls_len = len;
i = 0;
while (src.ls_str != NULL) { if (src->ls_len >= LNET_NIDSTR_SIZE)
struct cfs_lstr res; return NULL;
if (!cfs_gettok(&src, '.', &res)) { nf = libcfs_namenum2netstrfns(src->ls_str);
rc = -EINVAL; if (nf == NULL)
goto out; return NULL;
endlen = src->ls_len - strlen(nf->nf_name);
if (endlen == 0)
/* network name only, e.g. "elan" or "tcp" */
netnum = 0;
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))
return NULL;
} }
rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el); list_for_each_entry(nr, nidlist, nr_link) {
if (rc != 0) if (nr->nr_netstrfns != nf)
goto out; continue;
if (nr->nr_netnum != netnum)
list_add_tail(&el->el_link, list); continue;
i++; return nr;
} }
if (i == 4) LIBCFS_ALLOC(nr, sizeof(struct nidrange));
return 0; if (nr == NULL)
return NULL;
rc = -EINVAL; list_add_tail(&nr->nr_link, nidlist);
out: INIT_LIST_HEAD(&nr->nr_addrranges);
cfs_expr_list_free_list(list); nr->nr_netstrfns = nf;
nr->nr_all = 0;
return rc; nr->nr_netnum = netnum;
}
static int
libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
{
int i = 0, j = 0;
struct cfs_expr_list *el;
list_for_each_entry(el, list, el_link) { return nr;
LASSERT(j++ < 4);
if (i != 0)
i += scnprintf(buffer + i, count - i, ".");
i += cfs_expr_list_print(buffer + i, count - i, el);
}
return i;
} }
/** /**
* Matches address (\a addr) against address set encoded in \a list. * Parses \<nidrange\> token of the syntax.
* *
* \retval 1 if \a addr matches * \retval 1 if \a src parses to \<addrrange\> '@' \<net\>
* \retval 0 otherwise * \retval 0 otherwise
*/ */
int static int
cfs_ip_addr_match(__u32 addr, struct list_head *list) parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
{
struct cfs_expr_list *el;
int i = 0;
list_for_each_entry_reverse(el, list, el_link) {
if (!cfs_expr_list_match(addr & 0xff, el))
return 0;
addr >>= 8;
i++;
}
return i == 4;
}
static void libcfs_decnum_addr2str(__u32 addr, char *str)
{ {
snprintf(str, LNET_NIDSTR_SIZE, "%u", addr); struct cfs_lstr addrrange;
} struct cfs_lstr net;
struct cfs_lstr tmp;
struct nidrange *nr;
static void libcfs_hexnum_addr2str(__u32 addr, char *str) tmp = *src;
{ if (cfs_gettok(src, '@', &addrrange) == 0)
snprintf(str, LNET_NIDSTR_SIZE, "0x%x", addr); goto failed;
}
static int libcfs_num_str2addr(const char *str, int nob, __u32 *addr) if (cfs_gettok(src, '@', &net) == 0 || src->ls_str != NULL)
{ goto failed;
int n;
n = nob; nr = add_nidrange(&net, nidlist);
if (sscanf(str, "0x%x%n", addr, &n) >= 1 && n == nob) if (nr == NULL)
return 1; goto failed;
n = nob; if (parse_addrange(&addrrange, nr) != 0)
if (sscanf(str, "0X%x%n", addr, &n) >= 1 && n == nob) goto failed;
return 1;
n = nob;
if (sscanf(str, "%u%n", addr, &n) >= 1 && n == nob)
return 1; return 1;
failed:
CWARN("can't parse nidrange: \"%.*s\"\n", tmp.ls_len, tmp.ls_str);
return 0; return 0;
} }
/** /**
* Nf_parse_addrlist method for networks using numeric addresses. * Frees addrrange structures of \a list.
* *
* Examples of such networks are gm and elan. * For each struct addrrange structure found on \a list it frees
* cfs_expr_list list attached to it and frees the addrrange itself.
* *
* \retval 0 if \a str parsed to numeric address * \retval none
* \retval errno otherwise
*/ */
static int static void
libcfs_num_parse(char *str, int len, struct list_head *list) free_addrranges(struct list_head *list)
{ {
struct cfs_expr_list *el; while (!list_empty(list)) {
int rc; struct addrrange *ar;
rc = cfs_expr_list_parse(str, len, 0, MAX_NUMERIC_VALUE, &el); ar = list_entry(list->next, struct addrrange, ar_link);
if (rc == 0)
list_add_tail(&el->el_link, list);
return rc; cfs_expr_list_free_list(&ar->ar_numaddr_ranges);
list_del(&ar->ar_link);
LIBCFS_FREE(ar, sizeof(struct addrrange));
}
} }
static int /**
libcfs_num_addr_range_print(char *buffer, int count, struct list_head *list) * Frees nidrange strutures of \a list.
*
* For each struct nidrange structure found on \a list it frees
* addrrange list attached to it and frees the nidrange itself.
*
* \retval none
*/
void
cfs_free_nidlist(struct list_head *list)
{ {
int i = 0, j = 0; struct list_head *pos, *next;
struct cfs_expr_list *el; struct nidrange *nr;
list_for_each_entry(el, list, el_link) { list_for_each_safe(pos, next, list) {
LASSERT(j++ < 1); nr = list_entry(pos, struct nidrange, nr_link);
i += cfs_expr_list_print(buffer + i, count - i, el); free_addrranges(&nr->nr_addrranges);
list_del(pos);
LIBCFS_FREE(nr, sizeof(struct nidrange));
} }
return i;
} }
EXPORT_SYMBOL(cfs_free_nidlist);
/* /**
* Nf_match_addr method for networks using numeric addresses * Parses nid range list.
* *
* \retval 1 on match * Parses with rigorous syntax and overflow checking \a str into
* \<nidrange\> [ ' ' \<nidrange\> ], compiles \a str into set of
* structures and links that structure to \a nidlist. The resulting
* list can be used to match a NID againts set of NIDS defined by \a
* str.
* \see cfs_match_nid
*
* \retval 1 on success
* \retval 0 otherwise * \retval 0 otherwise
*/ */
static int int
libcfs_num_match(__u32 addr, struct list_head *numaddr) cfs_parse_nidlist(char *str, int len, struct list_head *nidlist)
{ {
struct cfs_expr_list *el; struct cfs_lstr src;
struct cfs_lstr res;
LASSERT(!list_empty(numaddr)); int rc;
el = list_entry(numaddr->next, struct cfs_expr_list, el_link);
return cfs_expr_list_match(addr, el); 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;
}
}
return 1;
} }
EXPORT_SYMBOL(cfs_parse_nidlist);
static struct netstrfns libcfs_netstrfns[] = { /**
{/* .nf_type */ LOLND, * Matches a nid (\a nid) against the compiled list of nidranges (\a nidlist).
/* .nf_name */ "lo", *
/* .nf_modname */ "klolnd", * \see cfs_parse_nidlist()
/* .nf_addr2str */ libcfs_decnum_addr2str, *
/* .nf_str2addr */ libcfs_lo_str2addr, * \retval 1 on match
/* .nf_parse_addr*/ libcfs_num_parse, * \retval 0 otherwises
/* .nf_print_addrlist*/ libcfs_num_addr_range_print, */
/* .nf_match_addr*/ libcfs_num_match}, int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
{/* .nf_type */ SOCKLND, {
/* .nf_name */ "tcp", struct nidrange *nr;
/* .nf_modname */ "ksocklnd", struct addrrange *ar;
/* .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_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_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_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_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_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_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_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_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_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_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_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},
/* placeholder for net0 alias. It MUST BE THE LAST ENTRY */
{/* .nf_type */ -1},
};
static const int libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
/* CAVEAT EMPTOR XscanfX list_for_each_entry(nr, nidlist, nr_link) {
* I use "%n" at the end of a sscanf format to detect trailing junk. However if (nr->nr_netstrfns->nf_type != LNET_NETTYP(LNET_NIDNET(nid)))
* sscanf may return immediately if it sees the terminating '0' in a string, so continue;
* I initialise the %n variable to the expected length. If sscanf sets it; if (nr->nr_netnum != LNET_NETNUM(LNET_NIDNET(nid)))
* fine, if it doesn't, then the scan ended at the end of the string, which is continue;
* fine too :) */ 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))
return 1;
}
return 0;
}
EXPORT_SYMBOL(cfs_match_nid);
static struct netstrfns * /**
libcfs_lnd2netstrfns(int lnd) * Print the network part of the nidrange \a nr into the specified \a buffer.
*
* \retval number of characters written
*/
static int
cfs_print_network(char *buffer, int count, struct nidrange *nr)
{ {
int i; struct netstrfns *nf = nr->nr_netstrfns;
if (lnd >= 0)
for (i = 0; i < libcfs_nnetstrfns; i++)
if (lnd == libcfs_netstrfns[i].nf_type)
return &libcfs_netstrfns[i];
return NULL; if (nr->nr_netnum == 0)
return scnprintf(buffer, count, "@%s", nf->nf_name);
else
return scnprintf(buffer, count, "@%s%u",
nf->nf_name, nr->nr_netnum);
} }
static struct netstrfns * /**
libcfs_namenum2netstrfns(const char *name) * Print a list of addrrange (\a addrranges) into the specified \a buffer.
* At max \a count characters can be printed into \a buffer.
*
* \retval number of characters written
*/
static int
cfs_print_addrranges(char *buffer, int count, struct list_head *addrranges,
struct nidrange *nr)
{ {
struct netstrfns *nf; int i = 0;
int i; struct addrrange *ar;
struct netstrfns *nf = nr->nr_netstrfns;
for (i = 0; i < libcfs_nnetstrfns; i++) { list_for_each_entry(ar, addrranges, ar_link) {
nf = &libcfs_netstrfns[i]; if (i != 0)
if (nf->nf_type >= 0 && i += scnprintf(buffer + i, count - i, " ");
!strncmp(name, nf->nf_name, strlen(nf->nf_name))) i += nf->nf_print_addrlist(buffer + i, count - i,
return nf; &ar->ar_numaddr_ranges);
i += cfs_print_network(buffer + i, count - i, nr);
} }
return NULL; return i;
} }
static struct netstrfns * /**
libcfs_name2netstrfns(const char *name) * Print a list of nidranges (\a nidlist) into the specified \a buffer.
* At max \a count characters can be printed into \a buffer.
* Nidranges are separated by a space character.
*
* \retval number of characters written
*/
int cfs_print_nidlist(char *buffer, int count, struct list_head *nidlist)
{ {
int i; int i = 0;
struct nidrange *nr;
for (i = 0; i < libcfs_nnetstrfns; i++) if (count <= 0)
if (libcfs_netstrfns[i].nf_type >= 0 && return 0;
!strcmp(libcfs_netstrfns[i].nf_name, name))
return &libcfs_netstrfns[i];
return NULL; list_for_each_entry(nr, nidlist, nr_link) {
if (i != 0)
i += scnprintf(buffer + i, count - i, " ");
if (nr->nr_all != 0) {
LASSERT(list_empty(&nr->nr_addrranges));
i += scnprintf(buffer + i, count - i, "*");
i += cfs_print_network(buffer + i, count - i, nr);
} else {
i += cfs_print_addrranges(buffer + i, count - i,
&nr->nr_addrranges, nr);
}
}
return i;
} }
EXPORT_SYMBOL(cfs_print_nidlist);
int static int
libcfs_isknown_lnd(int type) libcfs_lo_str2addr(const char *str, int nob, __u32 *addr)
{ {
return libcfs_lnd2netstrfns(type) != NULL; *addr = 0;
return 1;
} }
EXPORT_SYMBOL(libcfs_isknown_lnd);
char * static void
libcfs_lnd2modname(int lnd) libcfs_ip_addr2str(__u32 addr, char *str)
{ {
struct netstrfns *nf = libcfs_lnd2netstrfns(lnd); snprintf(str, LNET_NIDSTR_SIZE, "%u.%u.%u.%u",
(addr >> 24) & 0xff, (addr >> 16) & 0xff,
return (nf == NULL) ? NULL : nf->nf_modname; (addr >> 8) & 0xff, addr & 0xff);
} }
EXPORT_SYMBOL(libcfs_lnd2modname);
char * /* CAVEAT EMPTOR XscanfX
libcfs_lnd2str(int lnd) * I use "%n" at the end of a sscanf format to detect trailing junk. However
* sscanf may return immediately if it sees the terminating '0' in a string, so
* I initialise the %n variable to the expected length. If sscanf sets it;
* fine, if it doesn't, then the scan ended at the end of the string, which is
* fine too :) */
static int
libcfs_ip_str2addr(const char *str, int nob, __u32 *addr)
{ {
char *str; unsigned int a;
struct netstrfns *nf = libcfs_lnd2netstrfns(lnd); unsigned int b;
unsigned int c;
unsigned int d;
int n = nob; /* XscanfX */
if (nf != NULL) /* numeric IP? */
return nf->nf_name; if (sscanf(str, "%u.%u.%u.%u%n", &a, &b, &c, &d, &n) >= 4 &&
n == nob &&
(a & ~0xff) == 0 && (b & ~0xff) == 0 &&
(c & ~0xff) == 0 && (d & ~0xff) == 0) {
*addr = ((a<<24)|(b<<16)|(c<<8)|d);
return 1;
}
str = libcfs_next_nidstring(); return 0;
snprintf(str, LNET_NIDSTR_SIZE, "?%d?", lnd);
return str;
} }
EXPORT_SYMBOL(libcfs_lnd2str);
/* Used by lnet/config.c so it can't be static */
int int
libcfs_str2lnd(const char *str) cfs_ip_addr_parse(char *str, int len, struct list_head *list)
{ {
struct netstrfns *nf = libcfs_name2netstrfns(str); struct cfs_expr_list *el;
struct cfs_lstr src;
if (nf != NULL) int rc;
return nf->nf_type; int i;
return -1;
}
EXPORT_SYMBOL(libcfs_str2lnd);
char * src.ls_str = str;
libcfs_net2str(__u32 net) src.ls_len = len;
{ i = 0;
int lnd = LNET_NETTYP(net);
int num = LNET_NETNUM(net);
struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
char *str = libcfs_next_nidstring();
if (nf == NULL) while (src.ls_str != NULL) {
snprintf(str, LNET_NIDSTR_SIZE, "<%d:%d>", lnd, num); struct cfs_lstr res;
else if (num == 0)
snprintf(str, LNET_NIDSTR_SIZE, "%s", nf->nf_name);
else
snprintf(str, LNET_NIDSTR_SIZE, "%s%d", nf->nf_name, num);
return str; if (!cfs_gettok(&src, '.', &res)) {
} rc = -EINVAL;
EXPORT_SYMBOL(libcfs_net2str); goto out;
}
char * rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el);
libcfs_nid2str(lnet_nid_t nid) if (rc != 0)
{ goto out;
__u32 addr = LNET_NIDADDR(nid);
__u32 net = LNET_NIDNET(nid);
int lnd = LNET_NETTYP(net);
int nnum = LNET_NETNUM(net);
struct netstrfns *nf;
char *str;
int nob;
if (nid == LNET_NID_ANY) list_add_tail(&el->el_link, list);
return "<?>"; i++;
}
nf = libcfs_lnd2netstrfns(lnd); if (i == 4)
str = libcfs_next_nidstring(); return 0;
if (nf == NULL) rc = -EINVAL;
snprintf(str, LNET_NIDSTR_SIZE, "%x@<%d:%d>", addr, lnd, nnum); out:
else { cfs_expr_list_free_list(list);
nf->nf_addr2str(addr, str);
nob = strlen(str);
if (nnum == 0)
snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s",
nf->nf_name);
else
snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s%d",
nf->nf_name, nnum);
}
return str; return rc;
} }
EXPORT_SYMBOL(libcfs_nid2str);
static struct netstrfns * static int
libcfs_str2net_internal(const char *str, __u32 *net) libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
{ {
struct netstrfns *uninitialized_var(nf); int i = 0, j = 0;
int nob; struct cfs_expr_list *el;
unsigned int netnum;
int i;
for (i = 0; i < libcfs_nnetstrfns; i++) { list_for_each_entry(el, list, el_link) {
nf = &libcfs_netstrfns[i]; LASSERT(j++ < 4);
if (nf->nf_type >= 0 && if (i != 0)
!strncmp(str, nf->nf_name, strlen(nf->nf_name))) i += scnprintf(buffer + i, count - i, ".");
break; i += cfs_expr_list_print(buffer + i, count - i, el);
} }
return i;
}
if (i == libcfs_nnetstrfns) /**
return NULL; * Matches address (\a addr) against address set encoded in \a list.
*
nob = strlen(nf->nf_name); * \retval 1 if \a addr matches
* \retval 0 otherwise
if (strlen(str) == (unsigned int)nob) { */
netnum = 0; int
} else { cfs_ip_addr_match(__u32 addr, struct list_head *list)
if (nf->nf_type == LOLND) /* net number not allowed */ {
return NULL; struct cfs_expr_list *el;
int i = 0;
str += nob; list_for_each_entry_reverse(el, list, el_link) {
i = strlen(str); if (!cfs_expr_list_match(addr & 0xff, el))
if (sscanf(str, "%u%n", &netnum, &i) < 1 || return 0;
i != (int)strlen(str)) addr >>= 8;
return NULL; i++;
} }
*net = LNET_MKNET(nf->nf_type, netnum); return i == 4;
return nf;
} }
__u32 static void
libcfs_str2net(const char *str) libcfs_decnum_addr2str(__u32 addr, char *str)
{ {
__u32 net; snprintf(str, LNET_NIDSTR_SIZE, "%u", addr);
}
if (libcfs_str2net_internal(str, &net) != NULL)
return net;
return LNET_NIDNET(LNET_NID_ANY); static void
libcfs_hexnum_addr2str(__u32 addr, char *str)
{
snprintf(str, LNET_NIDSTR_SIZE, "0x%x", addr);
} }
EXPORT_SYMBOL(libcfs_str2net);
lnet_nid_t static int
libcfs_str2nid(const char *str) libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
{ {
const char *sep = strchr(str, '@'); int n;
struct netstrfns *nf;
__u32 net;
__u32 addr;
if (sep != NULL) { n = nob;
nf = libcfs_str2net_internal(sep + 1, &net); if (sscanf(str, "0x%x%n", addr, &n) >= 1 && n == nob)
if (nf == NULL) return 1;
return LNET_NID_ANY;
} else {
sep = str + strlen(str);
net = LNET_MKNET(SOCKLND, 0);
nf = libcfs_lnd2netstrfns(SOCKLND);
LASSERT(nf != NULL);
}
if (!nf->nf_str2addr(str, (int)(sep - str), &addr)) n = nob;
return LNET_NID_ANY; if (sscanf(str, "0X%x%n", addr, &n) >= 1 && n == nob)
return 1;
return LNET_MKNID(net, addr); n = nob;
if (sscanf(str, "%u%n", addr, &n) >= 1 && n == nob)
return 1;
return 0;
} }
EXPORT_SYMBOL(libcfs_str2nid);
char * /**
libcfs_id2str(lnet_process_id_t id) * Nf_parse_addrlist method for networks using numeric addresses.
*
* Examples of such networks are gm and elan.
*
* \retval 0 if \a str parsed to numeric address
* \retval errno otherwise
*/
static int
libcfs_num_parse(char *str, int len, struct list_head *list)
{ {
char *str = libcfs_next_nidstring(); struct cfs_expr_list *el;
int rc;
if (id.pid == LNET_PID_ANY) { rc = cfs_expr_list_parse(str, len, 0, MAX_NUMERIC_VALUE, &el);
snprintf(str, LNET_NIDSTR_SIZE, if (rc == 0)
"LNET_PID_ANY-%s", libcfs_nid2str(id.nid)); list_add_tail(&el->el_link, list);
return str;
}
snprintf(str, LNET_NIDSTR_SIZE, "%s%u-%s", return rc;
((id.pid & LNET_PID_USERFLAG) != 0) ? "U" : "",
(id.pid & ~LNET_PID_USERFLAG), libcfs_nid2str(id.nid));
return str;
} }
EXPORT_SYMBOL(libcfs_id2str);
int static int
libcfs_str2anynid(lnet_nid_t *nidp, const char *str) libcfs_num_addr_range_print(char *buffer, int count, struct list_head *list)
{ {
if (!strcmp(str, "*")) { int i = 0, j = 0;
*nidp = LNET_NID_ANY; struct cfs_expr_list *el;
return 1;
}
*nidp = libcfs_str2nid(str); list_for_each_entry(el, list, el_link) {
return *nidp != LNET_NID_ANY; LASSERT(j++ < 1);
i += cfs_expr_list_print(buffer + i, count - i, el);
}
return i;
} }
EXPORT_SYMBOL(libcfs_str2anynid);
/** /*
* Nid range list syntax. * Nf_match_addr method for networks using numeric addresses
* \verbatim
* *
* <nidlist> :== <nidrange> [ ' ' <nidrange> ] * \retval 1 on match
* <nidrange> :== <addrrange> '@' <net> * \retval 0 otherwise
* <addrrange> :== '*' |
* <ipaddr_range> |
* <cfs_expr_list>
* <ipaddr_range> :== <cfs_expr_list>.<cfs_expr_list>.<cfs_expr_list>.
* <cfs_expr_list>
* <cfs_expr_list> :== <number> |
* <expr_list>
* <expr_list> :== '[' <range_expr> [ ',' <range_expr>] ']'
* <range_expr> :== <number> |
* <number> '-' <number> |
* <number> '-' <number> '/' <number>
* <net> :== <netname> | <netname><number>
* <netname> :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" |
* "vib" | "ra" | "elan" | "mx" | "ptl"
* \endverbatim
*/ */
static int
libcfs_num_match(__u32 addr, struct list_head *numaddr)
{
struct cfs_expr_list *el;
/** LASSERT(!list_empty(numaddr));
* Structure to represent \<nidrange\> token of the syntax. el = list_entry(numaddr->next, struct cfs_expr_list, el_link);
*
* One of this is created for each \<net\> parsed. return cfs_expr_list_match(addr, el);
*/ }
struct nidrange {
/** static struct netstrfns libcfs_netstrfns[] = {
* Link to list of this structures which is built on nid range {/* .nf_type */ LOLND,
* list parsing. /* .nf_name */ "lo",
*/ /* .nf_modname */ "klolnd",
struct list_head nr_link; /* .nf_addr2str */ libcfs_decnum_addr2str,
/** /* .nf_str2addr */ libcfs_lo_str2addr,
* List head for addrrange::ar_link. /* .nf_parse_addr*/ libcfs_num_parse,
*/ /* .nf_print_addrlist*/ libcfs_num_addr_range_print,
struct list_head nr_addrranges; /* .nf_match_addr*/ libcfs_num_match},
/** {/* .nf_type */ SOCKLND,
* Flag indicating that *@<net> is found. /* .nf_name */ "tcp",
*/ /* .nf_modname */ "ksocklnd",
int nr_all; /* .nf_addr2str */ libcfs_ip_addr2str,
/** /* .nf_str2addr */ libcfs_ip_str2addr,
* Pointer to corresponding element of libcfs_netstrfns. /* .nf_parse_addrlist*/ cfs_ip_addr_parse,
*/ /* .nf_print_addrlist*/ libcfs_ip_addr_range_print,
struct netstrfns *nr_netstrfns; /* .nf_match_addr*/ cfs_ip_addr_match},
/** {/* .nf_type */ O2IBLND,
* Number of network. E.g. 5 if \<net\> is "elan5". /* .nf_name */ "o2ib",
*/ /* .nf_modname */ "ko2iblnd",
int nr_netnum; /* .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_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_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_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_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_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_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_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_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_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_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},
/* placeholder for net0 alias. It MUST BE THE LAST ENTRY */
{/* .nf_type */ -1},
}; };
/** static const int libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
* Structure to represent \<addrrange\> token of the syntax.
*/
struct addrrange {
/**
* Link to nidrange::nr_addrranges.
*/
struct list_head ar_link;
/**
* List head for cfs_expr_list::el_list.
*/
struct list_head ar_numaddr_ranges;
};
/** static struct netstrfns *
* Parses \<addrrange\> token on the syntax. libcfs_lnd2netstrfns(int lnd)
*
* Allocates struct addrrange and links to \a nidrange via
* (nidrange::nr_addrranges)
*
* \retval 0 if \a src parses to '*' | \<ipaddr_range\> | \<cfs_expr_list\>
* \retval -errno otherwise
*/
static int
parse_addrange(const struct cfs_lstr *src, struct nidrange *nidrange)
{ {
struct addrrange *addrrange; int i;
if (src->ls_len == 1 && src->ls_str[0] == '*') {
nidrange->nr_all = 1;
return 0;
}
LIBCFS_ALLOC(addrrange, sizeof(struct addrrange)); if (lnd >= 0)
if (addrrange == NULL) for (i = 0; i < libcfs_nnetstrfns; i++)
return -ENOMEM; if (lnd == libcfs_netstrfns[i].nf_type)
list_add_tail(&addrrange->ar_link, &nidrange->nr_addrranges); return &libcfs_netstrfns[i];
INIT_LIST_HEAD(&addrrange->ar_numaddr_ranges);
return nidrange->nr_netstrfns->nf_parse_addrlist(src->ls_str, return NULL;
src->ls_len,
&addrrange->ar_numaddr_ranges);
} }
/** static struct netstrfns *
* Finds or creates struct nidrange. libcfs_namenum2netstrfns(const char *name)
*
* Checks if \a src is a valid network name, looks for corresponding
* nidrange on the ist of nidranges (\a nidlist), creates new struct
* nidrange if it is not found.
*
* \retval pointer to struct nidrange matching network specified via \a src
* \retval NULL if \a src does not match any network
*/
static struct nidrange *
add_nidrange(const struct cfs_lstr *src,
struct list_head *nidlist)
{ {
struct netstrfns *nf; struct netstrfns *nf;
struct nidrange *nr; int i;
int endlen;
unsigned netnum;
if (src->ls_len >= LNET_NIDSTR_SIZE) for (i = 0; i < libcfs_nnetstrfns; i++) {
nf = &libcfs_netstrfns[i];
if (nf->nf_type >= 0 &&
!strncmp(name, nf->nf_name, strlen(nf->nf_name)))
return nf;
}
return NULL; return NULL;
}
nf = libcfs_namenum2netstrfns(src->ls_str); static struct netstrfns *
if (nf == NULL) libcfs_name2netstrfns(const char *name)
return NULL; {
endlen = src->ls_len - strlen(nf->nf_name); int i;
if (endlen == 0)
/* network name only, e.g. "elan" or "tcp" */
netnum = 0;
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))
return NULL;
}
list_for_each_entry(nr, nidlist, nr_link) { for (i = 0; i < libcfs_nnetstrfns; i++)
if (nr->nr_netstrfns != nf) if (libcfs_netstrfns[i].nf_type >= 0 &&
continue; !strcmp(libcfs_netstrfns[i].nf_name, name))
if (nr->nr_netnum != netnum) return &libcfs_netstrfns[i];
continue;
return nr;
}
LIBCFS_ALLOC(nr, sizeof(struct nidrange));
if (nr == NULL)
return NULL; return NULL;
list_add_tail(&nr->nr_link, nidlist); }
INIT_LIST_HEAD(&nr->nr_addrranges);
nr->nr_netstrfns = nf;
nr->nr_all = 0;
nr->nr_netnum = netnum;
return nr; int
libcfs_isknown_lnd(int type)
{
return libcfs_lnd2netstrfns(type) != NULL;
} }
EXPORT_SYMBOL(libcfs_isknown_lnd);
/** char *
* Parses \<nidrange\> token of the syntax. libcfs_lnd2modname(int lnd)
*
* \retval 1 if \a src parses to \<addrrange\> '@' \<net\>
* \retval 0 otherwise
*/
static int
parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
{ {
struct cfs_lstr addrrange; struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
struct cfs_lstr net;
struct cfs_lstr tmp;
struct nidrange *nr;
tmp = *src; return (nf == NULL) ? NULL : nf->nf_modname;
if (cfs_gettok(src, '@', &addrrange) == 0) }
goto failed; EXPORT_SYMBOL(libcfs_lnd2modname);
if (cfs_gettok(src, '@', &net) == 0 || src->ls_str != NULL) char *
goto failed; libcfs_lnd2str(int lnd)
{
char *str;
struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
nr = add_nidrange(&net, nidlist); if (nf != NULL)
if (nr == NULL) return nf->nf_name;
goto failed;
if (parse_addrange(&addrrange, nr) != 0) str = libcfs_next_nidstring();
goto failed; snprintf(str, LNET_NIDSTR_SIZE, "?%d?", lnd);
return str;
}
EXPORT_SYMBOL(libcfs_lnd2str);
return 1; int
failed: libcfs_str2lnd(const char *str)
CWARN("can't parse nidrange: \"%.*s\"\n", tmp.ls_len, tmp.ls_str); {
return 0; struct netstrfns *nf = libcfs_name2netstrfns(str);
if (nf != NULL)
return nf->nf_type;
return -1;
} }
EXPORT_SYMBOL(libcfs_str2lnd);
/** char *
* Frees addrrange structures of \a list. libcfs_net2str(__u32 net)
*
* For each struct addrrange structure found on \a list it frees
* cfs_expr_list list attached to it and frees the addrrange itself.
*
* \retval none
*/
static void
free_addrranges(struct list_head *list)
{ {
while (!list_empty(list)) { int lnd = LNET_NETTYP(net);
struct addrrange *ar; int num = LNET_NETNUM(net);
struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
char *str = libcfs_next_nidstring();
ar = list_entry(list->next, struct addrrange, ar_link); if (nf == NULL)
snprintf(str, LNET_NIDSTR_SIZE, "<%d:%d>", lnd, num);
else if (num == 0)
snprintf(str, LNET_NIDSTR_SIZE, "%s", nf->nf_name);
else
snprintf(str, LNET_NIDSTR_SIZE, "%s%d", nf->nf_name, num);
cfs_expr_list_free_list(&ar->ar_numaddr_ranges); return str;
list_del(&ar->ar_link);
LIBCFS_FREE(ar, sizeof(struct addrrange));
}
} }
EXPORT_SYMBOL(libcfs_net2str);
/** char *
* Frees nidrange strutures of \a list. libcfs_nid2str(lnet_nid_t nid)
*
* For each struct nidrange structure found on \a list it frees
* addrrange list attached to it and frees the nidrange itself.
*
* \retval none
*/
void
cfs_free_nidlist(struct list_head *list)
{ {
struct list_head *pos, *next; __u32 addr = LNET_NIDADDR(nid);
struct nidrange *nr; __u32 net = LNET_NIDNET(nid);
int lnd = LNET_NETTYP(net);
int nnum = LNET_NETNUM(net);
struct netstrfns *nf;
char *str;
int nob;
list_for_each_safe(pos, next, list) { if (nid == LNET_NID_ANY)
nr = list_entry(pos, struct nidrange, nr_link); return "<?>";
free_addrranges(&nr->nr_addrranges);
list_del(pos); nf = libcfs_lnd2netstrfns(lnd);
LIBCFS_FREE(nr, sizeof(struct nidrange)); str = libcfs_next_nidstring();
if (nf == NULL)
snprintf(str, LNET_NIDSTR_SIZE, "%x@<%d:%d>", addr, lnd, nnum);
else {
nf->nf_addr2str(addr, str);
nob = strlen(str);
if (nnum == 0)
snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s",
nf->nf_name);
else
snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s%d",
nf->nf_name, nnum);
} }
return str;
} }
EXPORT_SYMBOL(cfs_free_nidlist); EXPORT_SYMBOL(libcfs_nid2str);
/** static struct netstrfns *
* Parses nid range list. libcfs_str2net_internal(const char *str, __u32 *net)
*
* Parses with rigorous syntax and overflow checking \a str into
* \<nidrange\> [ ' ' \<nidrange\> ], compiles \a str into set of
* structures and links that structure to \a nidlist. The resulting
* list can be used to match a NID againts set of NIDS defined by \a
* str.
* \see cfs_match_nid
*
* \retval 1 on success
* \retval 0 otherwise
*/
int
cfs_parse_nidlist(char *str, int len, struct list_head *nidlist)
{ {
struct cfs_lstr src; struct netstrfns *uninitialized_var(nf);
struct cfs_lstr res; int nob;
int rc; unsigned int netnum;
int i;
src.ls_str = str; for (i = 0; i < libcfs_nnetstrfns; i++) {
src.ls_len = len; nf = &libcfs_netstrfns[i];
INIT_LIST_HEAD(nidlist); if (nf->nf_type >= 0 &&
while (src.ls_str) { !strncmp(str, nf->nf_name, strlen(nf->nf_name)))
rc = cfs_gettok(&src, ' ', &res); break;
if (rc == 0) {
cfs_free_nidlist(nidlist);
return 0;
}
rc = parse_nidrange(&res, nidlist);
if (rc == 0) {
cfs_free_nidlist(nidlist);
return 0;
}
} }
return 1;
}
EXPORT_SYMBOL(cfs_parse_nidlist);
/** if (i == libcfs_nnetstrfns)
* Matches a nid (\a nid) against the compiled list of nidranges (\a nidlist). return NULL;
*
* \see cfs_parse_nidlist()
*
* \retval 1 on match
* \retval 0 otherwises
*/
int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
{
struct nidrange *nr;
struct addrrange *ar;
list_for_each_entry(nr, nidlist, nr_link) { nob = strlen(nf->nf_name);
if (nr->nr_netstrfns->nf_type != LNET_NETTYP(LNET_NIDNET(nid)))
continue; if (strlen(str) == (unsigned int)nob) {
if (nr->nr_netnum != LNET_NETNUM(LNET_NIDNET(nid))) netnum = 0;
continue; } else {
if (nr->nr_all) if (nf->nf_type == LOLND) /* net number not allowed */
return 1; return NULL;
list_for_each_entry(ar, &nr->nr_addrranges, ar_link)
if (nr->nr_netstrfns->nf_match_addr(LNET_NIDADDR(nid), str += nob;
&ar->ar_numaddr_ranges)) i = strlen(str);
return 1; if (sscanf(str, "%u%n", &netnum, &i) < 1 ||
i != (int)strlen(str))
return NULL;
} }
return 0;
*net = LNET_MKNET(nf->nf_type, netnum);
return nf;
} }
EXPORT_SYMBOL(cfs_match_nid);
/** __u32
* Print the network part of the nidrange \a nr into the specified \a buffer. libcfs_str2net(const char *str)
*
* \retval number of characters written
*/
static int
cfs_print_network(char *buffer, int count, struct nidrange *nr)
{ {
struct netstrfns *nf = nr->nr_netstrfns; __u32 net;
if (nr->nr_netnum == 0) if (libcfs_str2net_internal(str, &net) != NULL)
return scnprintf(buffer, count, "@%s", nf->nf_name); return net;
else
return scnprintf(buffer, count, "@%s%u", return LNET_NIDNET(LNET_NID_ANY);
nf->nf_name, nr->nr_netnum);
} }
EXPORT_SYMBOL(libcfs_str2net);
/** lnet_nid_t
* Print a list of addrrange (\a addrranges) into the specified \a buffer. libcfs_str2nid(const char *str)
* At max \a count characters can be printed into \a buffer.
*
* \retval number of characters written
*/
static int
cfs_print_addrranges(char *buffer, int count, struct list_head *addrranges,
struct nidrange *nr)
{ {
int i = 0; const char *sep = strchr(str, '@');
struct addrrange *ar; struct netstrfns *nf;
struct netstrfns *nf = nr->nr_netstrfns; __u32 net;
__u32 addr;
list_for_each_entry(ar, addrranges, ar_link) { if (sep != NULL) {
if (i != 0) nf = libcfs_str2net_internal(sep + 1, &net);
i += scnprintf(buffer + i, count - i, " "); if (nf == NULL)
i += nf->nf_print_addrlist(buffer + i, count - i, return LNET_NID_ANY;
&ar->ar_numaddr_ranges); } else {
i += cfs_print_network(buffer + i, count - i, nr); sep = str + strlen(str);
net = LNET_MKNET(SOCKLND, 0);
nf = libcfs_lnd2netstrfns(SOCKLND);
LASSERT(nf != NULL);
} }
return i;
if (!nf->nf_str2addr(str, (int)(sep - str), &addr))
return LNET_NID_ANY;
return LNET_MKNID(net, addr);
} }
EXPORT_SYMBOL(libcfs_str2nid);
/** char *
* Print a list of nidranges (\a nidlist) into the specified \a buffer. libcfs_id2str(lnet_process_id_t id)
* At max \a count characters can be printed into \a buffer.
* Nidranges are separated by a space character.
*
* \retval number of characters written
*/
int cfs_print_nidlist(char *buffer, int count, struct list_head *nidlist)
{ {
int i = 0; char *str = libcfs_next_nidstring();
struct nidrange *nr;
if (count <= 0) if (id.pid == LNET_PID_ANY) {
return 0; snprintf(str, LNET_NIDSTR_SIZE,
"LNET_PID_ANY-%s", libcfs_nid2str(id.nid));
return str;
}
list_for_each_entry(nr, nidlist, nr_link) { snprintf(str, LNET_NIDSTR_SIZE, "%s%u-%s",
if (i != 0) ((id.pid & LNET_PID_USERFLAG) != 0) ? "U" : "",
i += scnprintf(buffer + i, count - i, " "); (id.pid & ~LNET_PID_USERFLAG), libcfs_nid2str(id.nid));
return str;
}
EXPORT_SYMBOL(libcfs_id2str);
if (nr->nr_all != 0) { int
LASSERT(list_empty(&nr->nr_addrranges)); libcfs_str2anynid(lnet_nid_t *nidp, const char *str)
i += scnprintf(buffer + i, count - i, "*"); {
i += cfs_print_network(buffer + i, count - i, nr); if (!strcmp(str, "*")) {
} else { *nidp = LNET_NID_ANY;
i += cfs_print_addrranges(buffer + i, count - i, return 1;
&nr->nr_addrranges, nr);
}
} }
return i;
*nidp = libcfs_str2nid(str);
return *nidp != LNET_NID_ANY;
} }
EXPORT_SYMBOL(cfs_print_nidlist); EXPORT_SYMBOL(libcfs_str2anynid);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment