From 3344cf2e30011f7ed8b98313c5732ba6c29b3f9e Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Thu, 4 Jun 2020 13:34:58 +0000 Subject: [PATCH] app/flow-perf: add flow performance skeleton Add flow performance application skeleton. Signed-off-by: Wisam Jaddo Reviewed-by: Andrew Rybchenko Acked-by: Xiaoyu Min --- MAINTAINERS | 5 + app/Makefile | 1 + app/meson.build | 1 + app/test-flow-perf/Makefile | 23 +++ app/test-flow-perf/config.h | 14 ++ app/test-flow-perf/main.c | 194 +++++++++++++++++++++++++ app/test-flow-perf/meson.build | 8 + config/common_base | 5 + doc/guides/rel_notes/release_20_08.rst | 4 + doc/guides/tools/flow-perf.rst | 44 ++++++ doc/guides/tools/index.rst | 1 + 11 files changed, 300 insertions(+) create mode 100644 app/test-flow-perf/Makefile create mode 100644 app/test-flow-perf/config.h create mode 100644 app/test-flow-perf/main.c create mode 100644 app/test-flow-perf/meson.build create mode 100644 doc/guides/tools/flow-perf.rst diff --git a/MAINTAINERS b/MAINTAINERS index 45b6c3a990..81c7972d31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1537,6 +1537,11 @@ T: git://dpdk.org/next/dpdk-next-net F: app/test-pmd/ F: doc/guides/testpmd_app_ug/ +Flow performance tool +M: Wisam Jaddo +F: app/test-flow-perf/ +F: doc/guides/tools/flow-perf.rst + Compression performance test application T: git://dpdk.org/next/dpdk-next-crypto F: app/test-compress-perf/ diff --git a/app/Makefile b/app/Makefile index 823771c5fc..0392a7de00 100644 --- a/app/Makefile +++ b/app/Makefile @@ -10,6 +10,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib +DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad diff --git a/app/meson.build b/app/meson.build index 0f7fe94649..408676b06e 100644 --- a/app/meson.build +++ b/app/meson.build @@ -15,6 +15,7 @@ apps = [ 'test-crypto-perf', 'test-eventdev', 'test-fib', + 'test-flow-perf', 'test-pipeline', 'test-pmd', 'test-sad'] diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile new file mode 100644 index 0000000000..db043c17a6 --- /dev/null +++ b/app/test-flow-perf/Makefile @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2020 Mellanox Technologies, Ltd + +include $(RTE_SDK)/mk/rte.vars.mk + +ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y) + +# +# library name +# +APP = dpdk-test-flow-perf + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +# +# all source are stored in SRCS-y +# +SRCS-y += main.c + +include $(RTE_SDK)/mk/rte.app.mk + +endif diff --git a/app/test-flow-perf/config.h b/app/test-flow-perf/config.h new file mode 100644 index 0000000000..9ec68b0736 --- /dev/null +++ b/app/test-flow-perf/config.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + */ + +#define GET_RSS_HF() (ETH_RSS_IP | ETH_RSS_TCP) + +/* Configuration */ +#define RXQ_NUM 4 +#define TXQ_NUM 4 +#define TOTAL_MBUF_NUM 32000 +#define MBUF_SIZE 2048 +#define MBUF_CACHE_SIZE 512 +#define NR_RXD 256 +#define NR_TXD 256 diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c new file mode 100644 index 0000000000..25501df8ff --- /dev/null +++ b/app/test-flow-perf/main.c @@ -0,0 +1,194 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020 Mellanox Technologies, Ltd + * + * This file contain the application main file + * This application provides the user the ability to test the + * insertion rate for specific rte_flow rule under stress state ~4M rule/ + * + * Then it will also provide packet per second measurement after installing + * all rules, the user may send traffic to test the PPS that match the rules + * after all rules are installed, to check performance or functionality after + * the stress. + * + * The flows insertion will go for all ports first, then it will print the + * results, after that the application will go into forwarding packets mode + * it will start receiving traffic if any and then forwarding it back and + * gives packet per second measurement. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "config.h" + +static struct rte_mempool *mbuf_mp; +static uint32_t nb_lcores; + +static void +usage(char *progname) +{ + printf("\nusage: %s\n", progname); +} + +static void +args_parse(int argc, char **argv) +{ + char **argvopt; + int opt; + int opt_idx; + static struct option lgopts[] = { + /* Control */ + { "help", 0, 0, 0 }, + }; + + argvopt = argv; + + while ((opt = getopt_long(argc, argvopt, "", + lgopts, &opt_idx)) != EOF) { + switch (opt) { + case 0: + if (strcmp(lgopts[opt_idx].name, "help") == 0) { + usage(argv[0]); + rte_exit(EXIT_SUCCESS, "Displayed help\n"); + } + break; + default: + fprintf(stderr, "Invalid option: %s\n", argv[optind]); + usage(argv[0]); + rte_exit(EXIT_SUCCESS, "Invalid option\n"); + break; + } + } +} + +static void +init_port(void) +{ + int ret; + uint16_t std_queue; + uint16_t port_id; + uint16_t nr_ports; + struct rte_eth_conf port_conf = { + .rx_adv_conf = { + .rss_conf.rss_hf = + GET_RSS_HF(), + } + }; + struct rte_eth_txconf txq_conf; + struct rte_eth_rxconf rxq_conf; + struct rte_eth_dev_info dev_info; + + nr_ports = rte_eth_dev_count_avail(); + if (nr_ports == 0) + rte_exit(EXIT_FAILURE, "Error: no port detected\n"); + + mbuf_mp = rte_pktmbuf_pool_create("mbuf_pool", + TOTAL_MBUF_NUM, MBUF_CACHE_SIZE, + 0, MBUF_SIZE, + rte_socket_id()); + if (mbuf_mp == NULL) + rte_exit(EXIT_FAILURE, "Error: can't init mbuf pool\n"); + + for (port_id = 0; port_id < nr_ports; port_id++) { + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device" + " (port %u) info: %s\n", + port_id, strerror(-ret)); + + port_conf.txmode.offloads &= dev_info.tx_offload_capa; + port_conf.rxmode.offloads &= dev_info.rx_offload_capa; + + printf(":: initializing port: %d\n", port_id); + + ret = rte_eth_dev_configure(port_id, RXQ_NUM, + TXQ_NUM, &port_conf); + if (ret < 0) + rte_exit(EXIT_FAILURE, + ":: cannot configure device: err=%d, port=%u\n", + ret, port_id); + + rxq_conf = dev_info.default_rxconf; + for (std_queue = 0; std_queue < RXQ_NUM; std_queue++) { + ret = rte_eth_rx_queue_setup(port_id, std_queue, NR_RXD, + rte_eth_dev_socket_id(port_id), + &rxq_conf, + mbuf_mp); + if (ret < 0) + rte_exit(EXIT_FAILURE, + ":: Rx queue setup failed: err=%d, port=%u\n", + ret, port_id); + } + + txq_conf = dev_info.default_txconf; + for (std_queue = 0; std_queue < TXQ_NUM; std_queue++) { + ret = rte_eth_tx_queue_setup(port_id, std_queue, NR_TXD, + rte_eth_dev_socket_id(port_id), + &txq_conf); + if (ret < 0) + rte_exit(EXIT_FAILURE, + ":: Tx queue setup failed: err=%d, port=%u\n", + ret, port_id); + } + + /* Catch all packets from traffic generator. */ + ret = rte_eth_promiscuous_enable(port_id); + if (ret != 0) + rte_exit(EXIT_FAILURE, + ":: promiscuous mode enable failed: err=%s, port=%u\n", + rte_strerror(-ret), port_id); + + ret = rte_eth_dev_start(port_id); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_dev_start:err=%d, port=%u\n", + ret, port_id); + + printf(":: initializing port: %d done\n", port_id); + } +} + +int +main(int argc, char **argv) +{ + int ret; + uint16_t port; + struct rte_flow_error error; + + ret = rte_eal_init(argc, argv); + if (ret < 0) + rte_exit(EXIT_FAILURE, "EAL init failed\n"); + + argc -= ret; + argv += ret; + if (argc > 1) + args_parse(argc, argv); + + init_port(); + + nb_lcores = rte_lcore_count(); + if (nb_lcores <= 1) + rte_exit(EXIT_FAILURE, "This app needs at least two cores\n"); + + RTE_ETH_FOREACH_DEV(port) { + rte_flow_flush(port, &error); + rte_eth_dev_stop(port); + rte_eth_dev_close(port); + } + return 0; +} diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build new file mode 100644 index 0000000000..25711378fb --- /dev/null +++ b/app/test-flow-perf/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2020 Mellanox Technologies, Ltd + +sources = files( + 'main.c', +) + +deps += ['ethdev'] diff --git a/config/common_base b/config/common_base index c7d5c73215..fe30c515e5 100644 --- a/config/common_base +++ b/config/common_base @@ -1117,6 +1117,11 @@ CONFIG_RTE_TEST_PMD=y CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n +# +# Compile the rte flow perf application +# +CONFIG_RTE_TEST_FLOW_PERF=y + # # Compile the bbdev test application # diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index a670155196..675c893fdd 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -75,6 +75,10 @@ New Features which are used to access packet data in a safe manner. Currently JIT support for these instructions is implemented for x86 only. +* **Added flow performance test application.** + + Added new application to test ``rte_flow`` performance. + Removed Items ------------- diff --git a/doc/guides/tools/flow-perf.rst b/doc/guides/tools/flow-perf.rst new file mode 100644 index 0000000000..1c2c6d910d --- /dev/null +++ b/doc/guides/tools/flow-perf.rst @@ -0,0 +1,44 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright 2020 Mellanox Technologies, Ltd + +Flow Performance Tool +===================== + +Application for rte_flow performance testing. + + +Compiling the Application +========================= + +The ``test-flow-perf`` application is compiled as part of the main compilation +of the DPDK libraries and tools. + +Refer to the DPDK Getting Started Guides for details. + + +Running the Application +======================= + +EAL Command-line Options +------------------------ + +Please refer to :doc:`EAL parameters (Linux) <../linux_gsg/linux_eal_parameters>` +or :doc:`EAL parameters (FreeBSD) <../freebsd_gsg/freebsd_eal_parameters>` for +a list of available EAL command-line options. + + +Flow Performance Options +------------------------ + +The following are the command-line options for the flow performance application. +They must be separated from the EAL options, shown in the previous section, +with a ``--`` separator: + +.. code-block:: console + + sudo ./dpdk-test-flow-perf -n 4 -w 08:00.0 -- + +The command line options are: + +* ``--help`` + Display a help message and quit. diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst index 782b30864e..4840cf47a3 100644 --- a/doc/guides/tools/index.rst +++ b/doc/guides/tools/index.rst @@ -12,6 +12,7 @@ DPDK Tools User Guides pdump pmdinfo devbind + flow-perf testbbdev cryptoperf comp_perf -- 2.20.1