ethdev: refactor representor port list parsing
authorXueming Li <xuemingl@nvidia.com>
Thu, 11 Mar 2021 13:13:25 +0000 (13:13 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 16 Mar 2021 19:15:29 +0000 (20:15 +0100)
To the extended representor syntax which need to reuse the value parsing
function for controller and PF section, this patch refactors the port
list parsing.

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
lib/librte_ethdev/ethdev_private.c
lib/librte_ethdev/ethdev_private.h
lib/librte_ethdev/rte_class_eth.c
lib/librte_ethdev/rte_ethdev.c

index 2d51e38..d5ef05e 100644 (file)
@@ -38,82 +38,91 @@ eth_find_device(const struct rte_eth_dev *start, rte_eth_cmp_t cmp,
        return NULL;
 }
 
-int
-rte_eth_devargs_parse_list(char *str, rte_eth_devargs_callback_t callback,
-       void *data)
+/* Put new value into list. */
+static int
+rte_eth_devargs_enlist(uint16_t *list, uint16_t *len_list,
+                      const uint16_t max_list, uint16_t val)
 {
-       char *str_start;
-       int state;
-       int result;
-
-       if (*str != '[')
-               /* Single element, not a list */
-               return callback(str, data);
-
-       /* Sanity check, then strip the brackets */
-       str_start = &str[strlen(str) - 1];
-       if (*str_start != ']') {
-               RTE_LOG(ERR, EAL, "(%s): List does not end with ']'\n", str);
-               return -EINVAL;
-       }
-       str++;
-       *str_start = '\0';
+       uint16_t i;
 
-       /* Process list elements */
-       state = 0;
-       while (1) {
-               if (state == 0) {
-                       if (*str == '\0')
-                               break;
-                       if (*str != ',') {
-                               str_start = str;
-                               state = 1;
-                       }
-               } else if (state == 1) {
-                       if (*str == ',' || *str == '\0') {
-                               if (str > str_start) {
-                                       /* Non-empty string fragment */
-                                       *str = '\0';
-                                       result = callback(str_start, data);
-                                       if (result < 0)
-                                               return result;
-                               }
-                               state = 0;
-                       }
-               }
-               str++;
+       for (i = 0; i < *len_list; i++) {
+               if (list[i] == val)
+                       return 0;
        }
+       if (*len_list >= max_list)
+               return -1;
+       list[(*len_list)++] = val;
        return 0;
 }
 
-static int
+/* Parse and enlist a range expression of "min-max" or a single value. */
+static char *
 rte_eth_devargs_process_range(char *str, uint16_t *list, uint16_t *len_list,
        const uint16_t max_list)
 {
        uint16_t lo, hi, val;
-       int result;
+       int result, n = 0;
+       char *pos = str;
 
-       result = sscanf(str, "%hu-%hu", &lo, &hi);
+       result = sscanf(str, "%hu%n-%hu%n", &lo, &n, &hi, &n);
        if (result == 1) {
-               if (*len_list >= max_list)
-                       return -ENOMEM;
-               list[(*len_list)++] = lo;
+               if (rte_eth_devargs_enlist(list, len_list, max_list, lo) != 0)
+                       return NULL;
        } else if (result == 2) {
-               if (lo >= hi || lo > RTE_MAX_ETHPORTS || hi > RTE_MAX_ETHPORTS)
-                       return -EINVAL;
+               if (lo > hi)
+                       return NULL;
                for (val = lo; val <= hi; val++) {
-                       if (*len_list >= max_list)
-                               return -ENOMEM;
-                       list[(*len_list)++] = val;
+                       if (rte_eth_devargs_enlist(list, len_list, max_list,
+                                                  val) != 0)
+                               return NULL;
                }
        } else
-               return -EINVAL;
-       return 0;
+               return NULL;
+       return pos + n;
+}
+
+/*
+ * Parse list of values separated by ",".
+ * Each value could be a range [min-max] or single number.
+ * Examples:
+ *  2               - single
+ *  [1,2,3]         - single list
+ *  [1,3-5,7,9-11]  - list with singles and ranges
+ */
+static char *
+rte_eth_devargs_process_list(char *str, uint16_t *list, uint16_t *len_list,
+       const uint16_t max_list)
+{
+       char *pos = str;
+
+       if (*pos == '[')
+               pos++;
+       while (1) {
+               pos = rte_eth_devargs_process_range(pos, list, len_list,
+                                                   max_list);
+               if (pos == NULL)
+                       return NULL;
+               if (*pos != ',') /* end of list */
+                       break;
+               pos++;
+       }
+       if (*str == '[' && *pos != ']')
+               return NULL;
+       if (*pos == ']')
+               pos++;
+       return pos;
 }
 
 /*
- * representor format:
+ * Parse representor ports from a single value or lists.
+ *
+ * Representor format:
  *   #: range or single number of VF representor
+ *
+ * Examples of #:
+ *  2               - single
+ *  [1,2,3]         - single list
+ *  [1,3-5,7,9-11]  - list with singles and ranges
  */
 int
 rte_eth_devargs_parse_representor_ports(char *str, void *data)
@@ -121,6 +130,10 @@ rte_eth_devargs_parse_representor_ports(char *str, void *data)
        struct rte_eth_devargs *eth_da = data;
 
        eth_da->type = RTE_ETH_REPRESENTOR_VF;
-       return rte_eth_devargs_process_range(str, eth_da->representor_ports,
-               &eth_da->nb_representor_ports, RTE_MAX_ETHPORTS);
+       str = rte_eth_devargs_process_list(str, eth_da->representor_ports,
+               &eth_da->nb_representor_ports,
+               RTE_DIM(eth_da->representor_ports));
+       if (str == NULL)
+               RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);
+       return str == NULL ? -1 : 0;
 }
index 905a45c..220ddd4 100644 (file)
@@ -26,9 +26,6 @@ eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp,
                const void *data);
 
 /* Parse devargs value for representor parameter. */
-typedef int (*rte_eth_devargs_callback_t)(char *str, void *data);
-int rte_eth_devargs_parse_list(char *str, rte_eth_devargs_callback_t callback,
-       void *data);
 int rte_eth_devargs_parse_representor_ports(char *str, void *data);
 
 #ifdef __cplusplus
index ca2ce87..051c892 100644 (file)
@@ -77,9 +77,7 @@ eth_representor_cmp(const char *key __rte_unused,
        if (values == NULL)
                return -1;
        memset(&representors, 0, sizeof(representors));
-       ret = rte_eth_devargs_parse_list(values,
-                       rte_eth_devargs_parse_representor_ports,
-                       &representors);
+       ret = rte_eth_devargs_parse_representor_ports(values, &representors);
        free(values);
        if (ret != 0)
                return -1; /* invalid devargs value */
index 6f514c3..fe9466a 100644 (file)
@@ -5589,9 +5589,8 @@ rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs *eth_da)
        for (i = 0; i < args.count; i++) {
                pair = &args.pairs[i];
                if (strcmp("representor", pair->key) == 0) {
-                       result = rte_eth_devargs_parse_list(pair->value,
-                               rte_eth_devargs_parse_representor_ports,
-                               eth_da);
+                       result = rte_eth_devargs_parse_representor_ports(
+                                       pair->value, eth_da);
                        if (result < 0)
                                goto parse_cleanup;
                }