app/test: uninit vdevs in event eth Rx adapter autotest
PATCH 1/2 app/test: uninit vdevs in event eth Rx adapter autotest
From: "Jay Jayatheerthan" <[email protected]>
adapter_multi_eth_add_del() does vdev init but doesn't uninit them. This causes issues when running event_eth_rx_adapter_autotest multiple times.
The fix does vdev uninit before exiting the test.
--- app/test/test_event_eth_rx_adapter.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
app/test/test_event_eth_rx_adapter.c +13 -1
@@ -464,7 +464,7 @@ 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;
@@ -484,6 +484,7 @@ adapter_multi_eth_add_del(void)/* 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 ) {snprintf (driver_name,sizeof (driver_name),"%s%u" ,"net_null" , drv_id);
@@ -513,6 +514,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 ; }
Signature · 1 line
2.17.1
PATCH 2/2 app/test: add net null dev creation in Rx adapter autotest
From: "Jay Jayatheerthan" <[email protected]>
Allows creation of net_null if vdev EAL option is not specified and uninit vdev created in the test. The change also adds error checks for vdev init and uninit.
--- app/test/test_event_eth_rx_adapter.c | 61 +++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-)
app/test/test_event_eth_rx_adapter.c +59 -2
@@ -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,
@@ -202,7 +204,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 +227,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 +263,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 +287,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 +318,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
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH 2/2] app/test: add net null dev creation in Rx adapter autotest
Hi,
Request to review the changes below.
Regards,
Jay
Quoted 142 lines
-----Original Message-----
From: Jayatheerthan, Jay <[email protected]>
Sent: Saturday, October 3, 2020 2:36 PM
To: [email protected]; [email protected]; Rao, Nikhil <[email protected]>
Cc: [email protected]; [email protected]; Jayatheerthan, Jay <[email protected]>
Subject: [PATCH 2/2] app/test: add net null dev creation in Rx adapter autotestFrom: "Jay Jayatheerthan" <[email protected]>
Allows creation of
net_nullif vdev EAL option is not specified and uninit vdev created in the test. The change also adds error checks for vdev init and uninit.Signed-off-by Jay Jayatheerthan <[email protected]>--- app/test/test_event_eth_rx_adapter.c | 61 +++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-)app/test/test_event_eth_rx_adapter.c +59
-3@@ -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,@@ -202,7 +204,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 +227,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 +263,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 +287,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 +318,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 --2.17.1
Re: [dpdk-dev] [PATCH 2/2] app/test: add net null dev creation in Rx adapter autotest
In reply to Jayatheerthan, JayQuoted 144 lines
-----Original Message-----
From: Jayatheerthan, Jay <[email protected]>
Sent: Saturday, October 3, 2020 2:36 PM
To: [email protected]; [email protected]; Rao, Nikhil <[email protected]>
Cc: [email protected]; [email protected]; Jayatheerthan, Jay <[email protected]>
Subject: [PATCH 2/2] app/test: add net null dev creation in Rx adapter autotestFrom: "Jay Jayatheerthan" <[email protected]>
Allows creation of
net_nullif vdev EAL option is not specified and uninit vdev created in the test. The change also adds error checks for vdev init and uninit.Signed-off-by Jay Jayatheerthan <[email protected]>--- app/test/test_event_eth_rx_adapter.c | 61 +++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-)app/test/test_event_eth_rx_adapter.c +2
-0@@ -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, @@ - 202,7 +204,10 @@ testsuite_setup(void)app/test/test_event_eth_rx_adapter.c +2
-1if (!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",
app/test/test_event_eth_rx_adapter.c +2
-0+ err); + event_dev_created = true; } struct rte_event_dev_config config = { @@ -222,6 +227,15 @@
testsuite_setup(void)app/test/test_event_eth_rx_adapter.c +13
-1TEST_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 +263,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_configconfig = { @@ -270,6 +287,15 @@testsuite_setup_rx_intr(void)app/test/test_event_eth_rx_adapter.c +40
-1TEST_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 +318,52 @@ testsuite_setup_rx_intr(void) static voidtestsuite_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 --
Quoted 1 line
2.17.1
Hi,
Request to review the changes below.
Regards,
Jay
Quoted 61 lines
-----Original Message-----
From: Jayatheerthan, Jay <[email protected]>
Sent: Saturday, October 3, 2020 2:36 PM
To: [email protected]; [email protected]; Rao, Nikhil <[email protected]>
Cc: [email protected]; [email protected]; Jayatheerthan, Jay <[email protected]>
Subject: [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotestFrom: "Jay Jayatheerthan" <[email protected]>
adapter_multi_eth_add_del()does vdev init but doesn't uninit them. This causes issues when runningevent_eth_rx_adapter_autotestmultiple times.The fix does vdev uninit before exiting the test.
Signed-off-by Jay Jayatheerthan <[email protected]>--- app/test/test_event_eth_rx_adapter.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)app/test/test_event_eth_rx_adapter.c +13
-2@@ -464,7 +464,7 @@ 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;@@ -484,6 +484,7 @@ adapter_multi_eth_add_del(void)/* 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 ) {snprintf (driver_name,sizeof (driver_name),"%s%u" ,"net_null" , drv_id);@@ -513,6 +514,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 ; } --2.17.1
Quoted 67 lines
-----Original Message-----
From: Jayatheerthan, Jay <[email protected]>
Sent: Saturday, October 3, 2020 2:36 PM
To: [email protected]; [email protected]; Rao, Nikhil <[email protected]>
Cc: [email protected]; [email protected]; Jayatheerthan, Jay <[email protected]>
Subject: [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotestFrom: "Jay Jayatheerthan" <[email protected]>
adapter_multi_eth_add_del()does vdev init but doesn't uninit them. This causes issues when runningevent_eth_rx_adapter_autotestmultiple times.The fix does vdev uninit before exiting the test.
Signed-off-by Jay Jayatheerthan <[email protected]>--- app/test/test_event_eth_rx_adapter.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)app/test/test_event_eth_rx_adapter.c +1
-1@@ -464,7 +464,7 @@ 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; @@ -484,6 +484,7 @@
adapter_multi_eth_add_del(void)app/test/test_event_eth_rx_adapter.c +1
-0/* 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 ) { snprintf(driver_name, sizeof(driver_name), "%s%u","
net_null",app/test/test_event_eth_rx_adapter.c +11
-1drv_id);@@ -513,6 +514,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 ; } --
Quoted 1 line
2.17.1
Quoted 67 lines · Nikhil
Quoted 67 lines
-----Original Message-----
From: Jayatheerthan, Jay <[email protected]>
Sent: Saturday, October 3, 2020 2:36 PM
To: [email protected]; [email protected]; Rao, Nikhil <[email protected]>
Cc: [email protected]; [email protected]; Jayatheerthan, Jay <[email protected]>
Subject: [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotestFrom: "Jay Jayatheerthan" <[email protected]>
adapter_multi_eth_add_del()does vdev init but doesn't uninit them. This causes issues when runningevent_eth_rx_adapter_autotestmultiple times.The fix does vdev uninit before exiting the test.
Signed-off-by Jay Jayatheerthan <[email protected]>--- app/test/test_event_eth_rx_adapter.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)app/test/test_event_eth_rx_adapter.c +1
-1@@ -464,7 +464,7 @@ 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; @@ -484,6 +484,7 @@
adapter_multi_eth_add_del(void)/* 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) {
snprintf(driver_name,sizeof(driver_name), "%s%u",
"net_null",drv_id);app/test/test_event_eth_rx_adapter.c +11
-0@@ -513,6 +514,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 ; }
Quoted 3 lines
Quoted 2 lines
--
2.17.1Reviewed-by Nikhil Rao <[email protected]>
Series applied to dpdk-next-eventdev/main. Thanks.