vdpa/sfc: get max supported queue count

[dpdk.git] / app / test / test_pmd_perf.c

diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index 352cd47..1df86ce 100644 (file)
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -62,12 +62,11 @@ static struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
 
 static struct rte_eth_conf port_conf = {
        .rxmode = {
-               .mq_mode = ETH_MQ_RX_NONE,
-               .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
+               .mq_mode = RTE_ETH_MQ_RX_NONE,
                .split_hdr_size = 0,
        },
        .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
+               .mq_mode = RTE_ETH_MQ_TX_NONE,
        },
        .lpbk_mode = 1,  /* enable loopback */
 };
@@ -126,6 +125,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
        int ret;
+       char link_status[RTE_ETH_LINK_MAX_STR_LEN];
 
        printf("Checking link statuses...\n");
        fflush(stdout);
@@ -146,20 +146,16 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 
                        /* print link status if flag set */
                        if (print_flag == 1) {
-                               if (link.link_status) {
-                                       printf(
-                                       "Port%d Link Up. Speed %u Mbps - %s\n",
-                                               portid, link.link_speed,
-                               (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                                       ("full-duplex") : ("half-duplex"));
-                                       if (link_mbps == 0)
-                                               link_mbps = link.link_speed;
-                               } else
-                                       printf("Port %d Link Down\n", portid);
+                               if (link.link_status && link_mbps == 0)
+                                       link_mbps = link.link_speed;
+
+                               rte_eth_link_to_str(link_status,
+                                       sizeof(link_status), &link);
+                               printf("Port %d %s\n", portid, link_status);
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == ETH_LINK_DOWN) {
+                       if (link.link_status == RTE_ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -278,7 +274,7 @@ alloc_lcore(uint16_t socketid)
        for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
                if (LCORE_AVAIL != lcore_conf[lcore_id].status ||
                    lcore_conf[lcore_id].socketid != socketid ||
-                   lcore_id == rte_get_master_lcore())
+                   lcore_id == rte_get_main_lcore())
                        continue;
                lcore_conf[lcore_id].status = LCORE_USED;
                lcore_conf[lcore_id].nb_ports = 0;
@@ -609,10 +605,10 @@ timeout:
 static int
 exec_burst(uint32_t flags, int lcore)
 {
-       unsigned i, portid, nb_tx = 0;
+       unsigned int portid, nb_tx = 0;
        struct lcore_conf *conf;
        uint32_t pkt_per_port;
-       int num, idx = 0;
+       int num, i, idx = 0;
        int diff_tsc;
 
        conf = &lcore_conf[lcore];
@@ -631,16 +627,14 @@ exec_burst(uint32_t flags, int lcore)
                rte_atomic64_set(&start, 1);
 
        /* start xmit */
+       i = 0;
        while (num) {
                nb_tx = RTE_MIN(MAX_PKT_BURST, num);
-               for (i = 0; i < conf->nb_ports; i++) {
-                       portid = conf->portlist[i];
-                       nb_tx = rte_eth_tx_burst(portid, 0,
-                                        &tx_burst[idx], nb_tx);
-                       idx += nb_tx;
-                       num -= nb_tx;
-               }
-
+               portid = conf->portlist[i];
+               nb_tx = rte_eth_tx_burst(portid, 0, &tx_burst[idx], nb_tx);
+               idx += nb_tx;
+               num -= nb_tx;
+               i = (i >= conf->nb_ports - 1) ? 0 : (i + 1);
        }
 
        sleep(5);
@@ -664,7 +658,7 @@ exec_burst(uint32_t flags, int lcore)
 static int
 test_pmd_perf(void)
 {
-       uint16_t nb_ports, num, nb_lcores, slave_id = (uint16_t)-1;
+       uint16_t nb_ports, num, nb_lcores, worker_id = (uint16_t)-1;
        uint16_t nb_rxd = MAX_TRAFFIC_BURST;
        uint16_t nb_txd = MAX_TRAFFIC_BURST;
        uint16_t portid;
@@ -702,13 +696,13 @@ test_pmd_perf(void)
        RTE_ETH_FOREACH_DEV(portid) {
                if (socketid == -1) {
                        socketid = rte_eth_dev_socket_id(portid);
-                       slave_id = alloc_lcore(socketid);
-                       if (slave_id == (uint16_t)-1) {
+                       worker_id = alloc_lcore(socketid);
+                       if (worker_id == (uint16_t)-1) {
                                printf("No avail lcore to run test\n");
                                return -1;
                        }
                        printf("Performance test runs on lcore %u socket %u\n",
-                              slave_id, socketid);
+                              worker_id, socketid);
                }
 
                if (socketid != rte_eth_dev_socket_id(portid)) {
@@ -765,8 +759,8 @@ test_pmd_perf(void)
                                 "rte_eth_promiscuous_enable: err=%s, port=%d\n",
                                 rte_strerror(-ret), portid);
 
-               lcore_conf[slave_id].portlist[num++] = portid;
-               lcore_conf[slave_id].nb_ports++;
+               lcore_conf[worker_id].portlist[num++] = portid;
+               lcore_conf[worker_id].nb_ports++;
        }
        check_all_ports_link_status(nb_ports, RTE_PORT_ALL);
 
@@ -791,13 +785,13 @@ test_pmd_perf(void)
                if (NULL == do_measure)
                        do_measure = measure_rxtx;
 
-               rte_eal_remote_launch(main_loop, NULL, slave_id);
+               rte_eal_remote_launch(main_loop, NULL, worker_id);
 
-               if (rte_eal_wait_lcore(slave_id) < 0)
+               if (rte_eal_wait_lcore(worker_id) < 0)
                        return -1;
        } else if (sc_flag == SC_BURST_POLL_FIRST ||
                   sc_flag == SC_BURST_XMIT_FIRST)
-               if (exec_burst(sc_flag, slave_id) < 0)
+               if (exec_burst(sc_flag, worker_id) < 0)
                        return -1;
 
        /* port tear down */
@@ -805,7 +799,10 @@ test_pmd_perf(void)
                if (socketid != rte_eth_dev_socket_id(portid))
                        continue;
 
-               rte_eth_dev_stop(portid);
+               ret = rte_eth_dev_stop(portid);
+               if (ret != 0)
+                       printf("rte_eth_dev_stop: err=%s, port=%u\n",
+                              rte_strerror(-ret), portid);
        }
 
        return 0;
@@ -825,7 +822,7 @@ test_set_rxtx_conf(cmdline_fixed_string_t mode)
                /* bulk alloc rx, full-featured tx */
                tx_conf.tx_rs_thresh = 32;
                tx_conf.tx_free_thresh = 32;
-               port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+               port_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_CHECKSUM;
                return 0;
        } else if (!strcmp(mode, "hybrid")) {
                /* bulk alloc rx, vector tx
@@ -834,13 +831,13 @@ test_set_rxtx_conf(cmdline_fixed_string_t mode)
                 */
                tx_conf.tx_rs_thresh = 32;
                tx_conf.tx_free_thresh = 32;
-               port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+               port_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_CHECKSUM;
                return 0;
        } else if (!strcmp(mode, "full")) {
                /* full feature rx,tx pair */
                tx_conf.tx_rs_thresh = 32;
                tx_conf.tx_free_thresh = 32;
-               port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER;
+               port_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_SCATTER;
                return 0;
        }