In current version, we are setting the ports
using portmask. With portmask, we can use only
upto 64 ports. This portlist option enables the user
to use more than 64 ports.
Now we can specify the ports in 2 different ways
- Using portmask (-p [0x]nnn): mask must be in hex format
- Using portlist in the following format
--portlist <p1>[-p2][,p3[-p4],...]
--portmask 0x2 is same as --portlist 1
--portmask 0x3 is same as --portlist 0-1
Signed-off-by: Hariprasad Govindharajan <hariprasad.govindharajan@intel.com>
---
v3:
squashed the 2 patches and made it 1 patch with
changes only in testpmd. Also working on optmizing
the parser
v2:
moved the parser function to testpmd
---
app/test-pmd/config.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++
app/test-pmd/parameters.c | 5 +++
app/test-pmd/testpmd.h | 3 ++
3 files changed, 88 insertions(+)
@@ -2587,6 +2587,86 @@ set_fwd_ports_list(unsigned int *portlist, unsigned int nb_pt)
}
}
+static int parse_port_list(const char *list, int *values, int maxsize)
+{
+ unsigned int count = 0;
+ char *end = NULL;
+ int min, max;
+ int idx;
+
+ if (list == NULL || values == NULL || maxsize < 0)
+ return -1;
+
+ for (idx = 0; idx < maxsize; idx++)
+ values[idx] = -1;
+
+ /* Remove all blank characters ahead */
+ while (isblank(*list))
+ list++;
+
+ min = maxsize;
+
+ do {
+ while (isblank(*list))
+ list++;
+ if (*list == '\0')
+ return -1;
+ errno = 0;
+ idx = strtol(list, &end, 10);
+ if (errno || end == NULL)
+ return -1;
+ if (idx < 0 || idx >= maxsize)
+ return -1;
+ while (isblank(*end))
+ end++;
+ if (*end == '-') {
+ min = idx;
+ } else if ((*end == ',') || (*end == '\0')) {
+ max = idx;
+ if (min == maxsize)
+ min = idx;
+ for (idx = min; idx <= max; idx++) {
+ if (values[idx] == -1) {
+ values[idx] = count;
+ count++;
+ }
+ }
+ min = maxsize;
+ } else
+ return -1;
+ list = end + 1;
+ } while (*end != '\0');
+
+ if (count == 0)
+ return -1;
+ return 0;
+}
+
+void
+parse_fwd_portlist(const char *portlist)
+{
+ unsigned int portcount = 0;
+ int portindex[RTE_MAX_ETHPORTS];
+ unsigned int ports[RTE_MAX_ETHPORTS];
+ unsigned int idx;
+ /*
+ * eal_parse_portlist() will mark the portindex array
+ * with -1 if the port is not listed and with a positive value
+ * for the listed ports. however, the function set_fwd_ports_list()
+ * requires a list of portids' so we use 2 arrays to do the
+ * conversion between 2 formats.
+ */
+ if (parse_port_list(portlist, portindex, RTE_MAX_ETHPORTS) < 0)
+ rte_exit(EXIT_FAILURE, "Invalid fwd port list\n");
+
+ RTE_ETH_FOREACH_DEV(idx) {
+ if (portindex[idx] != -1)
+ ports[portcount++] = idx;
+ }
+
+ set_fwd_ports_list(ports, portcount);
+}
+
void
set_fwd_ports_mask(uint64_t portmask)
{
@@ -57,6 +57,7 @@ usage(char* progname)
"[--help|-h] | [--auto-start|-a] | ["
"--tx-first | --stats-period=PERIOD | "
"--coremask=COREMASK --portmask=PORTMASK --numa "
+ "--portlist=PORTLIST "
"--mbuf-size= | --total-num-mbufs= | "
"--nb-cores= | --nb-ports= | "
#ifdef RTE_LIBRTE_CMDLINE
@@ -92,6 +93,7 @@ usage(char* progname)
"packet forwarding.\n");
printf(" --portmask=PORTMASK: hexadecimal bitmask of ports used "
"by the packet forwarding test.\n");
+ printf(" --portlist=PORTLIST: list of forwarding ports\n");
printf(" --numa: enable NUMA-aware allocation of RX/TX rings and of "
"RX memory buffers (mbufs).\n");
printf(" --port-numa-config=(port,socket)[,(port,socket)]: "
@@ -587,6 +589,7 @@ launch_args_parse(int argc, char** argv)
{ "nb-ports", 1, 0, 0 },
{ "coremask", 1, 0, 0 },
{ "portmask", 1, 0, 0 },
+ { "portlist", 1, 0, 0 },
{ "numa", 0, 0, 0 },
{ "no-numa", 0, 0, 0 },
{ "mp-anon", 0, 0, 0 },
@@ -825,6 +828,8 @@ launch_args_parse(int argc, char** argv)
parse_fwd_coremask(optarg);
if (!strcmp(lgopts[opt_idx].name, "portmask"))
parse_fwd_portmask(optarg);
+ if (!strcmp(lgopts[opt_idx].name, "portlist"))
+ parse_fwd_portlist(optarg);
if (!strcmp(lgopts[opt_idx].name, "no-numa"))
numa_support = 0;
if (!strcmp(lgopts[opt_idx].name, "numa"))
@@ -614,6 +614,9 @@ lcore_num(void)
rte_panic("lcore_id of current thread not found in fwd_lcores_cpuids\n");
}
+void
+parse_fwd_portlist(const char *port);
+
static inline struct fwd_lcore *
current_fwd_lcore(void)
{