From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9912BA0524; Fri, 31 Jan 2020 18:41:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7C0E91C12D; Fri, 31 Jan 2020 18:41:37 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C2E871C126 for ; Fri, 31 Jan 2020 18:41:35 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jan 2020 09:41:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,386,1574150400"; d="scan'208";a="230311220" Received: from silpixa00393944.ir.intel.com ([10.237.223.184]) by orsmga003.jf.intel.com with ESMTP; 31 Jan 2020 09:41:32 -0800 From: Hariprasad Govindharajan To: Wenzhuo Lu , Jingjing Wu , Bernard Iremonger Cc: dev@dpdk.org, ferruh.yigit@intel.com, stephen@networkplumber.org, david.marchand@redhat.com, Hariprasad Govindharajan Date: Fri, 31 Jan 2020 17:41:29 +0000 Message-Id: <1580492489-28598-1-git-send-email-hariprasad.govindharajan@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1580121053-26083-2-git-send-email-hariprasad.govindharajan@intel.com> References: <1580121053-26083-2-git-send-email-hariprasad.govindharajan@intel.com> Subject: [dpdk-dev] [PATCH v3] app/testpmd: add portlist option to the testpmd X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 [-p2][,p3[-p4],...] --portmask 0x2 is same as --portlist 1 --portmask 0x3 is same as --portlist 0-1 Signed-off-by: Hariprasad Govindharajan --- 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(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9669cbd..c10aa78 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -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) { diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 6340104..404dba2 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -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")) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 3dd5fc7..33ef3e2 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -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) { -- 2.7.4