[dpdk-dev] net/i40e: fix intr callback unregister by adding retry
Checks
Commit Message
From: Yunjian Wang <wangyunjian@huawei.com>
The nic's interrupt source has some active callbacks, when
the port hotplug. Add a retry to give more port's a chance
to uninit before returning an error.
Fixes: d42aaf30008b ("i40e: support port hotplug")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/i40e/i40e_ethdev.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
Comments
The core-eal-intr-thread-1896 received signal SIGSEGV, Segmentation fault：
#1 rte_i40e_dev_atomic_write_link_status (dev=0xa21940 <rte_eth_devices+16512>, link=0x7f0d9e2b57d0)at /usr/src/debug/dpdk-16.11/drivers/net/i40e/i40e_ethdev.c:712
#2 i40e_dev_link_update (dev=dev@entry=0xa21940 <rte_eth_devices+16512>,wait_to_complete=wait_to_complete@entry=0) at /usr/src/debug/dpdk-16.11/drivers/net/i40e/i40e_ethdev.c:2098
#3 i40e_dev_handle_aq_msg (dev=0xa21940 <rte_eth_devices+16512>)at /usr/src/debug/dpdk-16.11/drivers/net/i40e/i40e_ethdev.c:5660
#4 i40e_dev_interrupt_handler (handle=<optimized out>, param=0xa21940 <rte_eth_devices+16512>)at /usr/src/debug/dpdk-16.11/drivers/net/i40e/i40e_ethdev.c:5728
#5 eal_intr_process_interrupts (events=0x0, nfds=-1641326720) at /usr/src/debug/dpdk-16.11/lib/librte_eal/linuxapp/eal/eal_interrupts.c:814
#6 eal_intr_handle_interrupts (totalfds=<optimized out>, pfd=145) at /usr/src/debug/dpdk-16.11/lib/librte_eal/linuxapp/eal/eal_interrupts.c:881
#7 eal_intr_thread_main (arg=<optimized out>)at /usr/src/debug/dpdk-16.11/lib/librte_eal/linuxapp/eal/eal_interrupts.c:975
#8 start_thread () from /usr/lib64/libpthread.so.0
#9 clone () from /usr/lib64/libc.so.6
> -----Original Message-----
> From: wangyunjian
> Sent: Saturday, March 10, 2018 2:51 PM
> To: dev@dpdk.org
> Cc: caihe <caihe@huawei.com>; wangyunjian <wangyunjian@huawei.com>
> Subject: [dpdk-dev] net/i40e: fix intr callback unregister by adding retry
>
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The nic's interrupt source has some active callbacks, when the port hotplug.
> Add a retry to give more port's a chance to uninit before returning an error.
>
> Fixes: d42aaf30008b ("i40e: support port hotplug")
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 508b417..a73d4df 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -1533,6 +1533,7 @@ void i40e_flex_payload_reg_set_default(struct
> i40e_hw *hw)
> struct rte_flow *p_flow;
> int ret;
> uint8_t aq_fail = 0;
> + int retries = 0;
>
> PMD_INIT_FUNC_TRACE();
>
> @@ -1575,8 +1576,19 @@ void i40e_flex_payload_reg_set_default(struct
> i40e_hw *hw)
> rte_intr_disable(intr_handle);
>
> /* register callback func to eal lib */
> - rte_intr_callback_unregister(intr_handle,
> - i40e_dev_interrupt_handler, dev);
> + do {
> + ret = rte_intr_callback_unregister(intr_handle,
> + i40e_dev_interrupt_handler, dev);
> + if (!ret) {
> + break;
> + } else if (ret != -EAGAIN) {
> + PMD_INIT_LOG(ERR,
> + "intr callback unregister failed: %d",
> + ret);
> + return ret;
> + }
> + i40e_msec_delay(100);
> + } while (retries++ < 5);
>
> i40e_rm_ethtype_filter_list(pf);
> i40e_rm_tunnel_filter_list(pf);
> --
> 1.8.3.1
>
> -----Original Message-----
> From: wangyunjian
> Sent: Saturday, March 10, 2018 2:51 PM
> To: dev@dpdk.org
> Cc: caihe <caihe@huawei.com>; wangyunjian <wangyunjian@huawei.com>
> Subject: [dpdk-dev] net/i40e: fix intr callback unregister by adding retry
>
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The nic's interrupt source has some active callbacks, when the port hotplug.
> Add a retry to give more port's a chance to uninit before returning an error.
>
> Fixes: d42aaf30008b ("i40e: support port hotplug")
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 508b417..a73d4df 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -1533,6 +1533,7 @@ void i40e_flex_payload_reg_set_default(struct
> i40e_hw *hw)
> struct rte_flow *p_flow;
> int ret;
> uint8_t aq_fail = 0;
> + int retries = 0;
>
> PMD_INIT_FUNC_TRACE();
>
> @@ -1575,8 +1576,19 @@ void i40e_flex_payload_reg_set_default(struct
> i40e_hw *hw)
> rte_intr_disable(intr_handle);
>
> /* register callback func to eal lib */
> - rte_intr_callback_unregister(intr_handle,
> - i40e_dev_interrupt_handler, dev);
> + do {
> + ret = rte_intr_callback_unregister(intr_handle,
> + i40e_dev_interrupt_handler, dev);
> + if (!ret) {
This check is wrong. I will send the v2 later.
> + break;
> + } else if (ret != -EAGAIN) {
> + PMD_INIT_LOG(ERR,
> + "intr callback unregister failed: %d",
> + ret);
> + return ret;
> + }
> + i40e_msec_delay(100);
> + } while (retries++ < 5);
>
> i40e_rm_ethtype_filter_list(pf);
> i40e_rm_tunnel_filter_list(pf);
> --
> 1.8.3.1
>
@@ -1533,6 +1533,7 @@ void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)
struct rte_flow *p_flow;
int ret;
uint8_t aq_fail = 0;
+ int retries = 0;
PMD_INIT_FUNC_TRACE();
@@ -1575,8 +1576,19 @@ void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)
rte_intr_disable(intr_handle);
/* register callback func to eal lib */
- rte_intr_callback_unregister(intr_handle,
- i40e_dev_interrupt_handler, dev);
+ do {
+ ret = rte_intr_callback_unregister(intr_handle,
+ i40e_dev_interrupt_handler, dev);
+ if (!ret) {
+ break;
+ } else if (ret != -EAGAIN) {
+ PMD_INIT_LOG(ERR,
+ "intr callback unregister failed: %d",
+ ret);
+ return ret;
+ }
+ i40e_msec_delay(100);
+ } while (retries++ < 5);
i40e_rm_ethtype_filter_list(pf);
i40e_rm_tunnel_filter_list(pf);