From patchwork Mon Sep 7 16:39:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 76733 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DB7F9A04B1; Mon, 7 Sep 2020 18:39:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B51E31C0CC; Mon, 7 Sep 2020 18:39:51 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 0758A1DB8 for ; Mon, 7 Sep 2020 18:39:48 +0200 (CEST) IronPort-SDR: a2tRhXBRUzhTxaUQ99MmIKh5+WNd9jwX4RXdDR9deg6MmqsRimBgTL+42i6FsOg/cD3HvMhOCq V5C+sdYHcWsw== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="138072621" X-IronPort-AV: E=Sophos;i="5.76,402,1592895600"; d="scan'208";a="138072621" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2020 09:39:48 -0700 IronPort-SDR: goSChRmWl/cK8NHZpTUgY7mqG2HwWD9vLmJGJ94plfw58EK8zZcs5fSXHmXUpzumgWqz2/6geN Vtv+2ewszZwg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,402,1592895600"; d="scan'208";a="504082011" Received: from sivswdev08.ir.intel.com ([10.237.217.47]) by fmsmga006.fm.intel.com with ESMTP; 07 Sep 2020 09:39:47 -0700 From: Konstantin Ananyev To: dev@dpdk.org Cc: Konstantin Ananyev Date: Mon, 7 Sep 2020 17:39:25 +0100 Message-Id: <20200907163926.4878-2-konstantin.ananyev@intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200907163926.4878-1-konstantin.ananyev@intel.com> References: <20200907163926.4878-1-konstantin.ananyev@intel.com> Subject: [dpdk-dev] [PATCH 1/2] examples/l3fwd-acl: add source and destination MAC update 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" Introduces two changes into l3fwd-acl behaviour to make it behave in the same way as l3fwd: - Add a command-line parameter to allow the user to specify the destination mac address for each ethernet port used. - While forwarding the packet update source and destination mac addresses. Signed-off-by: Konstantin Ananyev --- doc/guides/rel_notes/release_20_11.rst | 5 ++ .../sample_app_ug/l3_forward_access_ctrl.rst | 4 +- examples/l3fwd-acl/main.c | 51 +++++++++++++++++-- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index df227a177..e9e1fba1c 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -55,6 +55,11 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Add new command-line parameter for l3wfd-acl sample application.** + + Added new optional parameter ``--eth-dest`` for the ``l3fwd-acl`` to allow + the user to specify the destination mac address for each ethernet port used. + Removed Items ------------- diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52..91004356e 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] where, @@ -260,6 +260,8 @@ where, * --no-numa: optional, disables numa awareness +* --eth-dest=X,MM:MM:MM:MM:MM:MM: optional, ethernet destination for port X + For example, consider a dual processor socket platform with 8 physical cores, where cores 0-7 and 16-23 appear on socket 0, while cores 8-15 and 24-31 appear on socket 1. diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index 112ec3d2c..39175398e 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -39,6 +39,9 @@ #include #include +#include +#include + #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG #define L3FWDACL_DEBUG #endif @@ -81,9 +84,6 @@ static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; -/* ethernet addresses of ports */ -static struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; - /* mask of enabled ports */ static uint32_t enabled_port_mask; static int promiscuous_on; /**< Ports set in promiscuous mode off by default. */ @@ -143,6 +143,9 @@ static struct rte_eth_conf port_conf = { static struct rte_mempool *pktmbuf_pool[NB_SOCKETS]; +/* ethernet addresses of ports */ +static struct rte_ether_hdr port_l2hdr[RTE_MAX_ETHPORTS]; + /***********************start of ACL part******************************/ #ifdef DO_RFC_1812_CHECKS static inline int @@ -164,6 +167,7 @@ send_single_packet(struct rte_mbuf *m, uint16_t port); #define OPTION_RULE_IPV4 "rule_ipv4" #define OPTION_RULE_IPV6 "rule_ipv6" #define OPTION_SCALAR "scalar" +#define OPTION_ETH_DEST "eth-dest" #define ACL_DENY_SIGNATURE 0xf0000000 #define RTE_LOGTYPE_L3FWDACL RTE_LOGTYPE_USER3 #define acl_log(format, ...) RTE_LOG(ERR, L3FWDACL, format, ##__VA_ARGS__) @@ -1275,9 +1279,14 @@ send_single_packet(struct rte_mbuf *m, uint16_t port) { uint32_t lcore_id; struct lcore_conf *qconf; + struct rte_ether_hdr *eh; lcore_id = rte_lcore_id(); + /* update src and dst mac*/ + eh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); + memcpy(eh, &port_l2hdr[port], sizeof(eh->d_addr) + sizeof(eh->s_addr)); + qconf = &lcore_conf[lcore_id]; rte_eth_tx_buffer(port, qconf->tx_queue_id[port], qconf->tx_buffer[port], m); @@ -1627,6 +1636,26 @@ parse_config(const char *q_arg) return 0; } +static const char * +parse_eth_dest(const char *optarg) +{ + unsigned long portid; + char *port_end; + + errno = 0; + portid = strtoul(optarg, &port_end, 0); + if (errno != 0 || port_end == optarg || *port_end++ != ',') + return "Invalid format"; + else if (portid >= RTE_MAX_ETHPORTS) + return "port value exceeds RTE_MAX_ETHPORTS(" + RTE_STR(RTE_MAX_ETHPORTS) ")"; + + if (cmdline_parse_etheraddr(NULL, port_end, &port_l2hdr[portid].d_addr, + sizeof(port_l2hdr[portid].d_addr)) < 0) + return "Invalid ethernet address"; + return NULL; +} + /* Parse the argument given in the command line of the application */ static int parse_args(int argc, char **argv) @@ -1642,6 +1671,7 @@ parse_args(int argc, char **argv) {OPTION_RULE_IPV4, 1, 0, 0}, {OPTION_RULE_IPV6, 1, 0, 0}, {OPTION_SCALAR, 0, 0, 0}, + {OPTION_ETH_DEST, 1, 0, 0}, {NULL, 0, 0, 0} }; @@ -1737,6 +1767,16 @@ parse_args(int argc, char **argv) OPTION_SCALAR, sizeof(OPTION_SCALAR))) parm_config.scalar = 1; + if (!strncmp(lgopts[option_index].name, OPTION_ETH_DEST, + sizeof(OPTION_ETH_DEST))) { + const char *serr = parse_eth_dest(optarg); + if (serr != NULL) { + printf("invalid %s value:\"%s\": %s\n", + OPTION_ETH_DEST, optarg, serr); + print_usage(prgname); + return -1; + } + } break; @@ -1965,13 +2005,14 @@ main(int argc, char **argv) "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%d\n", ret, portid); - ret = rte_eth_macaddr_get(portid, &ports_eth_addr[portid]); + ret = rte_eth_macaddr_get(portid, &port_l2hdr[portid].s_addr); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_macaddr_get: err=%d, port=%d\n", ret, portid); - print_ethaddr(" Address:", &ports_eth_addr[portid]); + print_ethaddr("Dst MAC:", &port_l2hdr[portid].d_addr); + print_ethaddr(", Src MAC:", &port_l2hdr[portid].s_addr); printf(", "); /* init memory */ From patchwork Mon Sep 7 16:39:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 76734 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 101B0A04B1; Mon, 7 Sep 2020 18:40:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02CFA1C0D9; Mon, 7 Sep 2020 18:39:54 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 47E991C0D5 for ; Mon, 7 Sep 2020 18:39:52 +0200 (CEST) IronPort-SDR: iaSvKvoV8WHIm9kJnq1EfOA2NXYXWNixESinSqRgktpIq1ANZBtPnFh2AajZ79Z1sunv+Qrlsb r/nXB1HuSntQ== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="138072649" X-IronPort-AV: E=Sophos;i="5.76,402,1592895600"; d="scan'208";a="138072649" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2020 09:39:51 -0700 IronPort-SDR: o3kAt1jnMWHXC8cj5dKmnDpwWfQj+pC5x/BcJPWIKUw1bRCVnr6Hi+9s9UXKmPWkc+gpqOOkrI Io3YVoWo8KpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,402,1592895600"; d="scan'208";a="504082044" Received: from sivswdev08.ir.intel.com ([10.237.217.47]) by fmsmga006.fm.intel.com with ESMTP; 07 Sep 2020 09:39:50 -0700 From: Konstantin Ananyev To: dev@dpdk.org Cc: Konstantin Ananyev Date: Mon, 7 Sep 2020 17:39:26 +0100 Message-Id: <20200907163926.4878-3-konstantin.ananyev@intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200907163926.4878-1-konstantin.ananyev@intel.com> References: <20200907163926.4878-1-konstantin.ananyev@intel.com> Subject: [dpdk-dev] [PATCH 2/2] examples/l3fwd-acl: allow explicitly select classify method 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" Replace '--scalar' command-line option with new one: --alg= to allow user explicitly select desired classify method. This is an optional parameter, if not specified default classify algorithm will be used. Signed-off-by: Konstantin Ananyev --- doc/guides/rel_notes/release_20_11.rst | 5 + .../sample_app_ug/l3_forward_access_ctrl.rst | 9 +- examples/l3fwd-acl/main.c | 103 ++++++++++++++++-- 3 files changed, 103 insertions(+), 14 deletions(-) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index e9e1fba1c..01b1aae2e 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -60,6 +60,11 @@ New Features Added new optional parameter ``--eth-dest`` for the ``l3fwd-acl`` to allow the user to specify the destination mac address for each ethernet port used. +* **Allow explicitly select classify method for l3fwd-acl sample application.** + + Replace ``--scalar`` command-line option with ``--alg=``, to + to allow user explicitly select desired classify method. + Removed Items ------------- diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index 91004356e..80dd8ba00 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -236,7 +236,7 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] + ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] where, @@ -252,7 +252,8 @@ where, * --rule_ipv6 FILENAME: Specifies the IPv6 ACL and route rules file -* --scalar: Use a scalar function to perform rule lookup +* --alg=: optional, ACL classify method to use, one of: + ``scalar|sse|avx2|neon|altivec`` * --enable-jumbo: optional, enables jumbo frames @@ -270,7 +271,7 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar In this command: @@ -296,7 +297,7 @@ In this command: * The --rule_ipv6 option specifies the reading of IPv6 rules sets from the ./ rule_ipv6.db file. -* The --scalar option specifies the performing of rule lookup with a scalar function. +* The --alg=scalar option specifies the performing of rule lookup with a scalar function. Explanation ----------- diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index 39175398e..e0f7701cd 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -146,6 +146,32 @@ static struct rte_mempool *pktmbuf_pool[NB_SOCKETS]; /* ethernet addresses of ports */ static struct rte_ether_hdr port_l2hdr[RTE_MAX_ETHPORTS]; +static const struct { + const char *name; + enum rte_acl_classify_alg alg; +} acl_alg[] = { + { + .name = "scalar", + .alg = RTE_ACL_CLASSIFY_SCALAR, + }, + { + .name = "sse", + .alg = RTE_ACL_CLASSIFY_SSE, + }, + { + .name = "avx2", + .alg = RTE_ACL_CLASSIFY_AVX2, + }, + { + .name = "neon", + .alg = RTE_ACL_CLASSIFY_NEON, + }, + { + .name = "altivec", + .alg = RTE_ACL_CLASSIFY_ALTIVEC, + }, +}; + /***********************start of ACL part******************************/ #ifdef DO_RFC_1812_CHECKS static inline int @@ -166,7 +192,7 @@ send_single_packet(struct rte_mbuf *m, uint16_t port); #define OPTION_ENBJMO "enable-jumbo" #define OPTION_RULE_IPV4 "rule_ipv4" #define OPTION_RULE_IPV6 "rule_ipv6" -#define OPTION_SCALAR "scalar" +#define OPTION_ALG "alg" #define OPTION_ETH_DEST "eth-dest" #define ACL_DENY_SIGNATURE 0xf0000000 #define RTE_LOGTYPE_L3FWDACL RTE_LOGTYPE_USER3 @@ -441,7 +467,7 @@ static struct { static struct{ const char *rule_ipv4_name; const char *rule_ipv6_name; - int scalar; + enum rte_acl_classify_alg alg; } parm_config; const char cb_port_delim[] = ":"; @@ -1094,13 +1120,58 @@ add_rules(const char *rule_path, return 0; } +static int +usage_acl_alg(char *buf, size_t sz) +{ + uint32_t i, n, rc, tn; + + n = 0; + tn = 0; + for (i = 0; i < RTE_DIM(acl_alg); i++) { + rc = snprintf(buf + n, sz - n, + i == RTE_DIM(acl_alg) - 1 ? "%s" : "%s|", + acl_alg[i].name); + tn += rc; + if (rc < sz - n) + n += rc; + } + + return tn; +} + +static const char * +str_acl_alg(enum rte_acl_classify_alg alg) +{ + uint32_t i; + + for (i = 0; i != RTE_DIM(acl_alg); i++) { + if (alg == acl_alg[i].alg) + return acl_alg[i].name; + } + + return "default"; +} + +static enum rte_acl_classify_alg +parse_acl_alg(const char *alg) +{ + uint32_t i; + + for (i = 0; i != RTE_DIM(acl_alg); i++) { + if (strcmp(alg, acl_alg[i].name) == 0) + return acl_alg[i].alg; + } + + return RTE_ACL_CLASSIFY_DEFAULT; +} + static void dump_acl_config(void) { printf("ACL option are:\n"); printf(OPTION_RULE_IPV4": %s\n", parm_config.rule_ipv4_name); printf(OPTION_RULE_IPV6": %s\n", parm_config.rule_ipv6_name); - printf(OPTION_SCALAR": %d\n", parm_config.scalar); + printf(OPTION_ALG": %s\n", str_acl_alg(parm_config.alg)); } static int @@ -1141,8 +1212,8 @@ setup_acl(struct rte_acl_rule *route_base, if ((context = rte_acl_create(&acl_param)) == NULL) rte_exit(EXIT_FAILURE, "Failed to create ACL context\n"); - if (parm_config.scalar && rte_acl_set_ctx_classify(context, - RTE_ACL_CLASSIFY_SCALAR) != 0) + if (parm_config.alg != RTE_ACL_CLASSIFY_DEFAULT && + rte_acl_set_ctx_classify(context, parm_config.alg) != 0) rte_exit(EXIT_FAILURE, "Failed to setup classify method for ACL context\n"); @@ -1525,6 +1596,9 @@ init_lcore_rx_queues(void) static void print_usage(const char *prgname) { + char alg[PATH_MAX]; + + usage_acl_alg(alg, sizeof(alg)); printf("%s [EAL options] -- -p PORTMASK -P" "--"OPTION_RULE_IPV4"=FILE" "--"OPTION_RULE_IPV6"=FILE" @@ -1546,8 +1620,8 @@ print_usage(const char *prgname) "character '%c'.\n" " --"OPTION_RULE_IPV6"=FILE: specify the ipv6 rules " "entries file.\n" - " --"OPTION_SCALAR": Use scalar function to do lookup\n", - prgname, ACL_LEAD_CHAR, ROUTE_LEAD_CHAR); + " --"OPTION_ALG": ACL classify method to use, one of: %s\n", + prgname, ACL_LEAD_CHAR, ROUTE_LEAD_CHAR, alg); } static int @@ -1656,6 +1730,7 @@ parse_eth_dest(const char *optarg) return NULL; } + /* Parse the argument given in the command line of the application */ static int parse_args(int argc, char **argv) @@ -1670,7 +1745,7 @@ parse_args(int argc, char **argv) {OPTION_ENBJMO, 0, 0, 0}, {OPTION_RULE_IPV4, 1, 0, 0}, {OPTION_RULE_IPV6, 1, 0, 0}, - {OPTION_SCALAR, 0, 0, 0}, + {OPTION_ALG, 1, 0, 0}, {OPTION_ETH_DEST, 1, 0, 0}, {NULL, 0, 0, 0} }; @@ -1764,8 +1839,16 @@ parse_args(int argc, char **argv) } if (!strncmp(lgopts[option_index].name, - OPTION_SCALAR, sizeof(OPTION_SCALAR))) - parm_config.scalar = 1; + OPTION_ALG, sizeof(OPTION_ALG))) { + parm_config.alg = parse_acl_alg(optarg); + if (parm_config.alg == + RTE_ACL_CLASSIFY_DEFAULT) { + printf("unknown %s value:\"%s\"\n", + OPTION_ALG, optarg); + print_usage(prgname); + return -1; + } + } if (!strncmp(lgopts[option_index].name, OPTION_ETH_DEST, sizeof(OPTION_ETH_DEST))) {