app/testpmd: fix use of indirect action after port close
[dpdk.git] / app / test-eventdev / test_perf_atq.c
index 0e9f2db..5436a9b 100644 (file)
@@ -1,47 +1,20 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium, Inc 2017.
- *
- *   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
- *       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
- *       distribution.
- *     * Neither the name of Cavium, Inc 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
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
 
 #include "test_perf_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline int
 atq_nb_event_queues(struct evt_options *opt)
 {
        /* nb_queues = number of producers */
-       return evt_nr_active_lcores(opt->plcores);
+       return opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ?
+               rte_eth_dev_count_avail() : evt_nr_active_lcores(opt->plcores);
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 atq_mark_fwd_latency(struct rte_event *const ev)
 {
        if (unlikely(ev->sub_event_type == 0)) {
@@ -51,7 +24,7 @@ atq_mark_fwd_latency(struct rte_event *const ev)
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 atq_fwd_event(struct rte_event *const ev, uint8_t *const sched_type_list,
                const uint8_t nb_stages)
 {
@@ -64,21 +37,37 @@ atq_fwd_event(struct rte_event *const ev, uint8_t *const sched_type_list,
 static int
 perf_atq_worker(void *arg, const int enable_fwd_latency)
 {
-       PERF_WORKER_INIT;
+       uint16_t enq = 0, deq = 0;
        struct rte_event ev;
+       PERF_WORKER_INIT;
 
        while (t->done == false) {
-               uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0);
-
-               if (enable_fwd_latency)
-                       rte_prefetch0(ev.event_ptr);
+               deq = rte_event_dequeue_burst(dev, port, &ev, 1, 0);
 
-               if (!event) {
+               if (!deq) {
                        rte_pause();
                        continue;
                }
 
-               if (enable_fwd_latency)
+               if (prod_crypto_type &&
+                   (ev.event_type == RTE_EVENT_TYPE_CRYPTODEV)) {
+                       struct rte_crypto_op *op = ev.event_ptr;
+
+                       if (op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) {
+                               if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
+                                       if (op->sym->m_dst == NULL)
+                                               ev.event_ptr = op->sym->m_src;
+                                       else
+                                               ev.event_ptr = op->sym->m_dst;
+                                       rte_crypto_op_free(op);
+                               }
+                       } else {
+                               rte_crypto_op_free(op);
+                               continue;
+                       }
+               }
+
+               if (enable_fwd_latency && !prod_timer_type)
                /* first stage in pipeline, mark ts to compute fwd latency */
                        atq_mark_fwd_latency(&ev);
 
@@ -92,24 +81,29 @@ perf_atq_worker(void *arg, const int enable_fwd_latency)
                                         bufs, sz, cnt);
                } else {
                        atq_fwd_event(&ev, sched_type_list, nb_stages);
-                       while (rte_event_enqueue_burst(dev, port, &ev, 1) != 1)
-                               rte_pause();
+                       do {
+                               enq = rte_event_enqueue_burst(dev, port, &ev,
+                                                             1);
+                       } while (!enq && !t->done);
                }
        }
+
+       perf_worker_cleanup(pool, dev, port, &ev, enq, deq);
+
        return 0;
 }
 
 static int
 perf_atq_worker_burst(void *arg, const int enable_fwd_latency)
 {
-       PERF_WORKER_INIT;
-       uint16_t i;
        /* +1 to avoid prefetch out of array check */
        struct rte_event ev[BURST_SIZE + 1];
+       uint16_t enq = 0, nb_rx = 0;
+       PERF_WORKER_INIT;
+       uint16_t i;
 
        while (t->done == false) {
-               uint16_t const nb_rx = rte_event_dequeue_burst(dev, port, ev,
-                               BURST_SIZE, 0);
+               nb_rx = rte_event_dequeue_burst(dev, port, ev, BURST_SIZE, 0);
 
                if (!nb_rx) {
                        rte_pause();
@@ -117,7 +111,26 @@ perf_atq_worker_burst(void *arg, const int enable_fwd_latency)
                }
 
                for (i = 0; i < nb_rx; i++) {
-                       if (enable_fwd_latency) {
+                       if (prod_crypto_type &&
+                           (ev[i].event_type == RTE_EVENT_TYPE_CRYPTODEV)) {
+                               struct rte_crypto_op *op = ev[i].event_ptr;
+
+                               if (op->status ==
+                                   RTE_CRYPTO_OP_STATUS_SUCCESS) {
+                                       if (op->sym->m_dst == NULL)
+                                               ev[i].event_ptr =
+                                                       op->sym->m_src;
+                                       else
+                                               ev[i].event_ptr =
+                                                       op->sym->m_dst;
+                                       rte_crypto_op_free(op);
+                               } else {
+                                       rte_crypto_op_free(op);
+                                       continue;
+                               }
+                       }
+
+                       if (enable_fwd_latency && !prod_timer_type) {
                                rte_prefetch0(ev[i+1].event_ptr);
                                /* first stage in pipeline.
                                 * mark time stamp to compute fwd latency
@@ -141,14 +154,15 @@ perf_atq_worker_burst(void *arg, const int enable_fwd_latency)
                        }
                }
 
-               uint16_t enq;
-
                enq = rte_event_enqueue_burst(dev, port, ev, nb_rx);
-               while (enq < nb_rx) {
+               while ((enq < nb_rx) && !t->done) {
                        enq += rte_event_enqueue_burst(dev, port,
                                                        ev + enq, nb_rx - enq);
                }
        }
+
+       perf_worker_cleanup(pool, dev, port, ev, enq, nb_rx);
+
        return 0;
 }
 
@@ -185,17 +199,27 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
 {
        int ret;
        uint8_t queue;
+       uint8_t nb_queues;
+       uint8_t nb_ports;
+       uint16_t prod;
+       struct rte_event_dev_info dev_info;
+       struct test_perf *t = evt_test_priv(test);
 
-       const struct rte_event_dev_config config = {
-                       .nb_event_queues = atq_nb_event_queues(opt),
-                       .nb_event_ports = perf_nb_event_ports(opt),
-                       .nb_events_limit  = 4096,
-                       .nb_event_queue_flows = opt->nb_flows,
-                       .nb_event_port_dequeue_depth = 128,
-                       .nb_event_port_enqueue_depth = 128,
-       };
+       nb_ports = evt_nr_active_lcores(opt->wlcores);
+       nb_ports += (opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ||
+                       opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) ? 0 :
+               evt_nr_active_lcores(opt->plcores);
 
-       ret = rte_event_dev_configure(opt->dev_id, &config);
+       nb_queues = atq_nb_event_queues(opt);
+
+       memset(&dev_info, 0, sizeof(struct rte_event_dev_info));
+       ret = rte_event_dev_info_get(opt->dev_id, &dev_info);
+       if (ret) {
+               evt_err("failed to get eventdev info %d", opt->dev_id);
+               return ret;
+       }
+
+       ret = evt_configure_eventdev(opt, nb_queues, nb_ports);
        if (ret) {
                evt_err("failed to configure eventdev %d", opt->dev_id);
                return ret;
@@ -208,7 +232,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                        .nb_atomic_order_sequences = opt->nb_flows,
        };
        /* queue configurations */
-       for (queue = 0; queue < atq_nb_event_queues(opt); queue++) {
+       for (queue = 0; queue < nb_queues; queue++) {
                ret = rte_event_queue_setup(opt->dev_id, queue, &q_conf);
                if (ret) {
                        evt_err("failed to setup queue=%d", queue);
@@ -216,15 +240,29 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                }
        }
 
-       ret = perf_event_dev_port_setup(test, opt, 1 /* stride */,
-                                       atq_nb_event_queues(opt));
+       if (opt->wkr_deq_dep > dev_info.max_event_port_dequeue_depth)
+               opt->wkr_deq_dep = dev_info.max_event_port_dequeue_depth;
+
+       /* port configuration */
+       const struct rte_event_port_conf p_conf = {
+                       .dequeue_depth = opt->wkr_deq_dep,
+                       .enqueue_depth = dev_info.max_event_port_dequeue_depth,
+                       .new_event_threshold = dev_info.max_num_events,
+       };
+
+       ret = perf_event_dev_port_setup(test, opt, 1 /* stride */, nb_queues,
+                       &p_conf);
        if (ret)
                return ret;
 
-       ret = evt_service_setup(opt->dev_id);
-       if (ret) {
-               evt_err("No service lcore found to run event dev.");
-               return ret;
+       if (!evt_has_distributed_sched(opt->dev_id)) {
+               uint32_t service_id;
+               rte_event_dev_service_id_get(opt->dev_id, &service_id);
+               ret = evt_service_setup(service_id);
+               if (ret) {
+                       evt_err("No service lcore found to run event dev.");
+                       return ret;
+               }
        }
 
        ret = rte_event_dev_start(opt->dev_id);
@@ -233,6 +271,47 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                return ret;
        }
 
+       if (opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR) {
+               RTE_ETH_FOREACH_DEV(prod) {
+                       ret = rte_eth_dev_start(prod);
+                       if (ret) {
+                               evt_err("Ethernet dev [%d] failed to start. Using synthetic producer",
+                                               prod);
+                               return ret;
+                       }
+
+                       ret = rte_event_eth_rx_adapter_start(prod);
+                       if (ret) {
+                               evt_err("Rx adapter[%d] start failed", prod);
+                               return ret;
+                       }
+                       printf("%s: Port[%d] using Rx adapter[%d] started\n",
+                                       __func__, prod, prod);
+               }
+       } else if (opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
+               for (prod = 0; prod < opt->nb_timer_adptrs; prod++) {
+                       ret = rte_event_timer_adapter_start(
+                                       t->timer_adptr[prod]);
+                       if (ret) {
+                               evt_err("failed to Start event timer adapter %d"
+                                               , prod);
+                               return ret;
+                       }
+               }
+       } else if (opt->prod_type == EVT_PROD_TYPE_EVENT_CRYPTO_ADPTR) {
+               uint8_t cdev_id, cdev_count;
+
+               cdev_count = rte_cryptodev_count();
+               for (cdev_id = 0; cdev_id < cdev_count; cdev_id++) {
+                       ret = rte_cryptodev_start(cdev_id);
+                       if (ret) {
+                               evt_err("Failed to start cryptodev %u",
+                                       cdev_id);
+                               return ret;
+                       }
+               }
+       }
+
        return 0;
 }
 
@@ -271,11 +350,16 @@ static const struct evt_test_ops perf_atq =  {
        .opt_check          = perf_atq_opt_check,
        .opt_dump           = perf_atq_opt_dump,
        .test_setup         = perf_test_setup,
+       .ethdev_setup       = perf_ethdev_setup,
+       .cryptodev_setup    = perf_cryptodev_setup,
+       .ethdev_rx_stop     = perf_ethdev_rx_stop,
        .mempool_setup      = perf_mempool_setup,
        .eventdev_setup     = perf_atq_eventdev_setup,
        .launch_lcores      = perf_atq_launch_lcores,
        .eventdev_destroy   = perf_eventdev_destroy,
        .mempool_destroy    = perf_mempool_destroy,
+       .ethdev_destroy     = perf_ethdev_destroy,
+       .cryptodev_destroy  = perf_cryptodev_destroy,
        .test_result        = perf_test_result,
        .test_destroy       = perf_test_destroy,
 };