eventdev: fix inconsistency in queue config
[dpdk.git] / test / test / test_eventdev_sw.c
index 03003e6..dea302f 100644 (file)
@@ -47,8 +47,9 @@
 #include <rte_debug.h>
 #include <rte_ethdev.h>
 #include <rte_cycles.h>
-
 #include <rte_eventdev.h>
+#include <rte_pause.h>
+
 #include "test.h"
 
 #define MAX_PORTS 16
@@ -100,6 +101,69 @@ rte_gen_arp(int portid, struct rte_mempool *mp)
        return m;
 }
 
+static void
+xstats_print(void)
+{
+       const uint32_t XSTATS_MAX = 1024;
+       uint32_t i;
+       uint32_t ids[XSTATS_MAX];
+       uint64_t values[XSTATS_MAX];
+       struct rte_event_dev_xstats_name xstats_names[XSTATS_MAX];
+
+       for (i = 0; i < XSTATS_MAX; i++)
+               ids[i] = i;
+
+       /* Device names / values */
+       int ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (ret < 0) {
+               printf("%d: xstats names get() returned error\n",
+                       __LINE__);
+               return;
+       }
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, ids, values, ret);
+       if (ret > (signed int)XSTATS_MAX)
+               printf("%s %d: more xstats available than space\n",
+                               __func__, __LINE__);
+       for (i = 0; (signed int)i < ret; i++) {
+               printf("%d : %s : %"PRIu64"\n",
+                               i, xstats_names[i].name, values[i]);
+       }
+
+       /* Port names / values */
+       ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, 1,
+                                       ids, values, ret);
+       if (ret > (signed int)XSTATS_MAX)
+               printf("%s %d: more xstats available than space\n",
+                               __func__, __LINE__);
+       for (i = 0; (signed int)i < ret; i++) {
+               printf("%d : %s : %"PRIu64"\n",
+                               i, xstats_names[i].name, values[i]);
+       }
+
+       /* Queue names / values */
+       ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       1, ids, values, ret);
+       if (ret > (signed int)XSTATS_MAX)
+               printf("%s %d: more xstats available than space\n",
+                               __func__, __LINE__);
+       for (i = 0; (signed int)i < ret; i++) {
+               printf("%d : %s : %"PRIu64"\n",
+                               i, xstats_names[i].name, values[i]);
+       }
+}
+
 /* initialization and config */
 static inline int
 init(struct test *t, int nb_queues, int nb_ports)
@@ -155,7 +219,7 @@ create_lb_qids(struct test *t, int num_qids, uint32_t flags)
 
        /* Q creation */
        const struct rte_event_queue_conf conf = {
-                       .event_queue_cfg = flags,
+                       .schedule_type = flags,
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
                        .nb_atomic_flows = 1024,
                        .nb_atomic_order_sequences = 1024,
@@ -178,20 +242,20 @@ create_lb_qids(struct test *t, int num_qids, uint32_t flags)
 static inline int
 create_atomic_qids(struct test *t, int num_qids)
 {
-       return create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY);
+       return create_lb_qids(t, num_qids, RTE_SCHED_TYPE_ATOMIC);
 }
 
 static inline int
 create_ordered_qids(struct test *t, int num_qids)
 {
-       return create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_ORDERED_ONLY);
+       return create_lb_qids(t, num_qids, RTE_SCHED_TYPE_ORDERED);
 }
 
 
 static inline int
 create_unordered_qids(struct test *t, int num_qids)
 {
-       return create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY);
+       return create_lb_qids(t, num_qids, RTE_SCHED_TYPE_PARALLEL);
 }
 
 static inline int
@@ -203,8 +267,6 @@ create_directed_qids(struct test *t, int num_qids, const uint8_t ports[])
        static const struct rte_event_queue_conf conf = {
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
                        .event_queue_cfg = RTE_EVENT_QUEUE_CFG_SINGLE_LINK,
-                       .nb_atomic_flows = 1024,
-                       .nb_atomic_order_sequences = 1024,
        };
 
        for (i = t->nb_qids; i < t->nb_qids + num_qids; i++) {
@@ -485,6 +547,50 @@ test_single_directed_packet(struct test *t)
        return 0;
 }
 
+static int
+test_directed_forward_credits(struct test *t)
+{
+       uint32_t i;
+       int32_t err;
+
+       if (init(t, 1, 1) < 0 ||
+                       create_ports(t, 1) < 0 ||
+                       create_directed_qids(t, 1, t->port) < 0)
+               return -1;
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               return -1;
+       }
+
+       struct rte_event ev = {
+                       .op = RTE_EVENT_OP_NEW,
+                       .queue_id = 0,
+       };
+
+       for (i = 0; i < 1000; i++) {
+               err = rte_event_enqueue_burst(evdev, 0, &ev, 1);
+               if (err < 0) {
+                       printf("%d: error failed to enqueue\n", __LINE__);
+                       return -1;
+               }
+               rte_event_schedule(evdev);
+
+               uint32_t deq_pkts;
+               deq_pkts = rte_event_dequeue_burst(evdev, 0, &ev, 1, 0);
+               if (deq_pkts != 1) {
+                       printf("%d: error failed to deq\n", __LINE__);
+                       return -1;
+               }
+
+               /* re-write event to be a forward, and continue looping it */
+               ev.op = RTE_EVENT_OP_FORWARD;
+       }
+
+       cleanup(t);
+       return 0;
+}
+
 
 static int
 test_priority_directed(struct test *t)
@@ -741,6 +847,385 @@ abuse_inflights(struct test *t)
        return 0;
 }
 
+static int
+xstats_tests(struct test *t)
+{
+       const int wrk_enq = 2;
+       int err;
+
+       /* Create instance with 4 ports */
+       if (init(t, 1, 4) < 0 ||
+                       create_ports(t, 4) < 0 ||
+                       create_atomic_qids(t, 1) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               return -1;
+       }
+
+       /* CQ mapping to QID */
+       err = rte_event_port_link(evdev, t->port[wrk_enq], NULL, NULL, 0);
+       if (err != 1) {
+               printf("%d: error mapping lb qid\n", __LINE__);
+               cleanup(t);
+               return -1;
+       }
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               return -1;
+       }
+
+       const uint32_t XSTATS_MAX = 1024;
+
+       uint32_t i;
+       uint32_t ids[XSTATS_MAX];
+       uint64_t values[XSTATS_MAX];
+       struct rte_event_dev_xstats_name xstats_names[XSTATS_MAX];
+
+       for (i = 0; i < XSTATS_MAX; i++)
+               ids[i] = i;
+
+       /* Device names / values */
+       int ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, xstats_names, ids, XSTATS_MAX);
+       if (ret != 6) {
+               printf("%d: expected 6 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, ids, values, ret);
+       if (ret != 6) {
+               printf("%d: expected 6 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+
+       /* Port names / values */
+       ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (ret != 21) {
+               printf("%d: expected 21 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, 0,
+                                       ids, values, ret);
+       if (ret != 21) {
+               printf("%d: expected 21 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+
+       /* Queue names / values */
+       ret = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       0, xstats_names, ids, XSTATS_MAX);
+       if (ret != 17) {
+               printf("%d: expected 17 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+
+       /* NEGATIVE TEST: with wrong queue passed, 0 stats should be returned */
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       1, ids, values, ret);
+       if (ret != -EINVAL) {
+               printf("%d: expected 0 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       0, ids, values, ret);
+       if (ret != 17) {
+               printf("%d: expected 17 stats, got return %d\n", __LINE__, ret);
+               return -1;
+       }
+
+       /* enqueue packets to check values */
+       for (i = 0; i < 3; i++) {
+               struct rte_event ev;
+               struct rte_mbuf *arp = rte_gen_arp(0, t->mbuf_pool);
+               if (!arp) {
+                       printf("%d: gen of pkt failed\n", __LINE__);
+                       return -1;
+               }
+               ev.queue_id = t->qid[i];
+               ev.op = RTE_EVENT_OP_NEW;
+               ev.mbuf = arp;
+               ev.flow_id = 7;
+               arp->seqn = i;
+
+               int err = rte_event_enqueue_burst(evdev, t->port[0], &ev, 1);
+               if (err != 1) {
+                       printf("%d: Failed to enqueue\n", __LINE__);
+                       return -1;
+               }
+       }
+
+       rte_event_schedule(evdev);
+
+       /* Device names / values */
+       int num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (num_stats < 0)
+               goto fail;
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, ids, values, num_stats);
+       static const uint64_t expected[] = {3, 3, 0, 1, 0, 0};
+       for (i = 0; (signed int)i < ret; i++) {
+               if (expected[i] != values[i]) {
+                       printf(
+                               "%d Error xstat %d (id %d) %s : %"PRIu64
+                               ", expect %"PRIu64"\n",
+                               __LINE__, i, ids[i], xstats_names[i].name,
+                               values[i], expected[i]);
+                       goto fail;
+               }
+       }
+
+       ret = rte_event_dev_xstats_reset(evdev, RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, NULL, 0);
+
+       /* ensure reset statistics are zero-ed */
+       static const uint64_t expected_zero[] = {0, 0, 0, 0, 0, 0};
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, ids, values, num_stats);
+       for (i = 0; (signed int)i < ret; i++) {
+               if (expected_zero[i] != values[i]) {
+                       printf(
+                               "%d Error, xstat %d (id %d) %s : %"PRIu64
+                               ", expect %"PRIu64"\n",
+                               __LINE__, i, ids[i], xstats_names[i].name,
+                               values[i], expected_zero[i]);
+                       goto fail;
+               }
+       }
+
+       /* port reset checks */
+       num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, 0,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (num_stats < 0)
+               goto fail;
+       ret = rte_event_dev_xstats_get(evdev, RTE_EVENT_DEV_XSTATS_PORT,
+                                       0, ids, values, num_stats);
+
+       static const uint64_t port_expected[] = {
+               3 /* rx */,
+               0 /* tx */,
+               0 /* drop */,
+               0 /* inflights */,
+               0 /* avg pkt cycles */,
+               29 /* credits */,
+               0 /* rx ring used */,
+               4096 /* rx ring free */,
+               0 /* cq ring used */,
+               32 /* cq ring free */,
+               0 /* dequeue calls */,
+               /* 10 dequeue burst buckets */
+               0, 0, 0, 0, 0,
+               0, 0, 0, 0, 0,
+       };
+       if (ret != RTE_DIM(port_expected)) {
+               printf(
+                       "%s %d: wrong number of port stats (%d), expected %zu\n",
+                       __func__, __LINE__, ret, RTE_DIM(port_expected));
+       }
+
+       for (i = 0; (signed int)i < ret; i++) {
+               if (port_expected[i] != values[i]) {
+                       printf(
+                               "%s : %d: Error stat %s is %"PRIu64
+                               ", expected %"PRIu64"\n",
+                               __func__, __LINE__, xstats_names[i].name,
+                               values[i], port_expected[i]);
+                       goto fail;
+               }
+       }
+
+       ret = rte_event_dev_xstats_reset(evdev, RTE_EVENT_DEV_XSTATS_PORT,
+                                       0, NULL, 0);
+
+       /* ensure reset statistics are zero-ed */
+       static const uint64_t port_expected_zero[] = {
+               0 /* rx */,
+               0 /* tx */,
+               0 /* drop */,
+               0 /* inflights */,
+               0 /* avg pkt cycles */,
+               29 /* credits */,
+               0 /* rx ring used */,
+               4096 /* rx ring free */,
+               0 /* cq ring used */,
+               32 /* cq ring free */,
+               0 /* dequeue calls */,
+               /* 10 dequeue burst buckets */
+               0, 0, 0, 0, 0,
+               0, 0, 0, 0, 0,
+       };
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT,
+                                       0, ids, values, num_stats);
+       for (i = 0; (signed int)i < ret; i++) {
+               if (port_expected_zero[i] != values[i]) {
+                       printf(
+                               "%d, Error, xstat %d (id %d) %s : %"PRIu64
+                               ", expect %"PRIu64"\n",
+                               __LINE__, i, ids[i], xstats_names[i].name,
+                               values[i], port_expected_zero[i]);
+                       goto fail;
+               }
+       }
+
+       /* QUEUE STATS TESTS */
+       num_stats = rte_event_dev_xstats_names_get(evdev,
+                                               RTE_EVENT_DEV_XSTATS_QUEUE, 0,
+                                               xstats_names, ids, XSTATS_MAX);
+       ret = rte_event_dev_xstats_get(evdev, RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       0, ids, values, num_stats);
+       if (ret < 0) {
+               printf("xstats get returned %d\n", ret);
+               goto fail;
+       }
+       if ((unsigned int)ret > XSTATS_MAX)
+               printf("%s %d: more xstats available than space\n",
+                               __func__, __LINE__);
+
+       static const uint64_t queue_expected[] = {
+               3 /* rx */,
+               3 /* tx */,
+               0 /* drop */,
+               3 /* inflights */,
+               512 /* iq size */,
+               0, 0, 0, 0, /* iq 0, 1, 2, 3 used */
+               /* QID-to-Port: pinned_flows, packets */
+               0, 0,
+               0, 0,
+               1, 3,
+               0, 0,
+       };
+       for (i = 0; (signed int)i < ret; i++) {
+               if (queue_expected[i] != values[i]) {
+                       printf(
+                               "%d, Error, xstat %d (id %d) %s : %"PRIu64
+                               ", expect %"PRIu64"\n",
+                               __LINE__, i, ids[i], xstats_names[i].name,
+                               values[i], queue_expected[i]);
+                       goto fail;
+               }
+       }
+
+       /* Reset the queue stats here */
+       ret = rte_event_dev_xstats_reset(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE, 0,
+                                       NULL,
+                                       0);
+
+       /* Verify that the resetable stats are reset, and others are not */
+       static const uint64_t queue_expected_zero[] = {
+               0 /* rx */,
+               0 /* tx */,
+               0 /* drop */,
+               3 /* inflight */,
+               512 /* iq size */,
+               0, 0, 0, 0, /* 4 iq used */
+               /* QID-to-Port: pinned_flows, packets */
+               0, 0,
+               0, 0,
+               1, 0,
+               0, 0,
+       };
+
+       ret = rte_event_dev_xstats_get(evdev, RTE_EVENT_DEV_XSTATS_QUEUE, 0,
+                                       ids, values, num_stats);
+       int fails = 0;
+       for (i = 0; (signed int)i < ret; i++) {
+               if (queue_expected_zero[i] != values[i]) {
+                       printf(
+                               "%d, Error, xstat %d (id %d) %s : %"PRIu64
+                               ", expect %"PRIu64"\n",
+                               __LINE__, i, ids[i], xstats_names[i].name,
+                               values[i], queue_expected_zero[i]);
+                       fails++;
+               }
+       }
+       if (fails) {
+               printf("%d : %d of values were not as expected above\n",
+                               __LINE__, fails);
+               goto fail;
+       }
+
+       cleanup(t);
+       return 0;
+
+fail:
+       rte_event_dev_dump(0, stdout);
+       cleanup(t);
+       return -1;
+}
+
+
+static int
+xstats_id_abuse_tests(struct test *t)
+{
+       int err;
+       const uint32_t XSTATS_MAX = 1024;
+       const uint32_t link_port = 2;
+
+       uint32_t ids[XSTATS_MAX];
+       struct rte_event_dev_xstats_name xstats_names[XSTATS_MAX];
+
+       /* Create instance with 4 ports */
+       if (init(t, 1, 4) < 0 ||
+                       create_ports(t, 4) < 0 ||
+                       create_atomic_qids(t, 1) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               goto fail;
+       }
+
+       err = rte_event_port_link(evdev, t->port[link_port], NULL, NULL, 0);
+       if (err != 1) {
+               printf("%d: error mapping lb qid\n", __LINE__);
+               goto fail;
+       }
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               goto fail;
+       }
+
+       /* no test for device, as it ignores the port/q number */
+       int num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT,
+                                       UINT8_MAX-1, xstats_names, ids,
+                                       XSTATS_MAX);
+       if (num_stats != 0) {
+               printf("%d: expected %d stats, got return %d\n", __LINE__,
+                               0, num_stats);
+               goto fail;
+       }
+
+       num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       UINT8_MAX-1, xstats_names, ids,
+                                       XSTATS_MAX);
+       if (num_stats != 0) {
+               printf("%d: expected %d stats, got return %d\n", __LINE__,
+                               0, num_stats);
+               goto fail;
+       }
+
+       cleanup(t);
+       return 0;
+fail:
+       cleanup(t);
+       return -1;
+}
+
 static int
 port_reconfig_credits(struct test *t)
 {
@@ -753,7 +1238,7 @@ port_reconfig_credits(struct test *t)
        const uint32_t NUM_ITERS = 32;
        for (i = 0; i < NUM_ITERS; i++) {
                const struct rte_event_queue_conf conf = {
-                       .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,
+                       .schedule_type = RTE_SCHED_TYPE_ATOMIC,
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
                        .nb_atomic_flows = 1024,
                        .nb_atomic_order_sequences = 1024,
@@ -835,7 +1320,7 @@ port_single_lb_reconfig(struct test *t)
 
        static const struct rte_event_queue_conf conf_lb_atomic = {
                .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
-               .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,
+               .schedule_type = RTE_SCHED_TYPE_ATOMIC,
                .nb_atomic_flows = 1024,
                .nb_atomic_order_sequences = 1024,
        };
@@ -847,8 +1332,6 @@ port_single_lb_reconfig(struct test *t)
        static const struct rte_event_queue_conf conf_single_link = {
                .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
                .event_queue_cfg = RTE_EVENT_QUEUE_CFG_SINGLE_LINK,
-               .nb_atomic_flows = 1024,
-               .nb_atomic_order_sequences = 1024,
        };
        if (rte_event_queue_setup(evdev, 1, &conf_single_link) < 0) {
                printf("%d: error creating qid\n", __LINE__);
@@ -907,6 +1390,424 @@ fail:
        return -1;
 }
 
+static int
+xstats_brute_force(struct test *t)
+{
+       uint32_t i;
+       const uint32_t XSTATS_MAX = 1024;
+       uint32_t ids[XSTATS_MAX];
+       uint64_t values[XSTATS_MAX];
+       struct rte_event_dev_xstats_name xstats_names[XSTATS_MAX];
+
+
+       /* Create instance with 4 ports */
+       if (init(t, 1, 4) < 0 ||
+                       create_ports(t, 4) < 0 ||
+                       create_atomic_qids(t, 1) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               return -1;
+       }
+
+       int err = rte_event_port_link(evdev, t->port[0], NULL, NULL, 0);
+       if (err != 1) {
+               printf("%d: error mapping lb qid\n", __LINE__);
+               goto fail;
+       }
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               goto fail;
+       }
+
+       for (i = 0; i < XSTATS_MAX; i++)
+               ids[i] = i;
+
+       for (i = 0; i < 3; i++) {
+               uint32_t mode = RTE_EVENT_DEV_XSTATS_DEVICE + i;
+               uint32_t j;
+               for (j = 0; j < UINT8_MAX; j++) {
+                       rte_event_dev_xstats_names_get(evdev, mode,
+                               j, xstats_names, ids, XSTATS_MAX);
+
+                       rte_event_dev_xstats_get(evdev, mode, j, ids,
+                                                values, XSTATS_MAX);
+               }
+       }
+
+       cleanup(t);
+       return 0;
+fail:
+       cleanup(t);
+       return -1;
+}
+
+static int
+xstats_id_reset_tests(struct test *t)
+{
+       const int wrk_enq = 2;
+       int err;
+
+       /* Create instance with 4 ports */
+       if (init(t, 1, 4) < 0 ||
+                       create_ports(t, 4) < 0 ||
+                       create_atomic_qids(t, 1) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               return -1;
+       }
+
+       /* CQ mapping to QID */
+       err = rte_event_port_link(evdev, t->port[wrk_enq], NULL, NULL, 0);
+       if (err != 1) {
+               printf("%d: error mapping lb qid\n", __LINE__);
+               goto fail;
+       }
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               goto fail;
+       }
+
+#define XSTATS_MAX 1024
+       int ret;
+       uint32_t i;
+       uint32_t ids[XSTATS_MAX];
+       uint64_t values[XSTATS_MAX];
+       struct rte_event_dev_xstats_name xstats_names[XSTATS_MAX];
+
+       for (i = 0; i < XSTATS_MAX; i++)
+               ids[i] = i;
+
+#define NUM_DEV_STATS 6
+       /* Device names / values */
+       int num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, xstats_names, ids, XSTATS_MAX);
+       if (num_stats != NUM_DEV_STATS) {
+               printf("%d: expected %d stats, got return %d\n", __LINE__,
+                               NUM_DEV_STATS, num_stats);
+               goto fail;
+       }
+       ret = rte_event_dev_xstats_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_DEVICE,
+                                       0, ids, values, num_stats);
+       if (ret != NUM_DEV_STATS) {
+               printf("%d: expected %d stats, got return %d\n", __LINE__,
+                               NUM_DEV_STATS, ret);
+               goto fail;
+       }
+
+#define NPKTS 7
+       for (i = 0; i < NPKTS; i++) {
+               struct rte_event ev;
+               struct rte_mbuf *arp = rte_gen_arp(0, t->mbuf_pool);
+               if (!arp) {
+                       printf("%d: gen of pkt failed\n", __LINE__);
+                       goto fail;
+               }
+               ev.queue_id = t->qid[i];
+               ev.op = RTE_EVENT_OP_NEW;
+               ev.mbuf = arp;
+               arp->seqn = i;
+
+               int err = rte_event_enqueue_burst(evdev, t->port[0], &ev, 1);
+               if (err != 1) {
+                       printf("%d: Failed to enqueue\n", __LINE__);
+                       goto fail;
+               }
+       }
+
+       rte_event_schedule(evdev);
+
+       static const char * const dev_names[] = {
+               "dev_rx", "dev_tx", "dev_drop", "dev_sched_calls",
+               "dev_sched_no_iq_enq", "dev_sched_no_cq_enq",
+       };
+       uint64_t dev_expected[] = {NPKTS, NPKTS, 0, 1, 0, 0};
+       for (i = 0; (int)i < ret; i++) {
+               unsigned int id;
+               uint64_t val = rte_event_dev_xstats_by_name_get(evdev,
+                                                               dev_names[i],
+                                                               &id);
+               if (id != i) {
+                       printf("%d: %s id incorrect, expected %d got %d\n",
+                                       __LINE__, dev_names[i], i, id);
+                       goto fail;
+               }
+               if (val != dev_expected[i]) {
+                       printf("%d: %s value incorrect, expected %"
+                               PRIu64" got %d\n", __LINE__, dev_names[i],
+                               dev_expected[i], id);
+                       goto fail;
+               }
+               /* reset to zero */
+               int reset_ret = rte_event_dev_xstats_reset(evdev,
+                                               RTE_EVENT_DEV_XSTATS_DEVICE, 0,
+                                               &id,
+                                               1);
+               if (reset_ret) {
+                       printf("%d: failed to reset successfully\n", __LINE__);
+                       goto fail;
+               }
+               dev_expected[i] = 0;
+               /* check value again */
+               val = rte_event_dev_xstats_by_name_get(evdev, dev_names[i], 0);
+               if (val != dev_expected[i]) {
+                       printf("%d: %s value incorrect, expected %"PRIu64
+                               " got %"PRIu64"\n", __LINE__, dev_names[i],
+                               dev_expected[i], val);
+                       goto fail;
+               }
+       };
+
+/* 48 is stat offset from start of the devices whole xstats.
+ * This WILL break every time we add a statistic to a port
+ * or the device, but there is no other way to test
+ */
+#define PORT_OFF 48
+/* num stats for the tested port. CQ size adds more stats to a port */
+#define NUM_PORT_STATS 21
+/* the port to test. */
+#define PORT 2
+       num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_PORT, PORT,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (num_stats != NUM_PORT_STATS) {
+               printf("%d: expected %d stats, got return %d\n",
+                       __LINE__, NUM_PORT_STATS, num_stats);
+               goto fail;
+       }
+       ret = rte_event_dev_xstats_get(evdev, RTE_EVENT_DEV_XSTATS_PORT, PORT,
+                                       ids, values, num_stats);
+
+       if (ret != NUM_PORT_STATS) {
+               printf("%d: expected %d stats, got return %d\n",
+                               __LINE__, NUM_PORT_STATS, ret);
+               goto fail;
+       }
+       static const char * const port_names[] = {
+               "port_2_rx",
+               "port_2_tx",
+               "port_2_drop",
+               "port_2_inflight",
+               "port_2_avg_pkt_cycles",
+               "port_2_credits",
+               "port_2_rx_ring_used",
+               "port_2_rx_ring_free",
+               "port_2_cq_ring_used",
+               "port_2_cq_ring_free",
+               "port_2_dequeue_calls",
+               "port_2_dequeues_returning_0",
+               "port_2_dequeues_returning_1-4",
+               "port_2_dequeues_returning_5-8",
+               "port_2_dequeues_returning_9-12",
+               "port_2_dequeues_returning_13-16",
+               "port_2_dequeues_returning_17-20",
+               "port_2_dequeues_returning_21-24",
+               "port_2_dequeues_returning_25-28",
+               "port_2_dequeues_returning_29-32",
+               "port_2_dequeues_returning_33-36",
+       };
+       uint64_t port_expected[] = {
+               0, /* rx */
+               NPKTS, /* tx */
+               0, /* drop */
+               NPKTS, /* inflight */
+               0, /* avg pkt cycles */
+               0, /* credits */
+               0, /* rx ring used */
+               4096, /* rx ring free */
+               NPKTS,  /* cq ring used */
+               25, /* cq ring free */
+               0, /* dequeue zero calls */
+               0, 0, 0, 0, 0, /* 10 dequeue buckets */
+               0, 0, 0, 0, 0,
+       };
+       uint64_t port_expected_zero[] = {
+               0, /* rx */
+               0, /* tx */
+               0, /* drop */
+               NPKTS, /* inflight */
+               0, /* avg pkt cycles */
+               0, /* credits */
+               0, /* rx ring used */
+               4096, /* rx ring free */
+               NPKTS,  /* cq ring used */
+               25, /* cq ring free */
+               0, /* dequeue zero calls */
+               0, 0, 0, 0, 0, /* 10 dequeue buckets */
+               0, 0, 0, 0, 0,
+       };
+       if (RTE_DIM(port_expected) != NUM_PORT_STATS ||
+                       RTE_DIM(port_names) != NUM_PORT_STATS) {
+               printf("%d: port array of wrong size\n", __LINE__);
+               goto fail;
+       }
+
+       int failed = 0;
+       for (i = 0; (int)i < ret; i++) {
+               unsigned int id;
+               uint64_t val = rte_event_dev_xstats_by_name_get(evdev,
+                                                               port_names[i],
+                                                               &id);
+               if (id != i + PORT_OFF) {
+                       printf("%d: %s id incorrect, expected %d got %d\n",
+                                       __LINE__, port_names[i], i+PORT_OFF,
+                                       id);
+                       failed = 1;
+               }
+               if (val != port_expected[i]) {
+                       printf("%d: %s value incorrect, expected %"PRIu64
+                               " got %d\n", __LINE__, port_names[i],
+                               port_expected[i], id);
+                       failed = 1;
+               }
+               /* reset to zero */
+               int reset_ret = rte_event_dev_xstats_reset(evdev,
+                                               RTE_EVENT_DEV_XSTATS_PORT, PORT,
+                                               &id,
+                                               1);
+               if (reset_ret) {
+                       printf("%d: failed to reset successfully\n", __LINE__);
+                       failed = 1;
+               }
+               /* check value again */
+               val = rte_event_dev_xstats_by_name_get(evdev, port_names[i], 0);
+               if (val != port_expected_zero[i]) {
+                       printf("%d: %s value incorrect, expected %"PRIu64
+                               " got %"PRIu64"\n", __LINE__, port_names[i],
+                               port_expected_zero[i], val);
+                       failed = 1;
+               }
+       };
+       if (failed)
+               goto fail;
+
+/* num queue stats */
+#define NUM_Q_STATS 17
+/* queue offset from start of the devices whole xstats.
+ * This will break every time we add a statistic to a device/port/queue
+ */
+#define QUEUE_OFF 90
+       const uint32_t queue = 0;
+       num_stats = rte_event_dev_xstats_names_get(evdev,
+                                       RTE_EVENT_DEV_XSTATS_QUEUE, queue,
+                                       xstats_names, ids, XSTATS_MAX);
+       if (num_stats != NUM_Q_STATS) {
+               printf("%d: expected %d stats, got return %d\n",
+                       __LINE__, NUM_Q_STATS, num_stats);
+               goto fail;
+       }
+       ret = rte_event_dev_xstats_get(evdev, RTE_EVENT_DEV_XSTATS_QUEUE,
+                                       queue, ids, values, num_stats);
+       if (ret != NUM_Q_STATS) {
+               printf("%d: expected 21 stats, got return %d\n", __LINE__, ret);
+               goto fail;
+       }
+       static const char * const queue_names[] = {
+               "qid_0_rx",
+               "qid_0_tx",
+               "qid_0_drop",
+               "qid_0_inflight",
+               "qid_0_iq_size",
+               "qid_0_iq_0_used",
+               "qid_0_iq_1_used",
+               "qid_0_iq_2_used",
+               "qid_0_iq_3_used",
+               "qid_0_port_0_pinned_flows",
+               "qid_0_port_0_packets",
+               "qid_0_port_1_pinned_flows",
+               "qid_0_port_1_packets",
+               "qid_0_port_2_pinned_flows",
+               "qid_0_port_2_packets",
+               "qid_0_port_3_pinned_flows",
+               "qid_0_port_3_packets",
+       };
+       uint64_t queue_expected[] = {
+               7, /* rx */
+               7, /* tx */
+               0, /* drop */
+               7, /* inflight */
+               512, /* iq size */
+               0, /* iq 0 used */
+               0, /* iq 1 used */
+               0, /* iq 2 used */
+               0, /* iq 3 used */
+               /* QID-to-Port: pinned_flows, packets */
+               0, 0,
+               0, 0,
+               1, 7,
+               0, 0,
+       };
+       uint64_t queue_expected_zero[] = {
+               0, /* rx */
+               0, /* tx */
+               0, /* drop */
+               7, /* inflight */
+               512, /* iq size */
+               0, /* iq 0 used */
+               0, /* iq 1 used */
+               0, /* iq 2 used */
+               0, /* iq 3 used */
+               /* QID-to-Port: pinned_flows, packets */
+               0, 0,
+               0, 0,
+               1, 0,
+               0, 0,
+       };
+       if (RTE_DIM(queue_expected) != NUM_Q_STATS ||
+                       RTE_DIM(queue_expected_zero) != NUM_Q_STATS ||
+                       RTE_DIM(queue_names) != NUM_Q_STATS) {
+               printf("%d : queue array of wrong size\n", __LINE__);
+               goto fail;
+       }
+
+       failed = 0;
+       for (i = 0; (int)i < ret; i++) {
+               unsigned int id;
+               uint64_t val = rte_event_dev_xstats_by_name_get(evdev,
+                                                               queue_names[i],
+                                                               &id);
+               if (id != i + QUEUE_OFF) {
+                       printf("%d: %s id incorrect, expected %d got %d\n",
+                                       __LINE__, queue_names[i], i+QUEUE_OFF,
+                                       id);
+                       failed = 1;
+               }
+               if (val != queue_expected[i]) {
+                       printf("%d: %d: %s value , expected %"PRIu64
+                               " got %"PRIu64"\n", i, __LINE__,
+                               queue_names[i], queue_expected[i], val);
+                       failed = 1;
+               }
+               /* reset to zero */
+               int reset_ret = rte_event_dev_xstats_reset(evdev,
+                                               RTE_EVENT_DEV_XSTATS_QUEUE,
+                                               queue, &id, 1);
+               if (reset_ret) {
+                       printf("%d: failed to reset successfully\n", __LINE__);
+                       failed = 1;
+               }
+               /* check value again */
+               val = rte_event_dev_xstats_by_name_get(evdev, queue_names[i],
+                                                       0);
+               if (val != queue_expected_zero[i]) {
+                       printf("%d: %s value incorrect, expected %"PRIu64
+                               " got %"PRIu64"\n", __LINE__, queue_names[i],
+                               queue_expected_zero[i], val);
+                       failed = 1;
+               }
+       };
+
+       if (failed)
+               goto fail;
+
+       cleanup(t);
+       return 0;
+fail:
+       cleanup(t);
+       return -1;
+}
+
 static int
 ordered_reconfigure(struct test *t)
 {
@@ -917,7 +1818,7 @@ ordered_reconfigure(struct test *t)
        }
 
        const struct rte_event_queue_conf conf = {
-                       .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY,
+                       .schedule_type = RTE_SCHED_TYPE_ORDERED,
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
                        .nb_atomic_flows = 1024,
                        .nb_atomic_order_sequences = 1024,
@@ -964,7 +1865,7 @@ qid_priorities(struct test *t)
        for (i = 0; i < 3; i++) {
                /* Create QID */
                const struct rte_event_queue_conf conf = {
-                       .event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,
+                       .schedule_type = RTE_SCHED_TYPE_ATOMIC,
                        /* increase priority (0 == highest), as we go */
                        .priority = RTE_EVENT_DEV_PRIORITY_NORMAL - i,
                        .nb_atomic_flows = 1024,
@@ -1681,7 +2582,7 @@ parallel_basic(struct test *t, int check_order)
        int i;
        uint32_t deq_pkts, j;
        struct rte_mbuf *mbufs[3];
-       struct rte_mbuf *mbufs_out[3];
+       struct rte_mbuf *mbufs_out[3] = { 0 };
        const uint32_t MAGIC_SEQN = 1234;
 
        /* Create instance with 4 ports */
@@ -1818,6 +2719,324 @@ unordered_basic(struct test *t)
        return parallel_basic(t, 0);
 }
 
+static int
+holb(struct test *t) /* test to check we avoid basic head-of-line blocking */
+{
+       const struct rte_event new_ev = {
+                       .op = RTE_EVENT_OP_NEW
+                       /* all other fields zero */
+       };
+       struct rte_event ev = new_ev;
+       unsigned int rx_port = 0; /* port we get the first flow on */
+       char rx_port_used_stat[64];
+       char rx_port_free_stat[64];
+       char other_port_used_stat[64];
+
+       if (init(t, 1, 2) < 0 ||
+                       create_ports(t, 2) < 0 ||
+                       create_atomic_qids(t, 1) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               return -1;
+       }
+       int nb_links = rte_event_port_link(evdev, t->port[1], NULL, NULL, 0);
+       if (rte_event_port_link(evdev, t->port[0], NULL, NULL, 0) != 1 ||
+                       nb_links != 1) {
+               printf("%d: Error links queue to ports\n", __LINE__);
+               goto err;
+       }
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               goto err;
+       }
+
+       /* send one packet and see where it goes, port 0 or 1 */
+       if (rte_event_enqueue_burst(evdev, t->port[0], &ev, 1) != 1) {
+               printf("%d: Error doing first enqueue\n", __LINE__);
+               goto err;
+       }
+       rte_event_schedule(evdev);
+
+       if (rte_event_dev_xstats_by_name_get(evdev, "port_0_cq_ring_used", NULL)
+                       != 1)
+               rx_port = 1;
+
+       snprintf(rx_port_used_stat, sizeof(rx_port_used_stat),
+                       "port_%u_cq_ring_used", rx_port);
+       snprintf(rx_port_free_stat, sizeof(rx_port_free_stat),
+                       "port_%u_cq_ring_free", rx_port);
+       snprintf(other_port_used_stat, sizeof(other_port_used_stat),
+                       "port_%u_cq_ring_used", rx_port ^ 1);
+       if (rte_event_dev_xstats_by_name_get(evdev, rx_port_used_stat, NULL)
+                       != 1) {
+               printf("%d: Error, first event not scheduled\n", __LINE__);
+               goto err;
+       }
+
+       /* now fill up the rx port's queue with one flow to cause HOLB */
+       do {
+               ev = new_ev;
+               if (rte_event_enqueue_burst(evdev, t->port[0], &ev, 1) != 1) {
+                       printf("%d: Error with enqueue\n", __LINE__);
+                       goto err;
+               }
+               rte_event_schedule(evdev);
+       } while (rte_event_dev_xstats_by_name_get(evdev,
+                               rx_port_free_stat, NULL) != 0);
+
+       /* one more packet, which needs to stay in IQ - i.e. HOLB */
+       ev = new_ev;
+       if (rte_event_enqueue_burst(evdev, t->port[0], &ev, 1) != 1) {
+               printf("%d: Error with enqueue\n", __LINE__);
+               goto err;
+       }
+       rte_event_schedule(evdev);
+
+       /* check that the other port still has an empty CQ */
+       if (rte_event_dev_xstats_by_name_get(evdev, other_port_used_stat, NULL)
+                       != 0) {
+               printf("%d: Error, second port CQ is not empty\n", __LINE__);
+               goto err;
+       }
+       /* check IQ now has one packet */
+       if (rte_event_dev_xstats_by_name_get(evdev, "qid_0_iq_0_used", NULL)
+                       != 1) {
+               printf("%d: Error, QID does not have exactly 1 packet\n",
+                       __LINE__);
+               goto err;
+       }
+
+       /* send another flow, which should pass the other IQ entry */
+       ev = new_ev;
+       ev.flow_id = 1;
+       if (rte_event_enqueue_burst(evdev, t->port[0], &ev, 1) != 1) {
+               printf("%d: Error with enqueue\n", __LINE__);
+               goto err;
+       }
+       rte_event_schedule(evdev);
+
+       if (rte_event_dev_xstats_by_name_get(evdev, other_port_used_stat, NULL)
+                       != 1) {
+               printf("%d: Error, second flow did not pass out first\n",
+                       __LINE__);
+               goto err;
+       }
+
+       if (rte_event_dev_xstats_by_name_get(evdev, "qid_0_iq_0_used", NULL)
+                       != 1) {
+               printf("%d: Error, QID does not have exactly 1 packet\n",
+                       __LINE__);
+               goto err;
+       }
+       cleanup(t);
+       return 0;
+err:
+       rte_event_dev_dump(evdev, stdout);
+       cleanup(t);
+       return -1;
+}
+
+static int
+worker_loopback_worker_fn(void *arg)
+{
+       struct test *t = arg;
+       uint8_t port = t->port[1];
+       int count = 0;
+       int enqd;
+
+       /*
+        * Takes packets from the input port and then loops them back through
+        * the Eventdev. Each packet gets looped through QIDs 0-8, 16 times
+        * so each packet goes through 8*16 = 128 times.
+        */
+       printf("%d: \tWorker function started\n", __LINE__);
+       while (count < NUM_PACKETS) {
+#define BURST_SIZE 32
+               struct rte_event ev[BURST_SIZE];
+               uint16_t i, nb_rx = rte_event_dequeue_burst(evdev, port, ev,
+                               BURST_SIZE, 0);
+               if (nb_rx == 0) {
+                       rte_pause();
+                       continue;
+               }
+
+               for (i = 0; i < nb_rx; i++) {
+                       ev[i].queue_id++;
+                       if (ev[i].queue_id != 8) {
+                               ev[i].op = RTE_EVENT_OP_FORWARD;
+                               enqd = rte_event_enqueue_burst(evdev, port,
+                                               &ev[i], 1);
+                               if (enqd != 1) {
+                                       printf("%d: Can't enqueue FWD!!\n",
+                                                       __LINE__);
+                                       return -1;
+                               }
+                               continue;
+                       }
+
+                       ev[i].queue_id = 0;
+                       ev[i].mbuf->udata64++;
+                       if (ev[i].mbuf->udata64 != 16) {
+                               ev[i].op = RTE_EVENT_OP_FORWARD;
+                               enqd = rte_event_enqueue_burst(evdev, port,
+                                               &ev[i], 1);
+                               if (enqd != 1) {
+                                       printf("%d: Can't enqueue FWD!!\n",
+                                                       __LINE__);
+                                       return -1;
+                               }
+                               continue;
+                       }
+                       /* we have hit 16 iterations through system - drop */
+                       rte_pktmbuf_free(ev[i].mbuf);
+                       count++;
+                       ev[i].op = RTE_EVENT_OP_RELEASE;
+                       enqd = rte_event_enqueue_burst(evdev, port, &ev[i], 1);
+                       if (enqd != 1) {
+                               printf("%d drop enqueue failed\n", __LINE__);
+                               return -1;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+static int
+worker_loopback_producer_fn(void *arg)
+{
+       struct test *t = arg;
+       uint8_t port = t->port[0];
+       uint64_t count = 0;
+
+       printf("%d: \tProducer function started\n", __LINE__);
+       while (count < NUM_PACKETS) {
+               struct rte_mbuf *m = 0;
+               do {
+                       m = rte_pktmbuf_alloc(t->mbuf_pool);
+               } while (m == NULL);
+
+               m->udata64 = 0;
+
+               struct rte_event ev = {
+                               .op = RTE_EVENT_OP_NEW,
+                               .queue_id = t->qid[0],
+                               .flow_id = (uintptr_t)m & 0xFFFF,
+                               .mbuf = m,
+               };
+
+               if (rte_event_enqueue_burst(evdev, port, &ev, 1) != 1) {
+                       while (rte_event_enqueue_burst(evdev, port, &ev, 1) !=
+                                       1)
+                               rte_pause();
+               }
+
+               count++;
+       }
+
+       return 0;
+}
+
+static int
+worker_loopback(struct test *t)
+{
+       /* use a single producer core, and a worker core to see what happens
+        * if the worker loops packets back multiple times
+        */
+       struct test_event_dev_stats stats;
+       uint64_t print_cycles = 0, cycles = 0;
+       uint64_t tx_pkts = 0;
+       int err;
+       int w_lcore, p_lcore;
+
+       if (init(t, 8, 2) < 0 ||
+                       create_atomic_qids(t, 8) < 0) {
+               printf("%d: Error initializing device\n", __LINE__);
+               return -1;
+       }
+
+       /* RX with low max events */
+       static struct rte_event_port_conf conf = {
+                       .dequeue_depth = 32,
+                       .enqueue_depth = 64,
+       };
+       /* beware: this cannot be initialized in the static above as it would
+        * only be initialized once - and this needs to be set for multiple runs
+        */
+       conf.new_event_threshold = 512;
+
+       if (rte_event_port_setup(evdev, 0, &conf) < 0) {
+               printf("Error setting up RX port\n");
+               return -1;
+       }
+       t->port[0] = 0;
+       /* TX with higher max events */
+       conf.new_event_threshold = 4096;
+       if (rte_event_port_setup(evdev, 1, &conf) < 0) {
+               printf("Error setting up TX port\n");
+               return -1;
+       }
+       t->port[1] = 1;
+
+       /* CQ mapping to QID */
+       err = rte_event_port_link(evdev, t->port[1], NULL, NULL, 0);
+       if (err != 8) { /* should have mapped all queues*/
+               printf("%d: error mapping port 2 to all qids\n", __LINE__);
+               return -1;
+       }
+
+       if (rte_event_dev_start(evdev) < 0) {
+               printf("%d: Error with start call\n", __LINE__);
+               return -1;
+       }
+
+       p_lcore = rte_get_next_lcore(
+                       /* start core */ -1,
+                       /* skip master */ 1,
+                       /* wrap */ 0);
+       w_lcore = rte_get_next_lcore(p_lcore, 1, 0);
+
+       rte_eal_remote_launch(worker_loopback_producer_fn, t, p_lcore);
+       rte_eal_remote_launch(worker_loopback_worker_fn, t, w_lcore);
+
+       print_cycles = cycles = rte_get_timer_cycles();
+       while (rte_eal_get_lcore_state(p_lcore) != FINISHED ||
+                       rte_eal_get_lcore_state(w_lcore) != FINISHED) {
+
+               rte_event_schedule(evdev);
+
+               uint64_t new_cycles = rte_get_timer_cycles();
+
+               if (new_cycles - print_cycles > rte_get_timer_hz()) {
+                       test_event_dev_stats_get(evdev, &stats);
+                       printf(
+                               "%d: \tSched Rx = %"PRIu64", Tx = %"PRIu64"\n",
+                               __LINE__, stats.rx_pkts, stats.tx_pkts);
+
+                       print_cycles = new_cycles;
+               }
+               if (new_cycles - cycles > rte_get_timer_hz() * 3) {
+                       test_event_dev_stats_get(evdev, &stats);
+                       if (stats.tx_pkts == tx_pkts) {
+                               rte_event_dev_dump(evdev, stdout);
+                               printf("Dumping xstats:\n");
+                               xstats_print();
+                               printf(
+                                       "%d: No schedules for seconds, deadlock\n",
+                                       __LINE__);
+                               return -1;
+                       }
+                       tx_pkts = stats.tx_pkts;
+                       cycles = new_cycles;
+               }
+       }
+       rte_event_schedule(evdev); /* ensure all completions are flushed */
+
+       rte_eal_mp_wait_lcore();
+
+       cleanup(t);
+       return 0;
+}
+
 static struct rte_mempool *eventdev_func_mempool;
 
 static int
@@ -1836,7 +3055,7 @@ test_sw_eventdev(void)
        if (evdev < 0) {
                printf("%d: Eventdev %s not found - creating.\n",
                                __LINE__, eventdev_name);
-               if (rte_eal_vdev_init(eventdev_name, NULL) < 0) {
+               if (rte_vdev_init(eventdev_name, NULL) < 0) {
                        printf("Error creating eventdev\n");
                        return -1;
                }
@@ -1862,13 +3081,18 @@ test_sw_eventdev(void)
                }
        }
        t->mbuf_pool = eventdev_func_mempool;
-
        printf("*** Running Single Directed Packet test...\n");
        ret = test_single_directed_packet(t);
        if (ret != 0) {
                printf("ERROR - Single Directed Packet test FAILED.\n");
                return ret;
        }
+       printf("*** Running Directed Forward Credit test...\n");
+       ret = test_directed_forward_credits(t);
+       if (ret != 0) {
+               printf("ERROR - Directed Forward Credit test FAILED.\n");
+               return ret;
+       }
        printf("*** Running Single Load Balanced Packet test...\n");
        ret = single_packet(t);
        if (ret != 0) {
@@ -1948,6 +3172,30 @@ test_sw_eventdev(void)
                printf("ERROR - Abuse Inflights test FAILED.\n");
                return ret;
        }
+       printf("*** Running XStats test...\n");
+       ret = xstats_tests(t);
+       if (ret != 0) {
+               printf("ERROR - XStats test FAILED.\n");
+               return ret;
+       }
+       printf("*** Running XStats ID Reset test...\n");
+       ret = xstats_id_reset_tests(t);
+       if (ret != 0) {
+               printf("ERROR - XStats ID Reset test FAILED.\n");
+               return ret;
+       }
+       printf("*** Running XStats Brute Force test...\n");
+       ret = xstats_brute_force(t);
+       if (ret != 0) {
+               printf("ERROR - XStats Brute Force test FAILED.\n");
+               return ret;
+       }
+       printf("*** Running XStats ID Abuse test...\n");
+       ret = xstats_id_abuse_tests(t);
+       if (ret != 0) {
+               printf("ERROR - XStats ID Abuse test FAILED.\n");
+               return ret;
+       }
        printf("*** Running QID Priority test...\n");
        ret = qid_priorities(t);
        if (ret != 0) {
@@ -1972,6 +3220,23 @@ test_sw_eventdev(void)
                printf("ERROR - Port Reconfig Credits Reset test FAILED.\n");
                return ret;
        }
+       printf("*** Running Head-of-line-blocking test...\n");
+       ret = holb(t);
+       if (ret != 0) {
+               printf("ERROR - Head-of-line-blocking test FAILED.\n");
+               return ret;
+       }
+       if (rte_lcore_count() >= 3) {
+               printf("*** Running Worker loopback test...\n");
+               ret = worker_loopback(t);
+               if (ret != 0) {
+                       printf("ERROR - Worker loopback test FAILED.\n");
+                       return ret;
+               }
+       } else {
+               printf("### Not enough cores for worker loopback test.\n");
+               printf("### Need at least 3 cores for test.\n");
+       }
        /*
         * Free test instance, leaving mempool initialized, and a pointer to it
         * in static eventdev_func_mempool, as it is re-used on re-runs