X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_event_eth_rx_adapter.c;h=7cb91b152faeb6a8c7b2fc0a7ddd2a196a7924ae;hb=65d68c7cd787101a5f11f9e3c16c0315633d6b02;hp=1d3be82b5a77bac9185369406ed50c9d1c64cd85;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c index 1d3be82b5a..7cb91b152f 100644 --- 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, @@ -45,7 +47,9 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf, retval = rte_eth_dev_configure(port, 0, 0, port_conf); - rte_eth_dev_info_get(port, &dev_info); + retval = rte_eth_dev_info_get(port, &dev_info); + if (retval != 0) + return retval; default_params.rx_rings = RTE_MIN(dev_info.max_rx_queues, MAX_NUM_RX_QUEUE); @@ -78,17 +82,18 @@ port_init_common(uint16_t port, const struct rte_eth_conf *port_conf, return retval; /* Display the port MAC address. */ - struct ether_addr addr; - rte_eth_macaddr_get(port, &addr); + struct rte_ether_addr addr; + retval = rte_eth_macaddr_get(port, &addr); + if (retval < 0) + 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. */ - rte_eth_promiscuous_enable(port); + retval = rte_eth_promiscuous_enable(port); + if (retval != 0) + return retval; return 0; } @@ -98,7 +103,7 @@ port_init_rx_intr(uint16_t port, struct rte_mempool *mp) { static const struct rte_eth_conf port_conf_default = { .rxmode = { - .mq_mode = ETH_MQ_RX_NONE, + .mq_mode = RTE_ETH_MQ_RX_NONE, }, .intr_conf = { .rxq = 1, @@ -113,7 +118,7 @@ port_init(uint16_t port, struct rte_mempool *mp) { static const struct rte_eth_conf port_conf_default = { .rxmode = { - .mq_mode = ETH_MQ_RX_NONE, + .mq_mode = RTE_ETH_MQ_RX_NONE, }, }; @@ -150,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; } @@ -196,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 = { @@ -216,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 @@ -243,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 = { @@ -264,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 @@ -286,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 @@ -325,6 +387,148 @@ adapter_create(void) return err; } +static int +adapter_create_with_params(void) +{ + int err; + struct rte_event_dev_info dev_info; + struct rte_event_port_conf rx_p_conf; + struct rte_event_eth_rx_adapter_params rxa_params; + + memset(&rx_p_conf, 0, sizeof(rx_p_conf)); + + err = rte_event_dev_info_get(TEST_DEV_ID, &dev_info); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + rx_p_conf.new_event_threshold = dev_info.max_num_events; + rx_p_conf.dequeue_depth = dev_info.max_event_port_dequeue_depth; + rx_p_conf.enqueue_depth = dev_info.max_event_port_enqueue_depth; + + rxa_params.use_queue_event_buf = false; + rxa_params.event_buf_size = 0; + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + rxa_params.use_queue_event_buf = true; + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == -EEXIST, "Expected -EEXIST got %d", err); + + return TEST_SUCCESS; +} + +static int +adapter_queue_event_buf_test(void) +{ + int err; + struct rte_event ev; + uint32_t cap; + + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; + + err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID, + &cap); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + ev.queue_id = 0; + ev.sched_type = RTE_SCHED_TYPE_ATOMIC; + ev.priority = 0; + + queue_config.rx_queue_flags = 0; + if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID) { + ev.flow_id = 1; + queue_config.rx_queue_flags = + RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID; + } + queue_config.ev = ev; + queue_config.servicing_weight = 1; + queue_config.event_buf_size = 0; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &queue_config); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + queue_config.event_buf_size = 1024; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &queue_config); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + return TEST_SUCCESS; +} + +static int +adapter_queue_stats_test(void) +{ + int err; + struct rte_event ev; + uint32_t cap; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; + struct rte_event_eth_rx_adapter_queue_stats q_stats; + + err = rte_event_eth_rx_adapter_queue_stats_get(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &q_stats); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + err = rte_event_eth_rx_adapter_queue_stats_reset(TEST_INST_ID, + TEST_ETHDEV_ID, 0); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID, + &cap); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + ev.queue_id = 0; + ev.sched_type = RTE_SCHED_TYPE_ATOMIC; + ev.priority = 0; + + queue_config.rx_queue_flags = 0; + if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID) { + ev.flow_id = 1; + queue_config.rx_queue_flags = + RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID; + } + queue_config.ev = ev; + queue_config.servicing_weight = 1; + queue_config.event_buf_size = 1024; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &queue_config); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_queue_stats_get(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &q_stats); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_queue_stats_reset(TEST_INST_ID, + TEST_ETHDEV_ID, 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + return TEST_SUCCESS; +} + static void adapter_free(void) { @@ -366,6 +570,50 @@ adapter_create_free(void) return TEST_SUCCESS; } +static int +adapter_create_free_with_params(void) +{ + int err; + + struct rte_event_port_conf rx_p_conf = { + .dequeue_depth = 8, + .enqueue_depth = 8, + .new_event_threshold = 1200, + }; + + struct rte_event_eth_rx_adapter_params rxa_params = { + .event_buf_size = 1024 + }; + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, NULL, NULL); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == -EEXIST, "Expected -EEXIST %d got %d", -EEXIST, err); + + rxa_params.event_buf_size = 0; + err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID, + TEST_DEV_ID, &rx_p_conf, &rxa_params); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + err = rte_event_eth_rx_adapter_free(TEST_INST_ID); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + err = rte_event_eth_rx_adapter_free(TEST_INST_ID); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err); + + err = rte_event_eth_rx_adapter_free(1); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err); + + return TEST_SUCCESS; +} + static int adapter_queue_add_del(void) { @@ -373,7 +621,7 @@ adapter_queue_add_del(void) struct rte_event ev; uint32_t cap; - struct rte_event_eth_rx_adapter_queue_conf queue_config; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID, &cap); @@ -458,10 +706,10 @@ adapter_multi_eth_add_del(void) int err; struct rte_event ev; - uint16_t port_index, drv_id = 0; + uint16_t port_index, port_index_base, drv_id = 0; char driver_name[50]; - struct rte_event_eth_rx_adapter_queue_conf queue_config; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; ev.queue_id = 0; ev.sched_type = RTE_SCHED_TYPE_ATOMIC; @@ -473,13 +721,18 @@ 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(); + port_index_base = port_index; for (; port_index < RTE_MAX_ETHPORTS; port_index += 1) { - sprintf(driver_name, "%s%u", "net_null", drv_id); + snprintf(driver_name, sizeof(driver_name), "%s%u", "net_null", + drv_id); err = rte_vdev_init(driver_name, NULL); TEST_ASSERT(err == 0, "Failed driver %s got %d", driver_name, err); @@ -506,6 +759,17 @@ adapter_multi_eth_add_del(void) TEST_ASSERT(err == 0, "Expected 0 got %d", err); } + /* delete vdev ports */ + for (drv_id = 0, port_index = port_index_base; + port_index < RTE_MAX_ETHPORTS; + drv_id += 1, port_index += 1) { + snprintf(driver_name, sizeof(driver_name), "%s%u", "net_null", + drv_id); + err = rte_vdev_uninit(driver_name); + TEST_ASSERT(err == 0, "Failed driver %s got %d", + driver_name, err); + } + return TEST_SUCCESS; } @@ -516,7 +780,7 @@ adapter_intr_queue_add_del(void) struct rte_event ev; uint32_t cap; uint16_t eth_port; - struct rte_event_eth_rx_adapter_queue_conf queue_config; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; if (!default_params.rx_intr_port_inited) return 0; @@ -609,7 +873,7 @@ adapter_start_stop(void) ev.sched_type = RTE_SCHED_TYPE_ATOMIC; ev.priority = 0; - struct rte_event_eth_rx_adapter_queue_conf queue_config; + struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; queue_config.rx_queue_flags = 0; if (default_params.caps & @@ -669,18 +933,73 @@ adapter_stats(void) return TEST_SUCCESS; } +static int +adapter_queue_conf(void) +{ + int err; + struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0}; + + /* Case 1: queue conf get without any queues in Rx adapter */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, &queue_conf); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + /* Add queue to Rx adapter */ + queue_conf.ev.queue_id = 0; + queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC; + queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, &queue_conf); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 2: queue conf get with queue added to Rx adapter */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, &queue_conf); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 3: queue conf get with invalid rx queue id */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, + -1, &queue_conf); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + /* Case 4: queue conf get with NULL queue conf struct */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, NULL); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + /* Delete queue from the Rx adapter */ + err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + return TEST_SUCCESS; +} + static struct unit_test_suite event_eth_rx_tests = { .suite_name = "rx event eth adapter test suite", .setup = testsuite_setup, .teardown = testsuite_teardown, .unit_test_cases = { TEST_CASE_ST(NULL, NULL, adapter_create_free), + TEST_CASE_ST(NULL, NULL, adapter_create_free_with_params), TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_add_del), TEST_CASE_ST(adapter_create, adapter_free, adapter_multi_eth_add_del), TEST_CASE_ST(adapter_create, adapter_free, adapter_start_stop), TEST_CASE_ST(adapter_create, adapter_free, adapter_stats), + TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_conf), + TEST_CASE_ST(adapter_create_with_params, adapter_free, + adapter_queue_event_buf_test), + TEST_CASE_ST(adapter_create_with_params, adapter_free, + adapter_queue_stats_test), TEST_CASES_END() /**< NULL terminate unit test array */ } };