X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Ftestpmd.c;h=6f71bdb5b1884819f223ebca7fce248aa8549d61;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=d4226ddff7aa1bc0fda1eef81db7a51a60859f49;hpb=013af9b6b64f6e72aed00aead63c2842c7c4ff4f;p=dpdk.git diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index d4226ddff7..6f71bdb5b1 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include @@ -73,13 +72,18 @@ #include #include #include +#ifdef RTE_LIBRTE_PMD_XENVIRT +#include +#endif #include "testpmd.h" +#include "mempool_osdep.h" uint16_t verbose_level = 0; /**< Silent by default. */ /* use master core for command line ? */ uint8_t interactive = 0; +uint8_t auto_start = 0; /* * NUMA support configuration. @@ -90,6 +94,17 @@ uint8_t interactive = 0; */ uint8_t numa_support = 0; /**< No numa support by default */ +/* + * In UMA mode,all memory is allocated from socket 0 if --socket-num is + * not configured. + */ +uint8_t socket_num = UMA_NO_CONFIG; + +/* + * Use ANONYMOUS mapped memory (might be not physically continuous) for mbufs. + */ +uint8_t mp_anon = 0; + /* * Record the Ethernet address of peer target ports to which packets are * forwarded. @@ -129,9 +144,13 @@ streamid_t nb_fwd_streams; /**< Is equal to (nb_ports * nb_rxq). */ struct fwd_engine * fwd_engines[] = { &io_fwd_engine, &mac_fwd_engine, + &mac_retry_fwd_engine, + &mac_swap_engine, + &flow_gen_engine, &rx_only_engine, &tx_only_engine, &csum_fwd_engine, + &icmp_echo_engine, #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif @@ -159,10 +178,10 @@ uint16_t mb_mempool_cache = DEF_PKT_BURST; /**< Size of mbuf mempool cache. */ /* current configuration is in DCB or not,0 means it is not in DCB mode */ uint8_t dcb_config = 0; - + /* Whether the dcb is in testing status */ uint8_t dcb_test = 0; - + /* DCB on and VT on mapping is default */ enum dcb_queue_mapping_mode dcb_q_mapping = DCB_VT_Q_MAPPING; @@ -238,6 +257,26 @@ uint16_t rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6; /* RSS IP by default. */ */ uint16_t port_topology = PORT_TOPOLOGY_PAIRED; /* Ports are paired by default */ +/* + * Avoids to flush all the RX streams before starts forwarding. + */ +uint8_t no_flush_rx = 0; /* flush by default */ + +/* + * Avoids to check link status when starting/stopping a port. + */ +uint8_t no_link_check = 0; /* check by default */ + +/* + * NIC bypass mode configuration options. + */ +#ifdef RTE_NIC_BYPASS + +/* The NIC bypass watchdog timeout. */ +uint32_t bypass_timeout = RTE_BYPASS_TMT_OFF; + +#endif + /* * Ethernet device configuration. */ @@ -359,6 +398,7 @@ testpmd_mbuf_ctor(struct rte_mempool *mp, mb_ctor_arg = (struct mbuf_ctor_arg *) opaque_arg; mb = (struct rte_mbuf *) raw_mbuf; + mb->type = RTE_MBUF_PKT; mb->pool = mp; mb->buf_addr = (void *) ((char *)mb + mb_ctor_arg->seg_buf_offset); mb->buf_physaddr = (uint64_t) (rte_mempool_virt2phy(mp, mb) + @@ -386,8 +426,7 @@ testpmd_mbuf_pool_ctor(struct rte_mempool *mp, return; } mbp_ctor_arg = (struct mbuf_pool_ctor_arg *) opaque_arg; - mbp_priv = (struct rte_pktmbuf_pool_private *) - ((char *)mp + sizeof(struct rte_mempool)); + mbp_priv = rte_mempool_get_priv(mp); mbp_priv->mbuf_data_room_size = mbp_ctor_arg->seg_buf_size; } @@ -408,18 +447,64 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf, mb_ctor_arg.seg_buf_size = mbp_ctor_arg.seg_buf_size; mb_size = mb_ctor_arg.seg_buf_offset + mb_ctor_arg.seg_buf_size; mbuf_poolname_build(socket_id, pool_name, sizeof(pool_name)); - rte_mp = rte_mempool_create(pool_name, nb_mbuf, (unsigned) mb_size, + +#ifdef RTE_LIBRTE_PMD_XENVIRT + rte_mp = rte_mempool_gntalloc_create(pool_name, nb_mbuf, mb_size, + (unsigned) mb_mempool_cache, + sizeof(struct rte_pktmbuf_pool_private), + testpmd_mbuf_pool_ctor, &mbp_ctor_arg, + testpmd_mbuf_ctor, &mb_ctor_arg, + socket_id, 0); + + + +#else + if (mp_anon != 0) + rte_mp = mempool_anon_create(pool_name, nb_mbuf, mb_size, + (unsigned) mb_mempool_cache, + sizeof(struct rte_pktmbuf_pool_private), + testpmd_mbuf_pool_ctor, &mbp_ctor_arg, + testpmd_mbuf_ctor, &mb_ctor_arg, + socket_id, 0); + else + rte_mp = rte_mempool_create(pool_name, nb_mbuf, mb_size, (unsigned) mb_mempool_cache, sizeof(struct rte_pktmbuf_pool_private), testpmd_mbuf_pool_ctor, &mbp_ctor_arg, testpmd_mbuf_ctor, &mb_ctor_arg, socket_id, 0); + +#endif + if (rte_mp == NULL) { rte_exit(EXIT_FAILURE, "Creation of mbuf pool for socket %u " "failed\n", socket_id); + } else if (verbose_level > 0) { + rte_mempool_dump(stdout, rte_mp); } } +/* + * Check given socket id is valid or not with NUMA mode, + * if valid, return 0, else return -1 + */ +static int +check_socket_id(const unsigned int socket_id) +{ + static int warning_once = 0; + + if (socket_id >= MAX_SOCKET) { + if (!warning_once && numa_support) + printf("Warning: NUMA should be configured manually by" + " using --port-numa-config and" + " --ring-numa-config parameters along with" + " --numa.\n"); + warning_once = 1; + return -1; + } + return 0; +} + static void init_config(void) { @@ -428,7 +513,9 @@ init_config(void) struct rte_mempool *mbp; unsigned int nb_mbuf_per_pool; lcoreid_t lc_id; + uint8_t port_per_socket[MAX_SOCKET]; + memset(port_per_socket,0,MAX_SOCKET); /* Configuration of logical cores. */ fwd_lcores = rte_zmalloc("testpmd: fwd_lcores", sizeof(struct fwd_lcore *) * nb_lcores, @@ -451,7 +538,7 @@ init_config(void) /* * Create pools of mbuf. * If NUMA support is disabled, create a single pool of mbuf in - * socket 0 memory. + * socket 0 memory by default. * Otherwise, create a pool of mbuf in the memory of sockets 0 and 1. * * Use the maximum value of nb_rxd and nb_txd here, then nb_rxd and @@ -462,24 +549,17 @@ init_config(void) else { nb_mbuf_per_pool = RTE_TEST_RX_DESC_MAX + (nb_lcores * mb_mempool_cache) + RTE_TEST_TX_DESC_MAX + MAX_PKT_BURST; - nb_mbuf_per_pool = (nb_mbuf_per_pool * nb_ports); - } - if (numa_support) { - nb_mbuf_per_pool /= 2; - mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 0); - mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 1); - } else { - mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 0); + + if (!numa_support) + nb_mbuf_per_pool = (nb_mbuf_per_pool * nb_ports); } - /* - * Records which Mbuf pool to use by each logical core, if needed. - */ - for (lc_id = 0; lc_id < nb_lcores; lc_id++) { - mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id)); - if (mbp == NULL) - mbp = mbuf_pool_find(0); - fwd_lcores[lc_id]->mbp = mbp; + if (!numa_support) { + if (socket_num == UMA_NO_CONFIG) + mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 0); + else + mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, + socket_num); } /* Configuration of Ethernet ports. */ @@ -495,13 +575,51 @@ init_config(void) port = &ports[pid]; rte_eth_dev_info_get(pid, &port->dev_info); + if (numa_support) { + if (port_numa[pid] != NUMA_NO_CONFIG) + port_per_socket[port_numa[pid]]++; + else { + uint32_t socket_id = rte_eth_dev_socket_id(pid); + + /* if socket_id is invalid, set to 0 */ + if (check_socket_id(socket_id) < 0) + socket_id = 0; + port_per_socket[socket_id]++; + } + } + /* set flag to initialize port/queue */ port->need_reconfig = 1; port->need_reconfig_queues = 1; } + if (numa_support) { + uint8_t i; + unsigned int nb_mbuf; + + if (param_total_num_mbufs) + nb_mbuf_per_pool = nb_mbuf_per_pool/nb_ports; + + for (i = 0; i < MAX_SOCKET; i++) { + nb_mbuf = (nb_mbuf_per_pool * + port_per_socket[i]); + if (nb_mbuf) + mbuf_pool_create(mbuf_data_size, + nb_mbuf,i); + } + } init_port_config(); + /* + * Records which Mbuf pool to use by each logical core, if needed. + */ + for (lc_id = 0; lc_id < nb_lcores; lc_id++) { + mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id)); + if (mbp == NULL) + mbp = mbuf_pool_find(0); + fwd_lcores[lc_id]->mbp = mbp; + } + /* Configuration of packet forwarding streams. */ if (init_fwd_streams() < 0) rte_exit(EXIT_FAILURE, "FAIL from init_fwd_streams()\n"); @@ -529,10 +647,23 @@ init_fwd_streams(void) port->dev_info.max_tx_queues); return -1; } - if (numa_support) - port->socket_id = (pid < (nb_ports >> 1)) ? 0 : 1; - else - port->socket_id = 0; + if (numa_support) { + if (port_numa[pid] != NUMA_NO_CONFIG) + port->socket_id = port_numa[pid]; + else { + port->socket_id = rte_eth_dev_socket_id(pid); + + /* if socket_id is invalid, set to 0 */ + if (check_socket_id(port->socket_id) < 0) + port->socket_id = 0; + } + } + else { + if (socket_num == UMA_NO_CONFIG) + port->socket_id = 0; + else + port->socket_id = socket_num; + } } nb_fwd_streams_new = (streamid_t)(nb_ports * nb_rxq); @@ -673,6 +804,16 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats) if (stats->rx_nombuf > 0) printf(" RX-nombufs:%14"PRIu64"\n", stats->rx_nombuf); } + + /* Display statistics of XON/XOFF pause frames, if any. */ + if ((stats->tx_pause_xon | stats->rx_pause_xon | + stats->tx_pause_xoff | stats->rx_pause_xoff) > 0) { + printf(" RX-XOFF: %-14"PRIu64" RX-XON: %-14"PRIu64"\n", + stats->rx_pause_xoff, stats->rx_pause_xon); + printf(" TX-XOFF: %-14"PRIu64" TX-XON: %-14"PRIu64"\n", + stats->tx_pause_xoff, stats->tx_pause_xon); + } + #ifdef RTE_TEST_PMD_RECORD_BURST_STATS if (port->rx_stream) pkt_burst_stats_display("RX", @@ -739,20 +880,22 @@ fwd_stream_stats_display(streamid_t stream_id) } static void -flush_all_rx_queues(void) +flush_fwd_rx_queues(void) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; portid_t rxp; + portid_t port_id; queueid_t rxq; uint16_t nb_rx; uint16_t i; uint8_t j; for (j = 0; j < 2; j++) { - for (rxp = 0; rxp < nb_ports; rxp++) { + for (rxp = 0; rxp < cur_fwd_config.nb_fwd_ports; rxp++) { for (rxq = 0; rxq < nb_rxq; rxq++) { + port_id = fwd_ports_ids[rxp]; do { - nb_rx = rte_eth_rx_burst(rxp, rxq, + nb_rx = rte_eth_rx_burst(port_id, rxq, pkts_burst, MAX_PKT_BURST); for (i = 0; i < nb_rx; i++) rte_pktmbuf_free(pkts_burst[i]); @@ -855,12 +998,27 @@ start_packet_forwarding(int with_tx_first) printf("Packet forwarding already started\n"); return; } - if((dcb_test) && (nb_fwd_lcores == 1)) { - printf("In DCB mode,the nb forwarding cores should be larger than 1.\n"); - return; + if(dcb_test) { + for (i = 0; i < nb_fwd_ports; i++) { + pt_id = fwd_ports_ids[i]; + port = &ports[pt_id]; + if (!port->dcb_flag) { + printf("In DCB mode, all forwarding ports must " + "be configured in this mode.\n"); + return; + } + } + if (nb_fwd_lcores == 1) { + printf("In DCB mode,the nb forwarding cores " + "should be larger than 1.\n"); + return; + } } test_done = 0; - flush_all_rx_queues(); + + if(!no_flush_rx) + flush_fwd_rx_queues(); + fwd_config_setup(); rxtx_config_display(); @@ -993,7 +1151,7 @@ stop_packet_forwarding(void) total_rx_dropped = 0; total_tx_dropped = 0; total_rx_nombuf = 0; - for (i = 0; i < ((cur_fwd_config.nb_fwd_ports + 1) & ~0x1); i++) { + for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { pt_id = fwd_ports_ids[i]; port = &ports[pt_id]; @@ -1067,24 +1225,25 @@ all_ports_started(void) return 1; } -void +int start_port(portid_t pid) { int diag, need_check_link_status = 0; portid_t pi; queueid_t qi; struct rte_port *port; + uint8_t *mac_addr; if (test_done == 0) { printf("Please stop forwarding first\n"); - return; + return -1; } if (init_fwd_streams() < 0) { printf("Fail from init_fwd_streams()\n"); - return; + return -1; } - + if(dcb_config) dcb_test = 1; for (pi = 0; pi < nb_ports; pi++) { @@ -1101,7 +1260,8 @@ start_port(portid_t pid) if (port->need_reconfig > 0) { port->need_reconfig = 0; - printf("Configuring Port %d\n", pi); + printf("Configuring Port %d (socket %u)\n", pi, + port->socket_id); /* configure port */ diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq, &(port->dev_conf)); @@ -1113,17 +1273,23 @@ start_port(portid_t pid) printf("Fail to configure port %d\n", pi); /* try to reconfigure port next time */ port->need_reconfig = 1; - return; + return -1; } } - if (port->need_reconfig_queues > 0) { port->need_reconfig_queues = 0; - /* setup tx queues */ for (qi = 0; qi < nb_txq; qi++) { - diag = rte_eth_tx_queue_setup(pi, qi, nb_txd, - port->socket_id, &(port->tx_conf)); + if ((numa_support) && + (txring_numa[pi] != NUMA_NO_CONFIG)) + diag = rte_eth_tx_queue_setup(pi, qi, + nb_txd,txring_numa[pi], + &(port->tx_conf)); + else + diag = rte_eth_tx_queue_setup(pi, qi, + nb_txd,port->socket_id, + &(port->tx_conf)); + if (diag == 0) continue; @@ -1136,16 +1302,36 @@ start_port(portid_t pid) printf("Fail to configure port %d tx queues\n", pi); /* try to reconfigure queues next time */ port->need_reconfig_queues = 1; - return; + return -1; } /* setup rx queues */ for (qi = 0; qi < nb_rxq; qi++) { - diag = rte_eth_rx_queue_setup(pi, qi, nb_rxd, - port->socket_id, &(port->rx_conf), - mbuf_pool_find(port->socket_id)); + if ((numa_support) && + (rxring_numa[pi] != NUMA_NO_CONFIG)) { + struct rte_mempool * mp = + mbuf_pool_find(rxring_numa[pi]); + if (mp == NULL) { + printf("Failed to setup RX queue:" + "No mempool allocation" + "on the socket %d\n", + rxring_numa[pi]); + return -1; + } + + diag = rte_eth_rx_queue_setup(pi, qi, + nb_rxd,rxring_numa[pi], + &(port->rx_conf),mp); + } + else + diag = rte_eth_rx_queue_setup(pi, qi, + nb_rxd,port->socket_id, + &(port->rx_conf), + mbuf_pool_find(port->socket_id)); + if (diag == 0) continue; + /* Fail to setup rx queue, return */ if (rte_atomic16_cmpset(&(port->port_status), RTE_PORT_HANDLING, @@ -1155,10 +1341,9 @@ start_port(portid_t pid) printf("Fail to configure port %d rx queues\n", pi); /* try to reconfigure queues next time */ port->need_reconfig_queues = 1; - return; + return -1; } } - /* start port */ if (rte_eth_dev_start(pi) < 0) { printf("Fail to start port %d\n", pi); @@ -1175,16 +1360,22 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0) printf("Port %d can not be set into started\n", pi); + mac_addr = port->eth_addr.addr_bytes; + printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi, + mac_addr[0], mac_addr[1], mac_addr[2], + mac_addr[3], mac_addr[4], mac_addr[5]); + /* at least one port started, need checking link status */ need_check_link_status = 1; } - if (need_check_link_status) + if (need_check_link_status && !no_link_check) check_all_ports_link_status(nb_ports, RTE_PORT_ALL); else printf("Please stop the ports first\n"); printf("Done\n"); + return 0; } void @@ -1220,7 +1411,7 @@ stop_port(portid_t pid) printf("Port %d can not be set into stopped\n", pi); need_check_link_status = 1; } - if (need_check_link_status) + if (need_check_link_status && !no_link_check) check_all_ports_link_status(nb_ports, RTE_PORT_ALL); printf("Done\n"); @@ -1438,13 +1629,22 @@ init_port_config(void) port = &ports[pid]; port->dev_conf.rxmode = rx_mode; port->dev_conf.fdir_conf = fdir_conf; - if (nb_rxq > 0) { + if (nb_rxq > 1) { port->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL; port->dev_conf.rx_adv_conf.rss_conf.rss_hf = rss_hf; } else { port->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL; port->dev_conf.rx_adv_conf.rss_conf.rss_hf = 0; } + + /* In SR-IOV mode, RSS mode is not available */ + if (port->dcb_flag == 0 && port->dev_info.max_vfs == 0) { + if( port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0) + port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_RSS; + else + port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_NONE; + } + port->rx_conf.rx_thresh = rx_thresh; port->rx_conf.rx_free_thresh = rx_free_thresh; port->rx_conf.rx_drop_en = rx_drop_en; @@ -1456,6 +1656,9 @@ init_port_config(void) rte_eth_macaddr_get(pid, &port->eth_addr); map_port_queue_stats_mapping_registers(pid, port); +#ifdef RTE_NIC_BYPASS + rte_eth_dev_bypass_init(pid); +#endif } } @@ -1470,7 +1673,7 @@ static int get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf) { uint8_t i; - + /* * Builds up the correct configuration for dcb+vt based on the vlan tags array * given above, and the number of traffic classes available for use. @@ -1478,7 +1681,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf) if (dcb_conf->dcb_mode == DCB_VT_ENABLED) { struct rte_eth_vmdq_dcb_conf vmdq_rx_conf; struct rte_eth_vmdq_dcb_tx_conf vmdq_tx_conf; - + /* VMDQ+DCB RX and TX configrations */ vmdq_rx_conf.enable_default_pool = 0; vmdq_rx_conf.default_pool = 0; @@ -1486,7 +1689,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf) (dcb_conf->num_tcs == ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS); vmdq_tx_conf.nb_queue_pools = (dcb_conf->num_tcs == ETH_4_TCS ? ETH_32_POOLS : ETH_16_POOLS); - + vmdq_rx_conf.nb_pool_maps = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]); for (i = 0; i < vmdq_rx_conf.nb_pool_maps; i++) { vmdq_rx_conf.pool_map[i].vlan_id = vlan_tags[ i ]; @@ -1496,15 +1699,15 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf) vmdq_rx_conf.dcb_queue[i] = i; vmdq_tx_conf.dcb_queue[i] = i; } - + /*set DCB mode of RX and TX of multiple queues*/ - eth_conf->rxmode.mq_mode = ETH_VMDQ_DCB; - eth_conf->txmode.mq_mode = ETH_VMDQ_DCB_TX; + eth_conf->rxmode.mq_mode = ETH_MQ_RX_VMDQ_DCB; + eth_conf->txmode.mq_mode = ETH_MQ_TX_VMDQ_DCB; if (dcb_conf->pfc_en) eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT; else eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT; - + (void)(rte_memcpy(ð_conf->rx_adv_conf.vmdq_dcb_conf, &vmdq_rx_conf, sizeof(struct rte_eth_vmdq_dcb_conf))); (void)(rte_memcpy(ð_conf->tx_adv_conf.vmdq_dcb_tx_conf, &vmdq_tx_conf, @@ -1513,27 +1716,27 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf) else { struct rte_eth_dcb_rx_conf rx_conf; struct rte_eth_dcb_tx_conf tx_conf; - + /* queue mapping configuration of DCB RX and TX */ if (dcb_conf->num_tcs == ETH_4_TCS) dcb_q_mapping = DCB_4_TCS_Q_MAPPING; else dcb_q_mapping = DCB_8_TCS_Q_MAPPING; - + rx_conf.nb_tcs = dcb_conf->num_tcs; tx_conf.nb_tcs = dcb_conf->num_tcs; - + for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++){ rx_conf.dcb_queue[i] = i; tx_conf.dcb_queue[i] = i; } - eth_conf->rxmode.mq_mode = ETH_DCB_RX; - eth_conf->txmode.mq_mode = ETH_DCB_TX; + eth_conf->rxmode.mq_mode = ETH_MQ_RX_DCB; + eth_conf->txmode.mq_mode = ETH_MQ_TX_DCB; if (dcb_conf->pfc_en) eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT|ETH_DCB_PFC_SUPPORT; else eth_conf->dcb_capability_en = ETH_DCB_PG_SUPPORT; - + (void)(rte_memcpy(ð_conf->rx_adv_conf.dcb_rx_conf, &rx_conf, sizeof(struct rte_eth_dcb_rx_conf))); (void)(rte_memcpy(ð_conf->tx_adv_conf.dcb_tx_conf, &tx_conf, @@ -1551,25 +1754,25 @@ init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf) int retval; uint16_t nb_vlan; uint16_t i; - + /* rxq and txq configuration in dcb mode */ nb_rxq = 128; nb_txq = 128; rx_free_thresh = 64; - + memset(&port_conf,0,sizeof(struct rte_eth_conf)); /* Enter DCB configuration status */ dcb_config = 1; - + nb_vlan = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]); /*set configuration of DCB in vt mode and DCB in non-vt mode*/ retval = get_eth_dcb_conf(&port_conf, dcb_conf); if (retval < 0) return retval; - + rte_port = &ports[pid]; memcpy(&rte_port->dev_conf, &port_conf,sizeof(struct rte_eth_conf)); - + rte_port->rx_conf.rx_thresh = rx_thresh; rte_port->rx_conf.rx_free_thresh = rx_free_thresh; rte_port->tx_conf.tx_thresh = tx_thresh; @@ -1580,10 +1783,12 @@ init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf) for (i = 0; i < nb_vlan; i++){ rx_vft_set(pid, vlan_tags[i], 1); } - + rte_eth_macaddr_get(pid, &rte_port->eth_addr); map_port_queue_stats_mapping_registers(pid, rte_port); - + + rte_port->dcb_flag = 1; + return 0; } @@ -1601,9 +1806,6 @@ main(int argc, char** argv) if (diag < 0) rte_panic("Cannot init EAL\n"); - if (rte_pmd_init_all()) - rte_panic("Cannot init PMD\n"); - if (rte_eal_pci_probe()) rte_panic("Cannot probe PCI\n"); @@ -1632,15 +1834,23 @@ main(int argc, char** argv) nb_rxq, nb_txq); init_config(); - start_port(RTE_PORT_ALL); + if (start_port(RTE_PORT_ALL) != 0) + rte_exit(EXIT_FAILURE, "Start ports failed\n"); /* set all ports to promiscuous mode by default */ for (port_id = 0; port_id < nb_ports; port_id++) rte_eth_promiscuous_enable(port_id); - if (interactive == 1) +#ifdef RTE_LIBRTE_CMDLINE + if (interactive == 1) { + if (auto_start) { + printf("Start automatic packet forwarding\n"); + start_packet_forwarding(0); + } prompt(); - else { + } else +#endif + { char c; int rc;