From: Jasvinder Singh Date: Tue, 23 Jun 2020 09:32:59 +0000 (+0100) Subject: app/testpmd: remove softnic forward mode X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=6c3c22969563b06aa82714bb2a4e416e941bd065;p=dpdk.git app/testpmd: remove softnic forward mode Softnic can be used like other virtual devices without needing any special mode. Therefore, remove softnic mode from testpmd app. Documentation is updated as well. Signed-off-by: Jasvinder Singh Acked-by: Cristian Dumitrescu --- diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index ea818de220..4eab42f186 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -37,10 +37,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c SRCS-y += util.c -ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y) -SRCS-y += softnicfwd.c -endif - ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 4ef23fd866..be1a98b9bc 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1186,11 +1186,6 @@ static void cmd_help_long_parsed(void *parsed_result, "show port tm node stats (port_id) (node_id) (clear)\n" " Display the port TM node stats.\n\n" -#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED - "set port tm hierarchy default (port_id)\n" - " Set default traffic Management hierarchy on a port\n\n" -#endif - "add port tm node shaper profile (port_id) (shaper_profile_id)" " (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)" " (packet_length_adjust)\n" @@ -15369,80 +15364,6 @@ cmdline_parse_inst_t cmd_vf_tc_max_bw = { }, }; - -#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED - -/* *** Set Port default Traffic Management Hierarchy *** */ -struct cmd_set_port_tm_hierarchy_default_result { - cmdline_fixed_string_t set; - cmdline_fixed_string_t port; - cmdline_fixed_string_t tm; - cmdline_fixed_string_t hierarchy; - cmdline_fixed_string_t def; - portid_t port_id; -}; - -cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_set = - TOKEN_STRING_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, set, "set"); -cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_port = - TOKEN_STRING_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, port, "port"); -cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_tm = - TOKEN_STRING_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, tm, "tm"); -cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_hierarchy = - TOKEN_STRING_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, - hierarchy, "hierarchy"); -cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_default = - TOKEN_STRING_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, - def, "default"); -cmdline_parse_token_num_t cmd_set_port_tm_hierarchy_default_port_id = - TOKEN_NUM_INITIALIZER( - struct cmd_set_port_tm_hierarchy_default_result, - port_id, UINT16); - -static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result, - __rte_unused struct cmdline *cl, - __rte_unused void *data) -{ - struct cmd_set_port_tm_hierarchy_default_result *res = parsed_result; - struct rte_port *p; - portid_t port_id = res->port_id; - - if (port_id_is_invalid(port_id, ENABLED_WARN)) - return; - - p = &ports[port_id]; - - /* Forward mode: tm */ - if (strcmp(cur_fwd_config.fwd_eng->fwd_mode_name, "softnic")) { - printf(" softnicfwd mode not enabled(error)\n"); - return; - } - - /* Set the default tm hierarchy */ - p->softport.default_tm_hierarchy_enable = 1; -} - -cmdline_parse_inst_t cmd_set_port_tm_hierarchy_default = { - .f = cmd_set_port_tm_hierarchy_default_parsed, - .data = NULL, - .help_str = "set port tm hierarchy default ", - .tokens = { - (void *)&cmd_set_port_tm_hierarchy_default_set, - (void *)&cmd_set_port_tm_hierarchy_default_port, - (void *)&cmd_set_port_tm_hierarchy_default_tm, - (void *)&cmd_set_port_tm_hierarchy_default_hierarchy, - (void *)&cmd_set_port_tm_hierarchy_default_default, - (void *)&cmd_set_port_tm_hierarchy_default_port_id, - NULL, - }, -}; -#endif - /** Set VXLAN encapsulation details */ struct cmd_set_vxlan_result { cmdline_fixed_string_t set; @@ -19627,9 +19548,6 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_vf_tc_max_bw, (cmdline_parse_inst_t *)&cmd_strict_link_prio, (cmdline_parse_inst_t *)&cmd_tc_min_bw, -#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED - (cmdline_parse_inst_t *)&cmd_set_port_tm_hierarchy_default, -#endif (cmdline_parse_inst_t *)&cmd_set_vxlan, (cmdline_parse_inst_t *)&cmd_set_vxlan_tos_ttl, (cmdline_parse_inst_t *)&cmd_set_vxlan_with_vlan, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 3ac7d8f61b..4d937df5e9 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2565,55 +2565,6 @@ icmp_echo_config_setup(void) } } -#if defined RTE_LIBRTE_PMD_SOFTNIC -static void -softnic_fwd_config_setup(void) -{ - struct rte_port *port; - portid_t pid, softnic_portid; - queueid_t i; - uint8_t softnic_enable = 0; - - RTE_ETH_FOREACH_DEV(pid) { - port = &ports[pid]; - const char *driver = port->dev_info.driver_name; - - if (strcmp(driver, "net_softnic") == 0) { - softnic_portid = pid; - softnic_enable = 1; - break; - } - } - - if (softnic_enable == 0) { - printf("Softnic mode not configured(%s)!\n", __func__); - return; - } - - cur_fwd_config.nb_fwd_ports = 1; - cur_fwd_config.nb_fwd_streams = (streamid_t) nb_rxq; - - /* Re-initialize forwarding streams */ - init_fwd_streams(); - - /* - * In the softnic forwarding test, the number of forwarding cores - * is set to one and remaining are used for softnic packet processing. - */ - cur_fwd_config.nb_fwd_lcores = 1; - setup_fwd_config_of_each_lcore(&cur_fwd_config); - - for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++) { - fwd_streams[i]->rx_port = softnic_portid; - fwd_streams[i]->rx_queue = i; - fwd_streams[i]->tx_port = softnic_portid; - fwd_streams[i]->tx_queue = i; - fwd_streams[i]->peer_addr = fwd_streams[i]->tx_port; - fwd_streams[i]->retry_enabled = retry_enabled; - } -} -#endif - void fwd_config_setup(void) { @@ -2623,13 +2574,6 @@ fwd_config_setup(void) return; } -#if defined RTE_LIBRTE_PMD_SOFTNIC - if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) { - softnic_fwd_config_setup(); - return; - } -#endif - if ((nb_rxq > 1) && (nb_txq > 1)){ if (dcb_config) dcb_fwd_config_setup(); diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 4872882979..750fe3bfdb 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -36,10 +36,6 @@ endif if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') deps += 'pmd_ixgbe' endif -if dpdk_conf.has('RTE_LIBRTE_SOFTNIC_PMD') - sources += files('softnicfwd.c') - deps += 'pmd_softnic' -endif if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD') deps += ['bus_dpaa', 'mempool_dpaa', 'pmd_dpaa'] endif diff --git a/app/test-pmd/softnicfwd.c b/app/test-pmd/softnicfwd.c deleted file mode 100644 index e9d4373644..0000000000 --- a/app/test-pmd/softnicfwd.c +++ /dev/null @@ -1,686 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2017 Intel Corporation - */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "testpmd.h" - -#define SUBPORT_NODES_PER_PORT 1 -#define PIPE_NODES_PER_SUBPORT 4096 -#define TC_NODES_PER_PIPE 4 -#define QUEUE_NODES_PER_TC 4 - -#define NUM_PIPE_NODES \ - (SUBPORT_NODES_PER_PORT * PIPE_NODES_PER_SUBPORT) - -#define NUM_TC_NODES \ - (NUM_PIPE_NODES * TC_NODES_PER_PIPE) - -#define ROOT_NODE_ID 1000000 -#define SUBPORT_NODES_START_ID 900000 -#define PIPE_NODES_START_ID 800000 -#define TC_NODES_START_ID 700000 - -#define STATS_MASK_DEFAULT \ - (RTE_TM_STATS_N_PKTS | \ - RTE_TM_STATS_N_BYTES | \ - RTE_TM_STATS_N_PKTS_GREEN_DROPPED | \ - RTE_TM_STATS_N_BYTES_GREEN_DROPPED) - -#define STATS_MASK_QUEUE \ - (STATS_MASK_DEFAULT | \ - RTE_TM_STATS_N_PKTS_QUEUED) - -#define BYTES_IN_MBPS (1000 * 1000 / 8) -#define TOKEN_BUCKET_SIZE 1000000 - -/* TM Hierarchy Levels */ -enum tm_hierarchy_level { - TM_NODE_LEVEL_PORT = 0, - TM_NODE_LEVEL_SUBPORT, - TM_NODE_LEVEL_PIPE, - TM_NODE_LEVEL_TC, - TM_NODE_LEVEL_QUEUE, - TM_NODE_LEVEL_MAX, -}; - -struct tm_hierarchy { - /* TM Nodes */ - uint32_t root_node_id; - uint32_t subport_node_id[SUBPORT_NODES_PER_PORT]; - uint32_t pipe_node_id[SUBPORT_NODES_PER_PORT][PIPE_NODES_PER_SUBPORT]; - uint32_t tc_node_id[NUM_PIPE_NODES][TC_NODES_PER_PIPE]; - uint32_t queue_node_id[NUM_TC_NODES][QUEUE_NODES_PER_TC]; - - /* TM Hierarchy Nodes Shaper Rates */ - uint32_t root_node_shaper_rate; - uint32_t subport_node_shaper_rate; - uint32_t pipe_node_shaper_rate; - uint32_t tc_node_shaper_rate; - uint32_t tc_node_shared_shaper_rate; - - uint32_t n_shapers; -}; - -static struct fwd_lcore *softnic_fwd_lcore; -static uint16_t softnic_port_id; -struct fwd_engine softnic_fwd_engine; - -/* - * Softnic packet forward - */ -static void -softnic_fwd(struct fwd_stream *fs) -{ - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - uint16_t nb_rx; - uint16_t nb_tx; - uint32_t retry; - -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - uint64_t start_tsc; - uint64_t end_tsc; - uint64_t core_cycles; -#endif - -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - start_tsc = rte_rdtsc(); -#endif - - /* Packets Receive */ - nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, - pkts_burst, nb_pkt_per_burst); - fs->rx_packets += nb_rx; - -#ifdef RTE_TEST_PMD_RECORD_BURST_STATS - fs->rx_burst_stats.pkt_burst_spread[nb_rx]++; -#endif - - nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, - pkts_burst, nb_rx); - - /* Retry if necessary */ - if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) { - retry = 0; - while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) { - rte_delay_us(burst_tx_delay_time); - nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue, - &pkts_burst[nb_tx], nb_rx - nb_tx); - } - } - fs->tx_packets += nb_tx; - -#ifdef RTE_TEST_PMD_RECORD_BURST_STATS - fs->tx_burst_stats.pkt_burst_spread[nb_tx]++; -#endif - - if (unlikely(nb_tx < nb_rx)) { - fs->fwd_dropped += (nb_rx - nb_tx); - do { - rte_pktmbuf_free(pkts_burst[nb_tx]); - } while (++nb_tx < nb_rx); - } -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - end_tsc = rte_rdtsc(); - core_cycles = (end_tsc - start_tsc); - fs->core_cycles = (uint64_t) (fs->core_cycles + core_cycles); -#endif -} - -static void -softnic_fwd_run(struct fwd_stream *fs) -{ - rte_pmd_softnic_run(softnic_port_id); - softnic_fwd(fs); -} - -/** - * Softnic init - */ -static int -softnic_begin(void *arg __rte_unused) -{ - for (;;) { - if (!softnic_fwd_lcore->stopped) - break; - } - - do { - /* Run softnic */ - rte_pmd_softnic_run(softnic_port_id); - } while (!softnic_fwd_lcore->stopped); - - return 0; -} - -static int -set_tm_hiearchy_nodes_shaper_rate(portid_t port_id, - struct tm_hierarchy *h) -{ - struct rte_eth_link link_params; - uint64_t tm_port_rate; - int ret; - - memset(&link_params, 0, sizeof(link_params)); - - ret = rte_eth_link_get(port_id, &link_params); - if (ret < 0) { - printf("Error during getting device (port %u) link info: %s\n", - port_id, rte_strerror(-ret)); - return ret; - } - tm_port_rate = (uint64_t)ETH_SPEED_NUM_10G * BYTES_IN_MBPS; - - /* Set tm hierarchy shapers rate */ - h->root_node_shaper_rate = tm_port_rate; - h->subport_node_shaper_rate = - tm_port_rate / SUBPORT_NODES_PER_PORT; - h->pipe_node_shaper_rate - = h->subport_node_shaper_rate / PIPE_NODES_PER_SUBPORT; - h->tc_node_shaper_rate = h->pipe_node_shaper_rate; - h->tc_node_shared_shaper_rate = h->subport_node_shaper_rate; - - return 0; -} - -static int -softport_tm_root_node_add(portid_t port_id, struct tm_hierarchy *h, - struct rte_tm_error *error) -{ - struct rte_tm_node_params rnp; - struct rte_tm_shaper_params rsp; - uint32_t priority, weight, level_id, shaper_profile_id; - - memset(&rsp, 0, sizeof(struct rte_tm_shaper_params)); - memset(&rnp, 0, sizeof(struct rte_tm_node_params)); - - /* Shaper profile Parameters */ - rsp.peak.rate = h->root_node_shaper_rate; - rsp.peak.size = TOKEN_BUCKET_SIZE; - rsp.pkt_length_adjust = RTE_TM_ETH_FRAMING_OVERHEAD_FCS; - shaper_profile_id = 0; - - if (rte_tm_shaper_profile_add(port_id, shaper_profile_id, - &rsp, error)) { - printf("%s ERROR(%d)-%s!(shaper_id %u)\n ", - __func__, error->type, error->message, - shaper_profile_id); - return -1; - } - - /* Root Node Parameters */ - h->root_node_id = ROOT_NODE_ID; - weight = 1; - priority = 0; - level_id = TM_NODE_LEVEL_PORT; - rnp.shaper_profile_id = shaper_profile_id; - rnp.nonleaf.n_sp_priorities = 1; - rnp.stats_mask = STATS_MASK_DEFAULT; - - /* Add Node to TM Hierarchy */ - if (rte_tm_node_add(port_id, h->root_node_id, RTE_TM_NODE_ID_NULL, - priority, weight, level_id, &rnp, error)) { - printf("%s ERROR(%d)-%s!(node_id %u, parent_id %u, level %u)\n", - __func__, error->type, error->message, - h->root_node_id, RTE_TM_NODE_ID_NULL, - level_id); - return -1; - } - /* Update */ - h->n_shapers++; - - printf(" Root node added (Start id %u, Count %u, level %u)\n", - h->root_node_id, 1, level_id); - - return 0; -} - -static int -softport_tm_subport_node_add(portid_t port_id, - struct tm_hierarchy *h, - struct rte_tm_error *error) -{ - uint32_t subport_parent_node_id, subport_node_id = 0; - struct rte_tm_node_params snp; - struct rte_tm_shaper_params ssp; - uint32_t priority, weight, level_id, shaper_profile_id; - uint32_t i; - - memset(&ssp, 0, sizeof(struct rte_tm_shaper_params)); - memset(&snp, 0, sizeof(struct rte_tm_node_params)); - - shaper_profile_id = h->n_shapers; - - /* Add Shaper Profile to TM Hierarchy */ - for (i = 0; i < SUBPORT_NODES_PER_PORT; i++) { - ssp.peak.rate = h->subport_node_shaper_rate; - ssp.peak.size = TOKEN_BUCKET_SIZE; - ssp.pkt_length_adjust = RTE_TM_ETH_FRAMING_OVERHEAD_FCS; - - if (rte_tm_shaper_profile_add(port_id, shaper_profile_id, - &ssp, error)) { - printf("%s ERROR(%d)-%s!(shaper_id %u)\n ", - __func__, error->type, error->message, - shaper_profile_id); - return -1; - } - - /* Node Parameters */ - h->subport_node_id[i] = SUBPORT_NODES_START_ID + i; - subport_parent_node_id = h->root_node_id; - weight = 1; - priority = 0; - level_id = TM_NODE_LEVEL_SUBPORT; - snp.shaper_profile_id = shaper_profile_id; - snp.nonleaf.n_sp_priorities = 1; - snp.stats_mask = STATS_MASK_DEFAULT; - - /* Add Node to TM Hiearchy */ - if (rte_tm_node_add(port_id, - h->subport_node_id[i], - subport_parent_node_id, - priority, weight, - level_id, - &snp, - error)) { - printf("%s ERROR(%d)-%s!(node %u,parent %u,level %u)\n", - __func__, - error->type, - error->message, - h->subport_node_id[i], - subport_parent_node_id, - level_id); - return -1; - } - shaper_profile_id++; - subport_node_id++; - } - /* Update */ - h->n_shapers = shaper_profile_id; - - printf(" Subport nodes added (Start id %u, Count %u, level %u)\n", - h->subport_node_id[0], SUBPORT_NODES_PER_PORT, level_id); - - return 0; -} - -static int -softport_tm_pipe_node_add(portid_t port_id, - struct tm_hierarchy *h, - struct rte_tm_error *error) -{ - uint32_t pipe_parent_node_id; - struct rte_tm_node_params pnp; - struct rte_tm_shaper_params psp; - uint32_t priority, weight, level_id, shaper_profile_id; - uint32_t i, j; - - memset(&psp, 0, sizeof(struct rte_tm_shaper_params)); - memset(&pnp, 0, sizeof(struct rte_tm_node_params)); - - shaper_profile_id = h->n_shapers; - - /* Shaper Profile Parameters */ - psp.peak.rate = h->pipe_node_shaper_rate; - psp.peak.size = TOKEN_BUCKET_SIZE; - psp.pkt_length_adjust = RTE_TM_ETH_FRAMING_OVERHEAD_FCS; - - /* Pipe Node Parameters */ - weight = 1; - priority = 0; - level_id = TM_NODE_LEVEL_PIPE; - pnp.nonleaf.n_sp_priorities = 4; - pnp.stats_mask = STATS_MASK_DEFAULT; - - /* Add Shaper Profiles and Nodes to TM Hierarchy */ - for (i = 0; i < SUBPORT_NODES_PER_PORT; i++) { - for (j = 0; j < PIPE_NODES_PER_SUBPORT; j++) { - if (rte_tm_shaper_profile_add(port_id, - shaper_profile_id, &psp, error)) { - printf("%s ERROR(%d)-%s!(shaper_id %u)\n ", - __func__, error->type, error->message, - shaper_profile_id); - return -1; - } - pnp.shaper_profile_id = shaper_profile_id; - pipe_parent_node_id = h->subport_node_id[i]; - h->pipe_node_id[i][j] = PIPE_NODES_START_ID + - (i * PIPE_NODES_PER_SUBPORT) + j; - - if (rte_tm_node_add(port_id, - h->pipe_node_id[i][j], - pipe_parent_node_id, - priority, weight, level_id, - &pnp, - error)) { - printf("%s ERROR(%d)-%s!(node %u,parent %u )\n", - __func__, - error->type, - error->message, - h->pipe_node_id[i][j], - pipe_parent_node_id); - - return -1; - } - shaper_profile_id++; - } - } - /* Update */ - h->n_shapers = shaper_profile_id; - - printf(" Pipe nodes added (Start id %u, Count %u, level %u)\n", - h->pipe_node_id[0][0], NUM_PIPE_NODES, level_id); - - return 0; -} - -static int -softport_tm_tc_node_add(portid_t port_id, - struct tm_hierarchy *h, - struct rte_tm_error *error) -{ - uint32_t tc_parent_node_id; - struct rte_tm_node_params tnp; - struct rte_tm_shaper_params tsp, tssp; - uint32_t shared_shaper_profile_id[TC_NODES_PER_PIPE]; - uint32_t priority, weight, level_id, shaper_profile_id; - uint32_t pos, n_tc_nodes, i, j, k; - - memset(&tsp, 0, sizeof(struct rte_tm_shaper_params)); - memset(&tssp, 0, sizeof(struct rte_tm_shaper_params)); - memset(&tnp, 0, sizeof(struct rte_tm_node_params)); - - shaper_profile_id = h->n_shapers; - - /* Private Shaper Profile (TC) Parameters */ - tsp.peak.rate = h->tc_node_shaper_rate; - tsp.peak.size = TOKEN_BUCKET_SIZE; - tsp.pkt_length_adjust = RTE_TM_ETH_FRAMING_OVERHEAD_FCS; - - /* Shared Shaper Profile (TC) Parameters */ - tssp.peak.rate = h->tc_node_shared_shaper_rate; - tssp.peak.size = TOKEN_BUCKET_SIZE; - tssp.pkt_length_adjust = RTE_TM_ETH_FRAMING_OVERHEAD_FCS; - - /* TC Node Parameters */ - weight = 1; - level_id = TM_NODE_LEVEL_TC; - tnp.n_shared_shapers = 1; - tnp.nonleaf.n_sp_priorities = 1; - tnp.stats_mask = STATS_MASK_DEFAULT; - - /* Add Shared Shaper Profiles to TM Hierarchy */ - for (i = 0; i < TC_NODES_PER_PIPE; i++) { - shared_shaper_profile_id[i] = shaper_profile_id; - - if (rte_tm_shaper_profile_add(port_id, - shared_shaper_profile_id[i], &tssp, error)) { - printf("%s ERROR(%d)-%s!(Shared shaper profileid %u)\n", - __func__, error->type, error->message, - shared_shaper_profile_id[i]); - - return -1; - } - if (rte_tm_shared_shaper_add_update(port_id, i, - shared_shaper_profile_id[i], error)) { - printf("%s ERROR(%d)-%s!(Shared shaper id %u)\n", - __func__, error->type, error->message, i); - - return -1; - } - shaper_profile_id++; - } - - /* Add Shaper Profiles and Nodes to TM Hierarchy */ - n_tc_nodes = 0; - for (i = 0; i < SUBPORT_NODES_PER_PORT; i++) { - for (j = 0; j < PIPE_NODES_PER_SUBPORT; j++) { - for (k = 0; k < TC_NODES_PER_PIPE ; k++) { - priority = k; - tc_parent_node_id = h->pipe_node_id[i][j]; - tnp.shared_shaper_id = - (uint32_t *)calloc(1, sizeof(uint32_t)); - if (tnp.shared_shaper_id == NULL) { - printf("Shared shaper mem alloc err\n"); - return -1; - } - tnp.shared_shaper_id[0] = k; - pos = j + (i * PIPE_NODES_PER_SUBPORT); - h->tc_node_id[pos][k] = - TC_NODES_START_ID + n_tc_nodes; - - if (rte_tm_shaper_profile_add(port_id, - shaper_profile_id, &tsp, error)) { - printf("%s ERROR(%d)-%s!(shaper %u)\n", - __func__, error->type, - error->message, - shaper_profile_id); - - free(tnp.shared_shaper_id); - return -1; - } - tnp.shaper_profile_id = shaper_profile_id; - if (rte_tm_node_add(port_id, - h->tc_node_id[pos][k], - tc_parent_node_id, - priority, weight, - level_id, - &tnp, error)) { - printf("%s ERROR(%d)-%s!(node id %u)\n", - __func__, - error->type, - error->message, - h->tc_node_id[pos][k]); - - free(tnp.shared_shaper_id); - return -1; - } - shaper_profile_id++; - n_tc_nodes++; - } - } - } - /* Update */ - h->n_shapers = shaper_profile_id; - - printf(" TC nodes added (Start id %u, Count %u, level %u)\n", - h->tc_node_id[0][0], n_tc_nodes, level_id); - - return 0; -} - -static int -softport_tm_queue_node_add(portid_t port_id, struct tm_hierarchy *h, - struct rte_tm_error *error) -{ - uint32_t queue_parent_node_id; - struct rte_tm_node_params qnp; - uint32_t priority, weight, level_id, pos; - uint32_t n_queue_nodes, i, j, k; - - memset(&qnp, 0, sizeof(struct rte_tm_node_params)); - - /* Queue Node Parameters */ - priority = 0; - weight = 1; - level_id = TM_NODE_LEVEL_QUEUE; - qnp.shaper_profile_id = RTE_TM_SHAPER_PROFILE_ID_NONE; - qnp.leaf.cman = RTE_TM_CMAN_TAIL_DROP; - qnp.stats_mask = STATS_MASK_QUEUE; - - /* Add Queue Nodes to TM Hierarchy */ - n_queue_nodes = 0; - for (i = 0; i < NUM_PIPE_NODES; i++) { - for (j = 0; j < TC_NODES_PER_PIPE; j++) { - queue_parent_node_id = h->tc_node_id[i][j]; - for (k = 0; k < QUEUE_NODES_PER_TC; k++) { - pos = j + (i * TC_NODES_PER_PIPE); - h->queue_node_id[pos][k] = n_queue_nodes; - if (rte_tm_node_add(port_id, - h->queue_node_id[pos][k], - queue_parent_node_id, - priority, - weight, - level_id, - &qnp, error)) { - printf("%s ERROR(%d)-%s!(node %u)\n", - __func__, - error->type, - error->message, - h->queue_node_id[pos][k]); - - return -1; - } - n_queue_nodes++; - } - } - } - printf(" Queue nodes added (Start id %u, Count %u, level %u)\n", - h->queue_node_id[0][0], n_queue_nodes, level_id); - - return 0; -} - -static int -softport_tm_hierarchy_specify(portid_t port_id, - struct rte_tm_error *error) -{ - - struct tm_hierarchy h; - int status; - - memset(&h, 0, sizeof(struct tm_hierarchy)); - - /* TM hierarchy shapers rate */ - status = set_tm_hiearchy_nodes_shaper_rate(port_id, &h); - if (status) - return status; - - /* Add root node (level 0) */ - status = softport_tm_root_node_add(port_id, &h, error); - if (status) - return status; - - /* Add subport node (level 1) */ - status = softport_tm_subport_node_add(port_id, &h, error); - if (status) - return status; - - /* Add pipe nodes (level 2) */ - status = softport_tm_pipe_node_add(port_id, &h, error); - if (status) - return status; - - /* Add traffic class nodes (level 3) */ - status = softport_tm_tc_node_add(port_id, &h, error); - if (status) - return status; - - /* Add queue nodes (level 4) */ - status = softport_tm_queue_node_add(port_id, &h, error); - if (status) - return status; - - return 0; -} - -/* - * Softnic TM default configuration - */ -static void -softnic_tm_default_config(portid_t pi) -{ - struct rte_port *port = &ports[pi]; - struct rte_tm_error error; - int status; - - /* Stop port */ - rte_eth_dev_stop(pi); - - /* TM hierarchy specification */ - status = softport_tm_hierarchy_specify(pi, &error); - if (status) { - printf(" TM Hierarchy built error(%d) - %s\n", - error.type, error.message); - return; - } - printf("\n TM Hierarchy Specified!\n"); - - /* TM hierarchy commit */ - status = rte_tm_hierarchy_commit(pi, 0, &error); - if (status) { - printf(" Hierarchy commit error(%d) - %s\n", - error.type, error.message); - return; - } - printf(" Hierarchy Committed (port %u)!\n", pi); - - /* Start port */ - status = rte_eth_dev_start(pi); - if (status) { - printf("\n Port %u start error!\n", pi); - return; - } - - /* Reset the default hierarchy flag */ - port->softport.default_tm_hierarchy_enable = 0; -} - -/* - * Softnic forwarding init - */ -static void -softnic_fwd_begin(portid_t pi) -{ - struct rte_port *port = &ports[pi]; - uint32_t lcore, fwd_core_present = 0, softnic_run_launch = 0; - int status; - - softnic_fwd_lcore = port->softport.fwd_lcore_arg[0]; - softnic_port_id = pi; - - /* Launch softnic_run function on lcores */ - for (lcore = 0; lcore < RTE_MAX_LCORE; lcore++) { - if (!rte_lcore_is_enabled(lcore)) - continue; - - if (lcore == rte_get_master_lcore()) - continue; - - if (fwd_core_present == 0) { - fwd_core_present++; - continue; - } - - status = rte_eal_remote_launch(softnic_begin, NULL, lcore); - if (status) - printf("softnic launch on lcore %u failed (%d)\n", - lcore, status); - - softnic_run_launch = 1; - } - - if (!softnic_run_launch) - softnic_fwd_engine.packet_fwd = softnic_fwd_run; - - /* Softnic TM default configuration */ - if (port->softport.default_tm_hierarchy_enable == 1) - softnic_tm_default_config(pi); -} - -struct fwd_engine softnic_fwd_engine = { - .fwd_mode_name = "softnic", - .port_fwd_begin = softnic_fwd_begin, - .port_fwd_end = NULL, - .packet_fwd = softnic_fwd, -}; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index f5feb62f8d..e7516673ba 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -179,9 +179,6 @@ struct fwd_engine * fwd_engines[] = { &csum_fwd_engine, &icmp_echo_engine, &noisy_vnf_engine, -#if defined RTE_LIBRTE_PMD_SOFTNIC - &softnic_fwd_engine, -#endif #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif @@ -1561,19 +1558,6 @@ init_config(void) "rte_gro_ctx_create() failed\n"); } } - -#if defined RTE_LIBRTE_PMD_SOFTNIC - if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) { - RTE_ETH_FOREACH_DEV(pid) { - port = &ports[pid]; - const char *driver = port->dev_info.driver_name; - - if (strcmp(driver, "net_softnic") == 0) - port->softport.fwd_lcore_arg = fwd_lcores; - } - } -#endif - } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index a803750937..c528db4500 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -58,12 +58,6 @@ typedef uint16_t portid_t; typedef uint16_t queueid_t; typedef uint16_t streamid_t; -#if defined RTE_LIBRTE_PMD_SOFTNIC -#define SOFTNIC 1 -#else -#define SOFTNIC 0 -#endif - enum { PORT_TOPOLOGY_PAIRED, PORT_TOPOLOGY_CHAINED, @@ -154,16 +148,6 @@ struct port_flow { uint8_t data[]; /**< Storage for flow rule description */ }; -#ifdef SOFTNIC -/** - * The data structure associate with softnic port - */ -struct softnic_port { - uint32_t default_tm_hierarchy_enable; /**< default tm hierarchy */ - struct fwd_lcore **fwd_lcore_arg; /**< softnic fwd core parameters */ -}; -#endif - /** * The data structure associated with each port. */ @@ -196,9 +180,6 @@ struct rte_port { struct port_flow *flow_list; /**< Associated flows. */ const struct rte_eth_rxtx_callback *rx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1]; const struct rte_eth_rxtx_callback *tx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1]; -#ifdef SOFTNIC - struct softnic_port softport; /**< softnic params */ -#endif /**< metadata value to insert in Tx packets. */ uint32_t tx_metadata; const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_QUEUES_PER_PORT+1]; @@ -266,9 +247,6 @@ extern struct fwd_engine tx_only_engine; extern struct fwd_engine csum_fwd_engine; extern struct fwd_engine icmp_echo_engine; extern struct fwd_engine noisy_vnf_engine; -#ifdef SOFTNIC -extern struct fwd_engine softnic_fwd_engine; -#endif #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index c8962d90b9..8f0dd53eac 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -82,29 +82,56 @@ Soft NIC device instance: #. ``tm_n_queues``: number of traffic manager's scheduler queues. The traffic manager is based on DPDK *librte_sched* library. (Optional: yes, Default value: 65,536 queues) -#. ``tm_qsize0``: size of scheduler queue 0 per traffic class of the pipes/subscribers. +#. ``tm_qsize0``: size of scheduler queue 0 (traffic class 0) of the pipes/subscribers. (Optional: yes, Default: 64) -#. ``tm_qsize1``: size of scheduler queue 1 per traffic class of the pipes/subscribers. +#. ``tm_qsize1``: size of scheduler queue 1 (traffic class 1) of the pipes/subscribers. (Optional: yes, Default: 64) -#. ``tm_qsize2``: size of scheduler queue 2 per traffic class of the pipes/subscribers. +#. ``tm_qsize2``: size of scheduler queue 2 (traffic class 2) of the pipes/subscribers. (Optional: yes, Default: 64) -#. ``tm_qsize3``: size of scheduler queue 3 per traffic class of the pipes/subscribers. +#. ``tm_qsize3``: size of scheduler queue 3 (traffic class 3) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize4``: size of scheduler queue 4 (traffic class 4) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize5``: size of scheduler queue 5 (traffic class 5) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize6``: size of scheduler queue 6 (traffic class 6) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize7``: size of scheduler queue 7 (traffic class 7) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize8``: size of scheduler queue 8 (traffic class 8) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize9``: size of scheduler queue 9 (traffic class 9) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize10``: size of scheduler queue 10 (traffic class 10) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize11``: size of scheduler queue 11 (traffic class 11) of the pipes/subscribers. + (Optional: yes, Default: 64) + +#. ``tm_qsize12``: size of scheduler queue 12 (traffic class 12) of the pipes/subscribers. (Optional: yes, Default: 64) Soft NIC testing ---------------- -* Run testpmd application in Soft NIC forwarding mode with loopback feature +* Run testpmd application with Soft NIC device with loopback feature enabled on Soft NIC port: .. code-block:: console - ./testpmd -c 0x3 --vdev 'net_softnic0,firmware=