ethdev: claim device reset as async
v2 cover ethdev: claim device reset as async
Device reset may have the dependency, for example, a VF reset expects PF ready, or a NIC function as a part of a SOC need to wait for other parts of the system be ready, these are time-consuming tasks and will block current thread.
So we claimed rte_eth_dev_reset as an async API, that makes things easy for an application that what to reset the device from the interrupt thread since typically a RTE_ETH_EVENT_INTR_RESET handler is invoked in interrupt thread.
rte_eth_dev_reset will spawn a new thread to call ops->dev_reset, once it is finished, it will raise the RTE_ETH_EVENT_RESET_COMPLETE event to notify the application.
Application should not assume device reset is finished after rte_eth_dev_reset return, it should always wait for a RTE_ETH_EVENT_RESET_COMPLETE event and check the reset result.
v2:
- rte_eth_dev_reset will spawn a thread.
Qi Zhang (2):
ethdev: claim device reset as async
testpmd: enable async device reset
app/test-pmd/testpmd.c | 50 +++++++++++++++++++++++++++++++++++++++++- lib/librte_ethdev/rte_ethdev.c | 48 ++++++++++++++++++++++++++++++++++++++-- lib/librte_ethdev/rte_ethdev.h | 48 ++++++++++++++++++++++++---------------- 3 files changed, 124 insertions(+), 22 deletions(-)
Signature · 1 line
2.13.6
RFC v2 1/2 ethdev: claim device reset as async
rte_eth_dev_reset should be implemented in an async way since it is possible to be invoked in interrupt thread and sometimes to reset a device need to wait for some dependency, for example, a VF expects for PF ready or a NIC function as part of a SOC wait for the whole system reset complete, and all these time-consuming tasks will block the interrupt thread.
The patch claims rte_eth_dev_reset is an async function it will spawn a new thread which will call ops->dev_reset, and when finished it will raise the event RTE_ETH_EVENT_RESET_COMPLETE. The application should always wait for this event before it continues to configure and restart the device.
--- lib/librte_ethdev/rte_ethdev.c | 48 ++++++++++++++++++++++++++++++++++++++++-- lib/librte_ethdev/rte_ethdev.h | 48 ++++++++++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 20 deletions(-)
lib/librte_ethdev/rte_ethdev.c +46 -2
@@ -1374,10 +1374,38 @@ rte_eth_dev_close(uint16_t port_id) dev->data->tx_queues =NULL ; } +struct dev_reset_args { +struct rte_eth_dev *dev; +enum rte_eth_dev_state pre_state; +}; + +static void * +do_dev_reset (void *args) +{ +struct dev_reset_args *reset_args = args; +struct rte_eth_dev *dev = reset_args->dev; +int ret; + + ret = dev->dev_ops->dev_reset (dev); + +/*restore previous device state */ + dev->state = reset_args->pre_state; + +/* notify users */ +_rte_eth_dev_callback_process (dev,RTE_ETH_EVENT_RESET_COMPLETE , + &ret); + +free (args); +return NULL ; +} +int rte_eth_dev_reset (uint16_t port_id) {struct rte_eth_dev *dev; +struct dev_reset_args *args; +char pthread_name[20 ]; +pthread_t tid;int ret;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -EINVAL );
@@ -1385,10 +1413,26 @@ rte_eth_dev_reset(uint16_t port_id)RTE_FUNC_PTR_OR_ERR_RET (*dev->dev_ops->dev_reset, -ENOTSUP ); +/* already on resetting */ +if (dev->state ==RTE_ETH_DEV_RESETTING ) +return 0 ; + + args =calloc (1 ,sizeof (struct dev_reset_args )); +if (!args) +return -ENOMEM ; +rte_eth_dev_stop (port_id); - ret = dev->dev_ops->dev_reset (dev); -return eth_err (port_id, ret); +/* store previous device state temporary */ + args->pre_state = dev->state; + + dev->state =RTE_ETH_DEV_RESETTING ; +snprintf (pthread_name,sizeof (pthread_name), +"do_dev_reset_%d" , port_id); + ret =rte_ctrl_thread_create (&tid, pthread_name,NULL , + do_dev_reset, args); + +return ret; }int __rte_experimental
lib/librte_ethdev/rte_ethdev.h +30 -18
73 lines not on this page · raw message
Signature · 1 line
2.13.6
RFC v2 2/2 testpmd: enable async device reset
In reply to Qi Zhangrte_eth_dev_reset is claimed as an async API, so re-work on the device reset handling.
--- app/test-pmd/testpmd.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)
app/test-pmd/testpmd.c +49 -1
@@ -1918,6 +1918,54 @@ close_port(portid_t pid)printf ("Done\n" ); } +static int reset_ret; +static int reset_done; + +static int +on_reset_complete(__rte_unused uint16_t port_id, + __rte_unused enum rte_eth_event_type event, + __rte_unused void *cb_arg, +void *ret_param) +{ +RTE_ASSERT (event ==RTE_ETH_EVENT_RESET_COMPLETE ); + + reset_ret = *(int *)ret_param; + reset_done =1 ; +return 0 ; +} + +static int +do_dev_reset_sync (portid_t pid) +{ +int ret; + + ret =rte_eth_dev_callback_register (pid, +RTE_ETH_EVENT_RESET_COMPLETE , + on_reset_complete,NULL ); + +if (ret) { +printf ("Fail to reigster callback function\n" ); +return ret; + } + + reset_done =0 ; + ret =rte_eth_dev_reset (pid); +if (ret) + goto finish; + +while (!reset_done) +rte_delay_ms (10 ); + + ret = reset_ret; + +finish: +rte_eth_dev_callback_unregister (pid, +RTE_ETH_EVENT_RESET_COMPLETE , + on_reset_complete,NULL ); + +return ret; +} +void reset_port (portid_t pid) {
@@ -1946,7 +1994,7 @@ reset_port(portid_t pid)continue ; } - diag =rte_eth_dev_reset (pi); + diag =do_dev_reset_sync (pi);if (diag ==0 ) { port = &ports[pi]; port->need_reconfig =1 ;
Signature · 1 line
2.13.6