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 C2DE4A00BE; Mon, 27 Apr 2020 20:31:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 89A371D509; Mon, 27 Apr 2020 20:31:33 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 137AA1D506 for ; Mon, 27 Apr 2020 20:31:31 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03RIUsm1015134; Mon, 27 Apr 2020 11:31:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=XYXMuX9KtBDk2S/Ne653RCIFwDVO26o2yvqYgdJo2mM=; b=dHq7SczsOTHmfKR7FLNowr8zJknTV8vnpRg/Bu417qOSIYmgFrCvzYscrPb6i85z4CHM TiVmr08uqEP+OnGuoFFFCDWm1UzputQWGWkyvM4SDUVueFcJEMH07FSS8fXR9/b0pDmK PCPy3X2e/J05gyLQb/iyh+U3EpP12vzDJhbBdFmTe5P124aWP6e5N38ikdA2jayvFP4B qiKN2CUClupdd5ONBvToLXyXR35Qbb+7Qlekg7V21lunk2OLzpGYtue15ixwPMLTAhgM VpFzPPVM0E4e9lSmZyDNAFCbwzGbiB2BgzqF1TuiK0WZRUW/NR9W7ZU5By2rzSNx+LMy Tw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 30mmqmgbse-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 27 Apr 2020 11:31:31 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 27 Apr 2020 11:31:28 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 27 Apr 2020 11:31:28 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 27 Apr 2020 11:31:28 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.163.117]) by maili.marvell.com (Postfix) with ESMTP id 5A3AE3F703F; Mon, 27 Apr 2020 11:31:22 -0700 (PDT) From: To: , , John McNamara , Marko Kovacevic , "Ori Kam" , Bruce Richardson , "Radu Nicolau" , Akhil Goyal , "Tomasz Kantecki" , Sunil Kumar Kori , Pavan Nikhilesh CC: , , Vamsi Attunuru Date: Tue, 28 Apr 2020 00:01:16 +0530 Message-ID: <20200427183118.3315-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427075944.1314-1-pbhagavatula@marvell.com> References: <20200427075944.1314-1-pbhagavatula@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-27_13:2020-04-27, 2020-04-27 signatures=0 Subject: [dpdk-dev] [PATCH v4] examples/l2fwd: add cmdline option for forwarding port info 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" From: Vamsi Attunuru Current l2fwd application statically configures adjacent ports as destination ports for forwarding the traffic. Add a portmap option to pass the forwarding port pair mapping which allows the user to configure forwarding port mapping. If no portmap argument is specified, destination port map is not changed and traffic gets forwarded with existing mapping. To align port/queue configuration of each lcore with destination port map, port/queue configuration of each lcore gets modified when portmap option is specified. Ex: ./l2fwd -c 0xff -- -p 0x3f -q 2 --portmap="(0,3)(1,4)(2,5)" With above portmap option, traffic received from portid = 0 gets forwarded to port = 3 and vice versa, similarly traffic gets forwarded on other port pairs (1,4) and (2,5) Signed-off-by: Vamsi Attunuru Signed-off-by: Pavan Nikhilesh Acked-by: Andrzej Ostruszka --- v4 Changes: * Documentation changes. (Sunil) * reduce port_pair_params_array size. (Sunil) v3 Changes: * s/config/portmap/ * rebase on master v2 Changes: * Fix command option format in docs. * Use memcpy instead of snprintf. * Rephrase if-else condition. doc/guides/rel_notes/release_20_05.rst | 7 + .../sample_app_ug/l2_forward_real_virtual.rst | 17 +- examples/l2fwd/main.c | 182 +++++++++++++++--- 3 files changed, 180 insertions(+), 26 deletions(-) diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst index b124c3f28..019bec5d7 100644 --- a/doc/guides/rel_notes/release_20_05.rst +++ b/doc/guides/rel_notes/release_20_05.rst @@ -212,6 +212,13 @@ New Features * Added IPsec inbound load-distribution support for ipsec-secgw application using NIC load distribution feature(Flow Director). +* **Added --portmap command line parameter to l2fwd example.** + + Added new command line option ``--portmap="(port, port)[,(port, port)]"`` to + pass forwarding port details. + See the :doc:`doc/guides/sample_app_ug/l2_forward_real_virtual` for more + details of this parameter usage. + Removed Items ------------- diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index 39d6b0067..90ca609d6 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -91,7 +91,10 @@ The application requires a number of command line options: .. code-block:: console - ./build/l2fwd [EAL options] -- -p PORTMASK [-q NQ] --[no-]mac-updating + ./build/l2fwd [EAL options] -- -p PORTMASK + [-q NQ] + --[no-]mac-updating + [--portmap="(port, port)[,(port, port)]"] where, @@ -99,7 +102,9 @@ where, * q NQ: A number of queues (=ports) per lcore (default is 1) -* --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default). +* --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default) + +* --portmap="(port,port)[,(port,port)]": Determines forwarding ports mapping. To run the application in linux environment with 4 lcores, 16 ports and 8 RX queues per lcore and MAC address updating enabled, issue the command: @@ -108,6 +113,14 @@ updating enabled, issue the command: $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p ffff +To run the application in linux environment with 4 lcores, 4 ports, 8 RX queues +per lcore, to forward RX traffic of ports 0 & 1 on ports 2 & 3 respectively and +vice versa, issue the command: + +.. code-block:: console + + $ ./build/l2fwd -l 0-3 -n 4 -- -q 8 -p f --portmap="(0,2)(1,3)" + Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 88ddfe589..1d84cd789 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -38,6 +38,7 @@ #include #include #include +#include static volatile bool force_quit; @@ -67,6 +68,15 @@ static uint32_t l2fwd_enabled_port_mask = 0; /* list of enabled ports */ static uint32_t l2fwd_dst_ports[RTE_MAX_ETHPORTS]; +struct port_pair_params { +#define NUM_PORTS 2 + uint16_t port[NUM_PORTS]; +} __rte_cache_aligned; + +static struct port_pair_params port_pair_params_array[RTE_MAX_ETHPORTS / 2]; +static struct port_pair_params *port_pair_params; +static uint16_t nb_port_pair_params; + static unsigned int l2fwd_rx_queue_per_lcore = 1; #define MAX_RX_QUEUE_PER_LCORE 16 @@ -294,11 +304,13 @@ l2fwd_usage(const char *prgname) printf("%s [EAL options] -- -p PORTMASK [-q NQ]\n" " -p PORTMASK: hexadecimal bitmask of ports to configure\n" " -q NQ: number of queue (=ports) per lcore (default is 1)\n" - " -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n" - " --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default)\n" - " When enabled:\n" - " - The source MAC address is replaced by the TX port MAC address\n" - " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n", + " -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n" + " --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default)\n" + " When enabled:\n" + " - The source MAC address is replaced by the TX port MAC address\n" + " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n" + " --portmap: Configure forwarding port pair mapping\n" + " Default: alternate port pairs\n\n", prgname); } @@ -319,6 +331,61 @@ l2fwd_parse_portmask(const char *portmask) return pm; } +static int +l2fwd_parse_port_pair_config(const char *q_arg) +{ + enum fieldnames { + FLD_PORT1 = 0, + FLD_PORT2, + _NUM_FLD + }; + unsigned long int_fld[_NUM_FLD]; + const char *p, *p0 = q_arg; + char *str_fld[_NUM_FLD]; + unsigned int size; + char s[256]; + char *end; + int i; + + nb_port_pair_params = 0; + + while ((p = strchr(p0, '(')) != NULL) { + ++p; + p0 = strchr(p, ')'); + if (p0 == NULL) + return -1; + + size = p0 - p; + if (size >= sizeof(s)) + return -1; + + memcpy(s, p, size); + s[size] = '\0'; + if (rte_strsplit(s, sizeof(s), str_fld, + _NUM_FLD, ',') != _NUM_FLD) + return -1; + for (i = 0; i < _NUM_FLD; i++) { + errno = 0; + int_fld[i] = strtoul(str_fld[i], &end, 0); + if (errno != 0 || end == str_fld[i] || + int_fld[i] >= RTE_MAX_ETHPORTS) + return -1; + } + if (nb_port_pair_params >= RTE_MAX_ETHPORTS/2) { + printf("exceeded max number of port pair params: %hu\n", + nb_port_pair_params); + return -1; + } + port_pair_params_array[nb_port_pair_params].port[0] = + (uint16_t)int_fld[FLD_PORT1]; + port_pair_params_array[nb_port_pair_params].port[1] = + (uint16_t)int_fld[FLD_PORT2]; + ++nb_port_pair_params; + } + port_pair_params = port_pair_params_array; + return 0; +} + static unsigned int l2fwd_parse_nqueue(const char *q_arg) { @@ -361,6 +428,7 @@ static const char short_options[] = #define CMD_LINE_OPT_MAC_UPDATING "mac-updating" #define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating" +#define CMD_LINE_OPT_PORTMAP_CONFIG "portmap" enum { /* long options mapped to a short option */ @@ -368,11 +436,13 @@ enum { /* first long only option value must be >= 256, so that we won't * conflict with short options */ CMD_LINE_OPT_MIN_NUM = 256, + CMD_LINE_OPT_PORTMAP_NUM, }; static const struct option lgopts[] = { { CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1}, { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, &mac_updating, 0}, + { CMD_LINE_OPT_PORTMAP_CONFIG, 1, 0, CMD_LINE_OPT_PORTMAP_NUM}, {NULL, 0, 0, 0} }; @@ -386,6 +456,7 @@ l2fwd_parse_args(int argc, char **argv) char *prgname = argv[0]; argvopt = argv; + port_pair_params = NULL; while ((opt = getopt_long(argc, argvopt, short_options, lgopts, &option_index)) != EOF) { @@ -423,7 +494,13 @@ l2fwd_parse_args(int argc, char **argv) break; /* long options */ - case 0: + case CMD_LINE_OPT_PORTMAP_NUM: + ret = l2fwd_parse_port_pair_config(optarg); + if (ret) { + fprintf(stderr, "Invalid config\n"); + l2fwd_usage(prgname); + return -1; + } break; default: @@ -440,6 +517,48 @@ l2fwd_parse_args(int argc, char **argv) return ret; } +/* + * Check port pair config with enabled port mask, + * and for valid port pair combinations. + */ +static int +check_port_pair_config(void) +{ + uint32_t port_pair_config_mask = 0; + uint32_t port_pair_mask = 0; + uint16_t index, i, portid; + + for (index = 0; index < nb_port_pair_params; index++) { + port_pair_mask = 0; + + for (i = 0; i < NUM_PORTS; i++) { + portid = port_pair_params[index].port[i]; + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) { + printf("port %u is not enabled in port mask\n", + portid); + return -1; + } + if (!rte_eth_dev_is_valid_port(portid)) { + printf("port %u is not present on the board\n", + portid); + return -1; + } + + port_pair_mask |= 1 << portid; + } + + if (port_pair_config_mask & port_pair_mask) { + printf("port %u is used in other port pairs\n", portid); + return -1; + } + port_pair_config_mask |= port_pair_mask; + } + + l2fwd_enabled_port_mask &= port_pair_config_mask; + + return 0; +} + /* Check the link status of all ports in up to 9s, and print them finally */ static void check_all_ports_link_status(uint32_t port_mask) @@ -555,6 +674,11 @@ main(int argc, char **argv) if (nb_ports == 0) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); + if (port_pair_params != NULL) { + if (check_port_pair_config() < 0) + rte_exit(EXIT_FAILURE, "Invalid port pair config\n"); + } + /* check port mask to possible port mask */ if (l2fwd_enabled_port_mask & ~((1 << nb_ports) - 1)) rte_exit(EXIT_FAILURE, "Invalid portmask; possible (0x%x)\n", @@ -565,26 +689,35 @@ main(int argc, char **argv) l2fwd_dst_ports[portid] = 0; last_port = 0; - /* - * Each logical core is assigned a dedicated TX queue on each port. - */ - RTE_ETH_FOREACH_DEV(portid) { - /* skip ports that are not enabled */ - if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) - continue; + /* populate destination port details */ + if (port_pair_params != NULL) { + uint16_t idx, p; - if (nb_ports_in_mask % 2) { - l2fwd_dst_ports[portid] = last_port; - l2fwd_dst_ports[last_port] = portid; + for (idx = 0; idx < (nb_port_pair_params << 1); idx++) { + p = idx & 1; + portid = port_pair_params[idx >> 1].port[p]; + l2fwd_dst_ports[portid] = + port_pair_params[idx >> 1].port[p ^ 1]; } - else - last_port = portid; + } else { + RTE_ETH_FOREACH_DEV(portid) { + /* skip ports that are not enabled */ + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) + continue; - nb_ports_in_mask++; - } - if (nb_ports_in_mask % 2) { - printf("Notice: odd number of ports in portmask.\n"); - l2fwd_dst_ports[last_port] = last_port; + if (nb_ports_in_mask % 2) { + l2fwd_dst_ports[portid] = last_port; + l2fwd_dst_ports[last_port] = portid; + } else { + last_port = portid; + } + + nb_ports_in_mask++; + } + if (nb_ports_in_mask % 2) { + printf("Notice: odd number of ports in portmask.\n"); + l2fwd_dst_ports[last_port] = last_port; + } } rx_lcore_id = 0; @@ -613,7 +746,8 @@ main(int argc, char **argv) qconf->rx_port_list[qconf->n_rx_port] = portid; qconf->n_rx_port++; - printf("Lcore %u: RX port %u\n", rx_lcore_id, portid); + printf("Lcore %u: RX port %u TX port %u\n", rx_lcore_id, + portid, l2fwd_dst_ports[portid]); } nb_mbufs = RTE_MAX(nb_ports * (nb_rxd + nb_txd + MAX_PKT_BURST + -- 2.17.1