eal: reset lcore task callback and argument

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

diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index 8a34201..d776006 100644 (file)
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -46,12 +46,10 @@ order_producer(void *arg)
                if (m == NULL)
                        continue;
 
-               const uint32_t flow = (uintptr_t)m % nb_flows;
+               const flow_id_t flow = (uintptr_t)m % nb_flows;
                /* Maintain seq number per flow */
-               m->seqn = producer_flow_seq[flow]++;
-
-               ev.flow_id = flow;
-               ev.mbuf = m;
+               *order_mbuf_seqn(t, m) = producer_flow_seq[flow]++;
+               order_flow_id_save(t, flow, m, &ev);
 
                while (rte_event_enqueue_burst(dev_id, port, &ev, 1) != 1) {
                        if (t->err)
@@ -67,15 +65,22 @@ order_producer(void *arg)
 int
 order_opt_check(struct evt_options *opt)
 {
-       /* 1 producer + N workers + 1 master */
+       if (opt->prod_type != EVT_PROD_TYPE_SYNT) {
+               evt_err("Invalid producer type '%s' valid producer '%s'",
+                       evt_prod_id_to_name(opt->prod_type),
+                       evt_prod_id_to_name(EVT_PROD_TYPE_SYNT));
+               return -1;
+       }
+
+       /* 1 producer + N workers + main */
        if (rte_lcore_count() < 3) {
                evt_err("test need minimum 3 lcores");
                return -1;
        }
 
        /* 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;
        }
 
@@ -110,8 +115,8 @@ order_opt_check(struct evt_options *opt)
        }
 
        /* Validate producer lcore */
-       if (plcore == (int)rte_get_master_lcore()) {
-               evt_err("producer lcore and master lcore should be different");
+       if (plcore == (int)rte_get_main_lcore()) {
+               evt_err("producer lcore and main lcore should be different");
                return -1;
        }
        if (!rte_lcore_is_enabled(plcore)) {
@@ -130,6 +135,17 @@ int
 order_test_setup(struct evt_test *test, struct evt_options *opt)
 {
        void *test_order;
+       struct test_order *t;
+       static const struct rte_mbuf_dynfield flow_id_dynfield_desc = {
+               .name = "test_event_dynfield_flow_id",
+               .size = sizeof(flow_id_t),
+               .align = __alignof__(flow_id_t),
+       };
+       static const struct rte_mbuf_dynfield seqn_dynfield_desc = {
+               .name = "test_event_dynfield_seqn",
+               .size = sizeof(seqn_t),
+               .align = __alignof__(seqn_t),
+       };
 
        test_order = rte_zmalloc_socket(test->name, sizeof(struct test_order),
                                RTE_CACHE_LINE_SIZE, opt->socket_id);
@@ -138,8 +154,21 @@ order_test_setup(struct evt_test *test, struct evt_options *opt)
                goto nomem;
        }
        test->test_priv = test_order;
+       t = evt_test_priv(test);
 
-       struct test_order *t = evt_test_priv(test);
+       t->flow_id_dynfield_offset =
+               rte_mbuf_dynfield_register(&flow_id_dynfield_desc);
+       if (t->flow_id_dynfield_offset < 0) {
+               evt_err("failed to register mbuf field");
+               return -rte_errno;
+       }
+
+       t->seqn_dynfield_offset =
+               rte_mbuf_dynfield_register(&seqn_dynfield_desc);
+       if (t->seqn_dynfield_offset < 0) {
+               evt_err("failed to register mbuf field");
+               return -rte_errno;
+       }
 
        t->producer_flow_seq = rte_zmalloc_socket("test_producer_flow_seq",
                                 sizeof(*t->producer_flow_seq) * opt->nb_flows,
@@ -238,7 +267,7 @@ order_launch_lcores(struct evt_test *test, struct evt_options *opt,
 
        int wkr_idx = 0;
        /* launch workers */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (!(opt->wlcores[lcore_id]))
                        continue;
 
@@ -279,7 +308,6 @@ order_launch_lcores(struct evt_test *test, struct evt_options *opt,
                                rte_event_dev_dump(opt->dev_id, stdout);
                                evt_err("No schedules for seconds, deadlock");
                                t->err = true;
-                               rte_smp_wmb();
                                break;
                        }
                        old_remaining = remaining;
@@ -298,12 +326,23 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
        int ret;
        uint8_t port;
        struct test_order *t = evt_test_priv(test);
+       struct rte_event_dev_info dev_info;
+
+       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;
+       }
+
+       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 wkr_p_conf = {
+       const struct rte_event_port_conf p_conf = {
                        .dequeue_depth = opt->wkr_deq_dep,
-                       .enqueue_depth = 64,
-                       .new_event_threshold = 4096,
+                       .enqueue_depth = dev_info.max_event_port_dequeue_depth,
+                       .new_event_threshold = dev_info.max_num_events,
        };
 
        /* setup one port per worker, linking to all queues */
@@ -314,7 +353,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
                w->port_id = port;
                w->t = t;
 
-               ret = rte_event_port_setup(opt->dev_id, port, &wkr_p_conf);
+               ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
                if (ret) {
                        evt_err("failed to setup port %d", port);
                        return ret;
@@ -326,12 +365,6 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
                        return -EINVAL;
                }
        }
-       /* port for producer, no links */
-       const struct rte_event_port_conf prod_conf = {
-                       .dequeue_depth = 8,
-                       .enqueue_depth = 32,
-                       .new_event_threshold = 1200,
-       };
        struct prod_data *p = &t->prod;
 
        p->dev_id = opt->dev_id;
@@ -339,7 +372,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
        p->queue_id = 0;
        p->t = t;
 
-       ret = rte_event_port_setup(opt->dev_id, port, &prod_conf);
+       ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
        if (ret) {
                evt_err("failed to setup producer port %d", port);
                return ret;