9d0c15b6c5
Previous modification to evt_service_setup() broke order_queue/atq
tests.
Fixes: b0333c55df
("app/eventdev: add service core configuration")
Cc: stable@dpdk.org
Reported-by: Gage Eads <gage.eads@intel.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Gage Eads <gage.eads@intel.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
215 lines
5.2 KiB
C
215 lines
5.2 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2017 Cavium, Inc
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
|
|
#include "test_order_common.h"
|
|
|
|
/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
|
|
|
|
static inline __attribute__((always_inline)) void
|
|
order_atq_process_stage_0(struct rte_event *const ev)
|
|
{
|
|
ev->sub_event_type = 1; /* move to stage 1 (atomic) on the same queue */
|
|
ev->op = RTE_EVENT_OP_FORWARD;
|
|
ev->sched_type = RTE_SCHED_TYPE_ATOMIC;
|
|
ev->event_type = RTE_EVENT_TYPE_CPU;
|
|
}
|
|
|
|
static int
|
|
order_atq_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.sub_event_type == 0) { /* stage 0 from producer */
|
|
order_atq_process_stage_0(&ev);
|
|
while (rte_event_enqueue_burst(dev_id, port, &ev, 1)
|
|
!= 1)
|
|
rte_pause();
|
|
} else if (ev.sub_event_type == 1) { /* stage 1 */
|
|
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_atq_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].sub_event_type == 0) { /*stage 0 */
|
|
order_atq_process_stage_0(&ev[i]);
|
|
} else if (ev[i].sub_event_type == 1) { /* stage 1 */
|
|
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_atq_worker_burst(arg);
|
|
else
|
|
return order_atq_worker(arg);
|
|
}
|
|
|
|
static int
|
|
order_atq_launch_lcores(struct evt_test *test, struct evt_options *opt)
|
|
{
|
|
return order_launch_lcores(test, opt, worker_wrapper);
|
|
}
|
|
|
|
#define NB_QUEUES 1
|
|
static int
|
|
order_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
|
|
{
|
|
int ret;
|
|
|
|
const uint8_t nb_workers = evt_nr_active_lcores(opt->wlcores);
|
|
/* 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,/* one all types queue */
|
|
.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);
|
|
if (ret) {
|
|
evt_err("failed to configure eventdev %d", opt->dev_id);
|
|
return ret;
|
|
}
|
|
|
|
/* q0 all types queue configuration */
|
|
struct rte_event_queue_conf q0_conf = {
|
|
.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
|
|
.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES,
|
|
.nb_atomic_flows = opt->nb_flows,
|
|
.nb_atomic_order_sequences = opt->nb_flows,
|
|
};
|
|
ret = rte_event_queue_setup(opt->dev_id, 0, &q0_conf);
|
|
if (ret) {
|
|
evt_err("failed to setup queue0 eventdev %d", opt->dev_id);
|
|
return ret;
|
|
}
|
|
|
|
/* setup one port per worker, linking to all queues */
|
|
ret = order_event_dev_port_setup(test, opt, nb_workers, NB_QUEUES);
|
|
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);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
order_atq_opt_dump(struct evt_options *opt)
|
|
{
|
|
order_opt_dump(opt);
|
|
evt_dump("nb_evdev_queues", "%d", NB_QUEUES);
|
|
}
|
|
|
|
static bool
|
|
order_atq_capability_check(struct evt_options *opt)
|
|
{
|
|
struct rte_event_dev_info dev_info;
|
|
|
|
rte_event_dev_info_get(opt->dev_id, &dev_info);
|
|
if (dev_info.max_event_queues < NB_QUEUES || dev_info.max_event_ports <
|
|
order_nb_event_ports(opt)) {
|
|
evt_err("not enough eventdev queues=%d/%d or ports=%d/%d",
|
|
NB_QUEUES, dev_info.max_event_queues,
|
|
order_nb_event_ports(opt), dev_info.max_event_ports);
|
|
return false;
|
|
}
|
|
|
|
if (!evt_has_all_types_queue(opt->dev_id))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
static const struct evt_test_ops order_atq = {
|
|
.cap_check = order_atq_capability_check,
|
|
.opt_check = order_opt_check,
|
|
.opt_dump = order_atq_opt_dump,
|
|
.test_setup = order_test_setup,
|
|
.mempool_setup = order_mempool_setup,
|
|
.eventdev_setup = order_atq_eventdev_setup,
|
|
.launch_lcores = order_atq_launch_lcores,
|
|
.eventdev_destroy = order_eventdev_destroy,
|
|
.mempool_destroy = order_mempool_destroy,
|
|
.test_result = order_test_result,
|
|
.test_destroy = order_test_destroy,
|
|
};
|
|
|
|
EVT_TEST_REGISTER(order_atq);
|