From 84d3585890c4758178cedbef0e4f032bf0eeaa03 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Sat, 9 Mar 2024 09:30:35 -0500 Subject: [PATCH] LU-9859 lnet: move expr parsing from libcfs The expr parsing is used for lnet and lnet-related data, so move it into lnet/lnet. Signed-off-by: Mr NeilBrown Change-Id: I4e65358babf6f522df6d7e9b3622c2b3e517bb7d Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50845 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: James Simmons Reviewed-by: Timothy Day --- libcfs/include/libcfs/libcfs_string.h | 22 +-- libcfs/libcfs/libcfs_string.c | 267 ---------------------------------- lnet/lnet/nidstrings.c | 261 +++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+), 282 deletions(-) diff --git a/libcfs/include/libcfs/libcfs_string.h b/libcfs/include/libcfs/libcfs_string.h index dddae1f..5bbb8dd 100644 --- a/libcfs/include/libcfs/libcfs_string.h +++ b/libcfs/include/libcfs/libcfs_string.h @@ -43,14 +43,6 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), int *oldmask, int minmask, int allmask, int defmask); -/** - * Structure to represent NULL-less strings. - */ -struct cfs_lstr { - char *ls_str; - int ls_len; -}; - /* * Structure to represent \ token of the syntax. */ @@ -59,9 +51,9 @@ struct cfs_range_expr { * Link to cfs_expr_list::el_exprs. */ struct list_head re_link; - __u32 re_lo; - __u32 re_hi; - __u32 re_stride; + u32 re_lo; + u32 re_hi; + u32 re_stride; }; struct cfs_expr_list { @@ -69,13 +61,13 @@ struct cfs_expr_list { struct list_head el_exprs; }; -int cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list); +int cfs_expr_list_match(u32 value, struct cfs_expr_list *expr_list); int cfs_expr_list_values(struct cfs_expr_list *expr_list, - int max, __u32 **values); -void cfs_expr_list_values_free(__u32 *values, int num); + int max, u32 **values); void cfs_expr_list_free(struct cfs_expr_list *expr_list); -int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max, +int cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max, struct cfs_expr_list **elpp); void cfs_expr_list_free_list(struct list_head *list); +#define cfs_expr_list_values_free(values, num) CFS_FREE_PTR_ARRAY(values, num) #endif diff --git a/libcfs/libcfs/libcfs_string.c b/libcfs/libcfs/libcfs_string.c index c9bffe3..0b1c621 100644 --- a/libcfs/libcfs/libcfs_string.c +++ b/libcfs/libcfs/libcfs_string.c @@ -119,270 +119,3 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit), return 0; } EXPORT_SYMBOL(cfs_str2mask); - -/** - * Parses \ token of the syntax. If \a bracketed is false, - * \a src should only have a single token which can be \ or \* - * - * \retval pointer to allocated range_expr and initialized - * range_expr::re_lo, range_expr::re_hi and range_expr:re_stride if \a - `* src parses to - * \ | - * \ '-' \ | - * \ '-' \ '/' \ - * \retval 0 will be returned if it can be parsed, otherwise -EINVAL or - * -ENOMEM will be returned. - */ -static int -cfs_range_expr_parse(char *src, unsigned int min, unsigned int max, - int bracketed, struct cfs_range_expr **expr) -{ - struct cfs_range_expr *re; - char *tok; - unsigned int num; - - LIBCFS_ALLOC(re, sizeof(*re)); - if (re == NULL) - return -ENOMEM; - - src = strim(src); - if (strcmp(src, "*") == 0) { - re->re_lo = min; - re->re_hi = max; - re->re_stride = 1; - goto out; - } - - if (kstrtouint(src, 0, &num) == 0) { - if (num < min || num > max) - goto failed; - /* is parsed */ - re->re_lo = num; - re->re_hi = re->re_lo; - re->re_stride = 1; - goto out; - } - - if (!bracketed) - goto failed; - tok = strim(strsep(&src, "-")); - if (!src) - goto failed; - if (kstrtouint(tok, 0, &num) != 0 || - num < min || num > max) - goto failed; - re->re_lo = num; - - /* - */ - if (kstrtouint(strim(src), 0, &num) == 0) { - if (num < min || num > max) - goto failed; - re->re_hi = num; - /* - is parsed */ - re->re_stride = 1; - goto out; - } - - /* go to check '-' '/' */ - tok = strim(strsep(&src, "/")); - if (!src) - goto failed; - if (kstrtouint(tok, 0, &num) != 0 || - num < min || num > max) - goto failed; - re->re_hi = num; - if (kstrtouint(strim(src), 0, &num) != 0 || - num < min || num > max) - goto failed; - re->re_stride = num; - -out: - *expr = re; - return 0; - -failed: - LIBCFS_FREE(re, sizeof(*re)); - return -EINVAL; -} - -/** - * Matches value (\a value) against ranges expression list \a expr_list. - * - * \retval 1 if \a value matches - * \retval 0 otherwise - */ -int -cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list) -{ - struct cfs_range_expr *expr; - - list_for_each_entry(expr, &expr_list->el_exprs, re_link) { - if (value >= expr->re_lo && value <= expr->re_hi && - ((value - expr->re_lo) % expr->re_stride) == 0) - return 1; - } - - return 0; -} -EXPORT_SYMBOL(cfs_expr_list_match); - -/** - * Convert express list (\a expr_list) to an array of all matched values - * - * \retval N N is total number of all matched values - * \retval 0 if expression list is empty - * \retval < 0 for failure - */ -int -cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp) -{ - struct cfs_range_expr *expr; - __u32 *val; - int count = 0; - int i; - - list_for_each_entry(expr, &expr_list->el_exprs, re_link) { - for (i = expr->re_lo; i <= expr->re_hi; i++) { - if (((i - expr->re_lo) % expr->re_stride) == 0) - count++; - } - } - - if (count == 0) /* empty expression list */ - return 0; - - if (count > max) { - CERROR("Number of values %d exceeds max allowed %d\n", - max, count); - return -EINVAL; - } - - CFS_ALLOC_PTR_ARRAY(val, count); - if (val == NULL) - return -ENOMEM; - - count = 0; - list_for_each_entry(expr, &expr_list->el_exprs, re_link) { - for (i = expr->re_lo; i <= expr->re_hi; i++) { - if (((i - expr->re_lo) % expr->re_stride) == 0) - val[count++] = i; - } - } - - *valpp = val; - return count; -} -EXPORT_SYMBOL(cfs_expr_list_values); - -void -cfs_expr_list_values_free(__u32 *values, int num) -{ - /* This array is allocated by LIBCFS_ALLOC(), so it shouldn't be freed - * by OBD_FREE() if it's called by module other than libcfs & LNet, - * otherwise we will see fake memory leak */ - CFS_FREE_PTR_ARRAY(values, num); -} -EXPORT_SYMBOL(cfs_expr_list_values_free); - -/** - * Frees cfs_range_expr structures of \a expr_list. - * - * \retval none - */ -void -cfs_expr_list_free(struct cfs_expr_list *expr_list) -{ - while (!list_empty(&expr_list->el_exprs)) { - struct cfs_range_expr *expr; - - expr = list_first_entry(&expr_list->el_exprs, - struct cfs_range_expr, re_link); - list_del(&expr->re_link); - LIBCFS_FREE(expr, sizeof(*expr)); - } - - LIBCFS_FREE(expr_list, sizeof(*expr_list)); -} -EXPORT_SYMBOL(cfs_expr_list_free); - -/** - * Parses \ token of the syntax. - * - * \retval 0 if \a str parses to \ | \ - * \retval -errno otherwise - */ -int -cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max, - struct cfs_expr_list **elpp) -{ - struct cfs_expr_list *expr_list; - struct cfs_range_expr *expr; - char *src; - int rc; - - CFS_ALLOC_PTR(expr_list); - if (expr_list == NULL) - return -ENOMEM; - - str = kstrndup(str, len, GFP_KERNEL); - if (!str) { - CFS_FREE_PTR(expr_list); - return -ENOMEM; - } - - src = str; - - INIT_LIST_HEAD(&expr_list->el_exprs); - - if (src[0] == '[' && - src[strlen(src) - 1] == ']') { - src++; - src[strlen(src)-1] = '\0'; - - rc = -EINVAL; - while (src) { - char *tok = strim(strsep(&src, ",")); - - rc = cfs_range_expr_parse(tok, min, max, 1, &expr); - if (rc != 0) - break; - - list_add_tail(&expr->re_link, &expr_list->el_exprs); - } - } else { - rc = cfs_range_expr_parse(src, min, max, 0, &expr); - if (rc == 0) - list_add_tail(&expr->re_link, &expr_list->el_exprs); - } - kfree(str); - - if (rc != 0) - cfs_expr_list_free(expr_list); - else - *elpp = expr_list; - - return rc; -} -EXPORT_SYMBOL(cfs_expr_list_parse); - -/** - * Frees cfs_expr_list structures of \a list. - * - * For each struct cfs_expr_list structure found on \a list it frees - * range_expr list attached to it and frees the cfs_expr_list itself. - * - * \retval none - */ -void -cfs_expr_list_free_list(struct list_head *list) -{ - struct cfs_expr_list *el; - - while (!list_empty(list)) { - el = list_first_entry(list, - struct cfs_expr_list, el_link); - list_del(&el->el_link); - cfs_expr_list_free(el); - } -} -EXPORT_SYMBOL(cfs_expr_list_free_list); diff --git a/lnet/lnet/nidstrings.c b/lnet/lnet/nidstrings.c index e77c565..e360467 100644 --- a/lnet/lnet/nidstrings.c +++ b/lnet/lnet/nidstrings.c @@ -126,6 +126,267 @@ struct addrrange { }; /** + * Parses \ token of the syntax. If \a bracketed is false, + * \a src should only have a single token which can be \ or \* + * + * \retval pointer to allocated range_expr and initialized + * range_expr::re_lo, range_expr::re_hi and range_expr:re_stride if \a + `* src parses to + * \ | + * \ '-' \ | + * \ '-' \ '/' \ + * \retval 0 will be returned if it can be parsed, otherwise -EINVAL or + * -ENOMEM will be returned. + */ +static int +cfs_range_expr_parse(char *src, unsigned int min, unsigned int max, + int bracketed, struct cfs_range_expr **expr) +{ + struct cfs_range_expr *re; + char *tok; + unsigned int num; + + LIBCFS_ALLOC(re, sizeof(*re)); + if (!re) + return -ENOMEM; + + src = strim(src); + if (strcmp(src, "*") == 0) { + re->re_lo = min; + re->re_hi = max; + re->re_stride = 1; + goto out; + } + + if (kstrtouint(src, 0, &num) == 0) { + if (num < min || num > max) + goto failed; + /* is parsed */ + re->re_lo = num; + re->re_hi = re->re_lo; + re->re_stride = 1; + goto out; + } + + if (!bracketed) + goto failed; + tok = strim(strsep(&src, "-")); + if (!src) + goto failed; + if (kstrtouint(tok, 0, &num) != 0 || + num < min || num > max) + goto failed; + re->re_lo = num; + + /* - */ + if (kstrtouint(strim(src), 0, &num) == 0) { + if (num < min || num > max) + goto failed; + re->re_hi = num; + /* - is parsed */ + re->re_stride = 1; + goto out; + } + + /* go to check '-' '/' */ + tok = strim(strsep(&src, "/")); + if (!src) + goto failed; + if (kstrtouint(tok, 0, &num) != 0 || + num < min || num > max) + goto failed; + re->re_hi = num; + if (kstrtouint(strim(src), 0, &num) != 0 || + num < min || num > max) + goto failed; + re->re_stride = num; + +out: + *expr = re; + return 0; + +failed: + LIBCFS_FREE(re, sizeof(*re)); + return -EINVAL; +} + +/** + * Matches value (\a value) against ranges expression list \a expr_list. + * + * \retval 1 if \a value matches + * \retval 0 otherwise + */ +int +cfs_expr_list_match(u32 value, struct cfs_expr_list *expr_list) +{ + struct cfs_range_expr *expr; + + list_for_each_entry(expr, &expr_list->el_exprs, re_link) { + if (value >= expr->re_lo && value <= expr->re_hi && + ((value - expr->re_lo) % expr->re_stride) == 0) + return 1; + } + + return 0; +} + +/** + * Convert express list (\a expr_list) to an array of all matched values + * + * \retval N N is total number of all matched values + * \retval 0 if expression list is empty + * \retval < 0 for failure + */ +int +cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, u32 **valpp) +{ + struct cfs_range_expr *expr; + int count = 0; + u32 *val; + int i; + + list_for_each_entry(expr, &expr_list->el_exprs, re_link) { + for (i = expr->re_lo; i <= expr->re_hi; i++) { + if (((i - expr->re_lo) % expr->re_stride) == 0) + count++; + } + } + + if (count == 0) /* empty expression list */ + return 0; + + if (count > max) { + CERROR("Number of values %d exceeds max allowed %d\n", + max, count); + return -EINVAL; + } + + CFS_ALLOC_PTR_ARRAY(val, count); + if (!val) + return -ENOMEM; + + count = 0; + list_for_each_entry(expr, &expr_list->el_exprs, re_link) { + for (i = expr->re_lo; i <= expr->re_hi; i++) { + if (((i - expr->re_lo) % expr->re_stride) == 0) + val[count++] = i; + } + } + + *valpp = val; + return count; +} +EXPORT_SYMBOL(cfs_expr_list_values); + +/** + * Frees cfs_range_expr structures of \a expr_list. + * + * \retval none + */ +void +cfs_expr_list_free(struct cfs_expr_list *expr_list) +{ + while (!list_empty(&expr_list->el_exprs)) { + struct cfs_range_expr *expr; + + expr = list_entry(expr_list->el_exprs.next, + struct cfs_range_expr, re_link); + list_del(&expr->re_link); + LIBCFS_FREE(expr, sizeof(*expr)); + } + + LIBCFS_FREE(expr_list, sizeof(*expr_list)); +} +EXPORT_SYMBOL(cfs_expr_list_free); + +/** + * Parses \ token of the syntax. + * + * \retval 0 if \a str parses to \ | \ + * \retval -errno otherwise + */ +int +cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max, + struct cfs_expr_list **elpp) +{ + struct cfs_expr_list *expr_list; + struct cfs_range_expr *expr; + char *src; + int rc; + + CFS_ALLOC_PTR(expr_list); + if (!expr_list) + return -ENOMEM; + + str = kstrndup(str, len, GFP_KERNEL); + if (!str) { + CFS_FREE_PTR(expr_list); + return -ENOMEM; + } + + src = str; + + INIT_LIST_HEAD(&expr_list->el_exprs); + + if (src[0] == '[' && + src[strlen(src) - 1] == ']') { + src++; + src[strlen(src)-1] = '\0'; + + rc = -EINVAL; + while (src) { + char *tok = strsep(&src, ","); + + if (!*tok) { + rc = -EINVAL; + break; + } + tok = strim(tok); + + rc = cfs_range_expr_parse(tok, min, max, 1, &expr); + if (rc != 0) + break; + + list_add_tail(&expr->re_link, &expr_list->el_exprs); + } + } else { + rc = cfs_range_expr_parse(src, min, max, 0, &expr); + if (rc == 0) + list_add_tail(&expr->re_link, &expr_list->el_exprs); + } + kfree(str); + + if (rc != 0) + cfs_expr_list_free(expr_list); + else + *elpp = expr_list; + + return rc; +} +EXPORT_SYMBOL(cfs_expr_list_parse); + +/** + * Frees cfs_expr_list structures of \a list. + * + * For each struct cfs_expr_list structure found on \a list it frees + * range_expr list attached to it and frees the cfs_expr_list itself. + * + * \retval none + */ +void +cfs_expr_list_free_list(struct list_head *list) +{ + struct cfs_expr_list *el; + + while (!list_empty(list)) { + el = list_first_entry(list, + struct cfs_expr_list, el_link); + list_del(&el->el_link); + cfs_expr_list_free(el); + } +} + +/** * Parses \ token on the syntax. * * Allocates struct addrrange and links to \a nidrange via -- 1.8.3.1