Handle device reset in a separate thread and raise RTE_ETH_EVENT_RESET_COMPLETE event when it is done.
Signed-off-by: Qi Zhang <qi.z.zh...@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 28 +++++++++++++++++++++++----- drivers/net/i40e/i40e_ethdev_vf.c | 28 +++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 85a6a867f..611570159 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2439,12 +2439,29 @@ i40e_dev_close(struct rte_eth_dev *dev) I40E_WRITE_FLUSH(hw); } +static void * +do_dev_reset(void *args) +{ + struct rte_eth_dev *dev = args; + int ret; + + ret = eth_i40e_dev_uninit(dev); + if (!ret) + ret = eth_i40e_dev_init(dev, NULL); + + _rte_eth_dev_callback_process(dev, + RTE_ETH_EVENT_RESET_COMPLETE, + &ret); + return NULL; +} + /* * Reset PF device only to re-initialize resources in PMD layer */ static int i40e_dev_reset(struct rte_eth_dev *dev) { + pthread_t tid; int ret; /* When a DPDK PMD PF begin to reset PF port, it should notify all @@ -2456,11 +2473,12 @@ i40e_dev_reset(struct rte_eth_dev *dev) if (dev->data->sriov.active) return -ENOTSUP; - ret = eth_i40e_dev_uninit(dev); - if (ret) - return ret; - - ret = eth_i40e_dev_init(dev, NULL); + /** + * Since dev_reset should be implemented as async, do + * reset in a separate thread. + */ + ret = rte_ctrl_thread_create(&tid, "i40e_dev_reset", + NULL, do_dev_reset, dev); return ret; } diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 001c301b9..e10e81792 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2284,19 +2284,37 @@ i40evf_dev_close(struct rte_eth_dev *dev) i40evf_disable_irq0(hw); } +static void * +do_dev_reset(void *args) +{ + struct rte_eth_dev *dev = args; + int ret; + + ret = i40evf_dev_uninit(dev); + if (!ret) + ret = i40evf_dev_init(dev); + + _rte_eth_dev_callback_process(dev, + RTE_ETH_EVENT_RESET_COMPLETE, + &ret); + return NULL; +} + /* * Reset VF device only to re-initialize resources in PMD layer */ static int i40evf_dev_reset(struct rte_eth_dev *dev) { + pthread_t tid; int ret; - ret = i40evf_dev_uninit(dev); - if (ret) - return ret; - - ret = i40evf_dev_init(dev); + /** + * Since dev_reset should be implemented as async, do + * reset in a separate thread. + */ + ret = rte_ctrl_thread_create(&tid, "i40evf_dev_reset", + NULL, do_dev_reset, dev); return ret; } -- 2.13.6