net/cxgbe: remove legacy 16-bit link capabilities

[dpdk.git] / app / test-eventdev / test_perf_common.c

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index aa925a7..955edb7 100644 (file)
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -133,8 +133,9 @@ perf_event_timer_producer(void *arg)
        fflush(stdout);
        rte_delay_ms(1000);
        printf("%s(): lcore %d Average event timer arm latency = %.3f us\n",
-                       __func__, rte_lcore_id(), (float)(arm_latency / count) /
-                       (rte_get_timer_hz() / 1000000));
+                       __func__, rte_lcore_id(),
+                       count ? (float)(arm_latency / count) /
+                       (rte_get_timer_hz() / 1000000) : 0);
        return 0;
 }
 
@@ -194,8 +195,9 @@ perf_event_timer_producer_burst(void *arg)
        fflush(stdout);
        rte_delay_ms(1000);
        printf("%s(): lcore %d Average event timer arm latency = %.3f us\n",
-                       __func__, rte_lcore_id(), (float)(arm_latency / count) /
-                       (rte_get_timer_hz() / 1000000));
+                       __func__, rte_lcore_id(),
+                       count ? (float)(arm_latency / count) /
+                       (rte_get_timer_hz() / 1000000) : 0);
        return 0;
 }
 
@@ -252,7 +254,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
 
        int port_idx = 0;
        /* launch workers */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (!(opt->wlcores[lcore_id]))
                        continue;
 
@@ -266,7 +268,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
        }
 
        /* launch producers */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (!(opt->plcores[lcore_id]))
                        continue;
 
@@ -439,7 +441,7 @@ perf_event_timer_adapter_setup(struct test_perf *t)
 
                if (!(adapter_info.caps &
                                RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT)) {
-                       uint32_t service_id;
+                       uint32_t service_id = -1U;
 
                        rte_event_timer_adapter_service_id_get(wl,
                                        &service_id);
@@ -539,8 +541,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
 {
        unsigned int lcores;
 
-       /* N producer + N worker + 1 master when producer cores are used
-        * Else N worker + 1 master when Rx adapter is used
+       /* N producer + N worker + main when producer cores are used
+        * Else N worker + main when Rx adapter is used
         */
        lcores = opt->prod_type == EVT_PROD_TYPE_SYNT ? 3 : 2;
 
@@ -550,8 +552,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
        }
 
        /* Validate worker lcores */
-       if (evt_lcores_has_overlap(opt->wlcores, rte_get_master_lcore())) {
-               evt_err("worker lcores overlaps with master lcore");
+       if (evt_lcores_has_overlap(opt->wlcores, rte_get_main_lcore())) {
+               evt_err("worker lcores overlaps with main lcore");
                return -1;
        }
        if (evt_lcores_has_overlap_multi(opt->wlcores, opt->plcores)) {
@@ -571,8 +573,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
                        opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
                /* Validate producer lcores */
                if (evt_lcores_has_overlap(opt->plcores,
-                                       rte_get_master_lcore())) {
-                       evt_err("producer lcores overlaps with master lcore");
+                                       rte_get_main_lcore())) {
+                       evt_err("producer lcores overlaps with main lcore");
                        return -1;
                }
                if (evt_has_disabled_lcore(opt->plcores)) {
@@ -660,6 +662,7 @@ int
 perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
 {
        uint16_t i;
+       int ret;
        struct test_perf *t = evt_test_priv(test);
        struct rte_eth_conf port_conf = {
                .rxmode = {
@@ -688,7 +691,12 @@ perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
                struct rte_eth_dev_info dev_info;
                struct rte_eth_conf local_port_conf = port_conf;
 
-               rte_eth_dev_info_get(i, &dev_info);
+               ret = rte_eth_dev_info_get(i, &dev_info);
+               if (ret != 0) {
+                       evt_err("Error during getting device (port %u) info: %s\n",
+                                       i, strerror(-ret));
+                       return ret;
+               }
 
                local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
                        dev_info.flow_type_rss_offloads;
@@ -720,7 +728,12 @@ perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
                        return -EINVAL;
                }
 
-               rte_eth_promiscuous_enable(i);
+               ret = rte_eth_promiscuous_enable(i);
+               if (ret != 0) {
+                       evt_err("Failed to enable promiscuous mode for eth port [%d]: %s",
+                               i, rte_strerror(-ret));
+                       return ret;
+               }
        }
 
        return 0;