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 B0C01A04C7; Tue, 15 Sep 2020 19:05:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 697CC1C128; Tue, 15 Sep 2020 19:05:11 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id D1577160 for ; Tue, 15 Sep 2020 19:05:07 +0200 (CEST) IronPort-SDR: h4Kxi/dnAYDPnFDN/Ru4cWRg7FVARkQIYZthxUgZ7zXq2NlJCjzEA6uXWdQni7VI2b6nK/Z4PR LjIWqzjjVt4g== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="158588528" X-IronPort-AV: E=Sophos;i="5.76,430,1592895600"; d="scan'208";a="158588528" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2020 10:05:07 -0700 IronPort-SDR: GfE1qYNxdc1tNW5WsLUVp1JGfopTgFqSsH2RjX6mIaJVAt1gZldp6Oof6G+lF+rv6/RxDT/BdY nVuSMl2JFeLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,430,1592895600"; d="scan'208";a="302229016" Received: from sivswdev08.ir.intel.com ([10.237.217.47]) by orsmga003.jf.intel.com with ESMTP; 15 Sep 2020 10:05:06 -0700 From: Konstantin Ananyev To: dev@dpdk.org Cc: Konstantin Ananyev Date: Tue, 15 Sep 2020 18:04:54 +0100 Message-Id: <20200915170456.7204-2-konstantin.ananyev@intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200915170456.7204-1-konstantin.ananyev@intel.com> References: <20200907163926.4878-1-konstantin.ananyev@intel.com> <20200915170456.7204-1-konstantin.ananyev@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] 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 acdd12ef9..cfc275f7e 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 ``RTE_ACL_CLASSIFY_AVX512`` vector implementation, which can processup to 32 flows in parallel. Requires AVX512 support. +* **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 */ -- 2.17.1