net: move TCP flags from ethdev header
[dpdk.git] / app / test-eventdev / test_order_queue.c
index c4003ef..7ac570c 100644 (file)
@@ -1,33 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium 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 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 <stdio.h>
 
 #include "test_order_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 __attribute__((always_inline)) void
+order_queue_process_stage_0(struct rte_event *const ev)
+{
+       ev->queue_id = 1; /* q1 atomic queue */
+       ev->op = RTE_EVENT_OP_FORWARD;
+       ev->sched_type = RTE_SCHED_TYPE_ATOMIC;
+       ev->event_type = RTE_EVENT_TYPE_CPU;
+}
+
+static int
+order_queue_worker(void *arg)
+{
+       ORDER_WORKER_INIT;
+       struct rte_event ev;
+
+       while (t->err == false) {
+               uint16_t event = rte_event_dequeue_burst(dev_id, port,
+                                       &ev, 1, 0);
+               if (!event) {
+                       if (rte_atomic64_read(outstand_pkts) <= 0)
+                               break;
+                       rte_pause();
+                       continue;
+               }
+
+               if (ev.queue_id == 0) { /* from ordered queue */
+                       order_queue_process_stage_0(&ev);
+                       while (rte_event_enqueue_burst(dev_id, port, &ev, 1)
+                                       != 1)
+                               rte_pause();
+               } else if (ev.queue_id == 1) { /* from atomic queue */
+                       order_process_stage_1(t, &ev, nb_flows,
+                                       expected_flow_seq, outstand_pkts);
+               } else {
+                       order_process_stage_invalid(t, &ev);
+               }
+       }
+       return 0;
+}
+
+static int
+order_queue_worker_burst(void *arg)
+{
+       ORDER_WORKER_INIT;
+       struct rte_event ev[BURST_SIZE];
+       uint16_t i;
+
+       while (t->err == false) {
+               uint16_t const nb_rx = rte_event_dequeue_burst(dev_id, port, ev,
+                               BURST_SIZE, 0);
+
+               if (nb_rx == 0) {
+                       if (rte_atomic64_read(outstand_pkts) <= 0)
+                               break;
+                       rte_pause();
+                       continue;
+               }
+
+               for (i = 0; i < nb_rx; i++) {
+                       if (ev[i].queue_id == 0) { /* from ordered queue */
+                               order_queue_process_stage_0(&ev[i]);
+                       } else if (ev[i].queue_id == 1) {/* from atomic queue */
+                               order_process_stage_1(t, &ev[i], nb_flows,
+                                       expected_flow_seq, outstand_pkts);
+                               ev[i].op = RTE_EVENT_OP_RELEASE;
+                       } else {
+                               order_process_stage_invalid(t, &ev[i]);
+                       }
+               }
+
+               uint16_t enq;
+
+               enq = rte_event_enqueue_burst(dev_id, port, ev, nb_rx);
+               while (enq < nb_rx) {
+                       enq += rte_event_enqueue_burst(dev_id, port,
+                                                       ev + enq, nb_rx - enq);
+               }
+       }
+       return 0;
+}
+
+static int
+worker_wrapper(void *arg)
+{
+       struct worker_data *w  = arg;
+       const bool burst = evt_has_burst_mode(w->dev_id);
+
+       if (burst)
+               return order_queue_worker_burst(arg);
+       else
+               return order_queue_worker(arg);
+}
+
+static int
+order_queue_launch_lcores(struct evt_test *test, struct evt_options *opt)
+{
+       return order_launch_lcores(test, opt, worker_wrapper);
+}
 
 #define NB_QUEUES 2
 static int
@@ -47,16 +118,7 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
        /* number of active worker cores + 1 producer */
        const uint8_t nb_ports = nb_workers + 1;
 
-       const struct rte_event_dev_config config = {
-                       .nb_event_queues = NB_QUEUES,/* q0 ordered, q1 atomic */
-                       .nb_event_ports = nb_ports,
-                       .nb_events_limit  = 4096,
-                       .nb_event_queue_flows = opt->nb_flows,
-                       .nb_event_port_dequeue_depth = 128,
-                       .nb_event_port_enqueue_depth = 128,
-       };
-
-       ret = rte_event_dev_configure(opt->dev_id, &config);
+       ret = evt_configure_eventdev(opt, NB_QUEUES, nb_ports);
        if (ret) {
                evt_err("failed to configure eventdev %d", opt->dev_id);
                return ret;
@@ -65,7 +127,7 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
        /* q0 (ordered queue) configuration */
        struct rte_event_queue_conf q0_ordered_conf = {
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
-                       .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY,
+                       .schedule_type = RTE_SCHED_TYPE_ORDERED,
                        .nb_atomic_flows = opt->nb_flows,
                        .nb_atomic_order_sequences = opt->nb_flows,
        };
@@ -78,7 +140,7 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
        /* q1 (atomic queue) configuration */
        struct rte_event_queue_conf q1_atomic_conf = {
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
-                       .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,
+                       .schedule_type = RTE_SCHED_TYPE_ATOMIC,
                        .nb_atomic_flows = opt->nb_flows,
                        .nb_atomic_order_sequences = opt->nb_flows,
        };
@@ -93,6 +155,16 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
        if (ret)
                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);
        if (ret) {
                evt_err("failed to start eventdev %d", opt->dev_id);
@@ -133,6 +205,7 @@ static const struct evt_test_ops order_queue =  {
        .test_setup         = order_test_setup,
        .mempool_setup      = order_mempool_setup,
        .eventdev_setup     = order_queue_eventdev_setup,
+       .launch_lcores      = order_queue_launch_lcores,
        .eventdev_destroy   = order_eventdev_destroy,
        .mempool_destroy    = order_mempool_destroy,
        .test_result        = order_test_result,