net/sfc: rename array of SW stats descriptions

[dpdk.git] / app / test / test_event_eth_rx_adapter.c

diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c
index 71c9461..add4d8a 100644 (file)
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -30,6 +30,8 @@ struct event_eth_rx_adapter_test_params {
 };
 
 static struct event_eth_rx_adapter_test_params default_params;
+static bool event_dev_created;
+static bool eth_dev_created;
 
 static inline int
 port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
@@ -86,10 +88,7 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf,
                return retval;
        printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8
                           " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n",
-                       (unsigned int)port,
-                       addr.addr_bytes[0], addr.addr_bytes[1],
-                       addr.addr_bytes[2], addr.addr_bytes[3],
-                       addr.addr_bytes[4], addr.addr_bytes[5]);
+                       (unsigned int)port, RTE_ETHER_ADDR_BYTES(&addr));
 
        /* Enable RX in promiscuous mode for the Ethernet device. */
        retval = rte_eth_promiscuous_enable(port);
@@ -156,7 +155,9 @@ init_port_rx_intr(int num_ports)
                        default_params.rx_intr_port = portid;
                        return 0;
                }
-               rte_eth_dev_stop(portid);
+               retval = rte_eth_dev_stop(portid);
+               TEST_ASSERT(retval == 0, "Failed to stop port %u: %d\n",
+                                       portid, retval);
        }
        return 0;
 }
@@ -202,7 +203,10 @@ testsuite_setup(void)
        if (!count) {
                printf("Failed to find a valid event device,"
                        " testing with event_skeleton device\n");
-               rte_vdev_init("event_skeleton", NULL);
+               err = rte_vdev_init("event_skeleton", NULL);
+               TEST_ASSERT(err == 0, "Failed to create event_skeleton. err=%d",
+                           err);
+               event_dev_created = true;
        }
 
        struct rte_event_dev_config config = {
@@ -222,6 +226,15 @@ testsuite_setup(void)
        TEST_ASSERT(err == 0, "Event device initialization failed err %d\n",
                        err);
 
+       count = rte_eth_dev_count_total();
+       if (!count) {
+               printf("Testing with net_null device\n");
+               err = rte_vdev_init("net_null", NULL);
+               TEST_ASSERT(err == 0, "Failed to create net_null. err=%d",
+                           err);
+               eth_dev_created = true;
+       }
+
        /*
         * eth devices like octeontx use event device to receive packets
         * so rte_eth_dev_start invokes rte_event_dev_start internally, so
@@ -249,7 +262,10 @@ testsuite_setup_rx_intr(void)
        if (!count) {
                printf("Failed to find a valid event device,"
                        " testing with event_skeleton device\n");
-               rte_vdev_init("event_skeleton", NULL);
+               err = rte_vdev_init("event_skeleton", NULL);
+               TEST_ASSERT(err == 0, "Failed to create event_skeleton. err=%d",
+                           err);
+               event_dev_created = true;
        }
 
        struct rte_event_dev_config config = {
@@ -270,6 +286,15 @@ testsuite_setup_rx_intr(void)
        TEST_ASSERT(err == 0, "Event device initialization failed err %d\n",
                        err);
 
+       count = rte_eth_dev_count_total();
+       if (!count) {
+               printf("Testing with net_null device\n");
+               err = rte_vdev_init("net_null", NULL);
+               TEST_ASSERT(err == 0, "Failed to create net_null. err=%d",
+                           err);
+               eth_dev_created = true;
+       }
+
        /*
         * eth devices like octeontx use event device to receive packets
         * so rte_eth_dev_start invokes rte_event_dev_start internally, so
@@ -292,21 +317,52 @@ testsuite_setup_rx_intr(void)
 static void
 testsuite_teardown(void)
 {
+       int err;
        uint32_t i;
        RTE_ETH_FOREACH_DEV(i)
                rte_eth_dev_stop(i);
 
+       if (eth_dev_created) {
+               err = rte_vdev_uninit("net_null");
+               if (err)
+                       printf("Failed to delete net_null. err=%d", err);
+               eth_dev_created = false;
+       }
+
        rte_mempool_free(default_params.mp);
+       if (event_dev_created) {
+               err = rte_vdev_uninit("event_skeleton");
+               if (err)
+                       printf("Failed to delete event_skeleton. err=%d", err);
+               event_dev_created = false;
+       }
+
+       memset(&default_params, 0, sizeof(default_params));
 }
 
 static void
 testsuite_teardown_rx_intr(void)
 {
+       int err;
        if (!default_params.rx_intr_port_inited)
                return;
 
        rte_eth_dev_stop(default_params.rx_intr_port);
+       if (eth_dev_created) {
+               err = rte_vdev_uninit("net_null");
+               if (err)
+                       printf("Failed to delete net_null. err=%d", err);
+               eth_dev_created = false;
+       }
        rte_mempool_free(default_params.mp);
+       if (event_dev_created) {
+               err = rte_vdev_uninit("event_skeleton");
+               if (err)
+                       printf("Failed to delete event_skeleton. err=%d", err);
+               event_dev_created = false;
+       }
+
+       memset(&default_params, 0, sizeof(default_params));
 }
 
 static int
@@ -479,8 +535,11 @@ adapter_multi_eth_add_del(void)
 
        /* stop eth devices for existing */
        port_index = 0;
-       for (; port_index < rte_eth_dev_count_total(); port_index += 1)
-               rte_eth_dev_stop(port_index);
+       for (; port_index < rte_eth_dev_count_total(); port_index += 1) {
+               err = rte_eth_dev_stop(port_index);
+               TEST_ASSERT(err == 0, "Failed to stop port %u: %d\n",
+                                       port_index, err);
+       }
 
        /* add the max port for rx_adapter */
        port_index = rte_eth_dev_count_total();