[dpdk-dev,v2] 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>
---
v2:
* Fix return value check
---
drivers/net/i40e/i40e_ethdev.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
Comments
Hi Yunjian,
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of wangyunjian
> Sent: Tuesday 13 March 2018 06:53
> To: dev@dpdk.org
> Cc: caihe@huawei.com; Yunjian Wang <wangyunjian@huawei.com>
> Subject: [dpdk-dev] [PATCH v2] 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>
> ---
> v2:
> * Fix return value check
> ---
> 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..0a29fdd 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 */
It's not a part of your patch, but I believe it makes sense to fix this:
/* unregister callback func from 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 >= 0) {
> + 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: Rybalchenko, Kirill [mailto:kirill.rybalchenko@intel.com]
> Sent: Wednesday, March 14, 2018 7:04 PM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: caihe <caihe@huawei.com>
> Subject: RE: [dpdk-dev] [PATCH v2] net/i40e: fix intr callback unregister by
> adding retry
>
> Hi Yunjian,
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of wangyunjian
> > Sent: Tuesday 13 March 2018 06:53
> > To: dev@dpdk.org
> > Cc: caihe@huawei.com; Yunjian Wang <wangyunjian@huawei.com>
> > Subject: [dpdk-dev] [PATCH v2] 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>
> > ---
> > v2:
> > * Fix return value check
> > ---
> > 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..0a29fdd 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 */
>
>
> It's not a part of your patch, but I believe it makes sense to fix this:
> /* unregister callback func from eal lib */
Thanks, I will send the v3 to fix this later.
>
> > - 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 >= 0) {
> > + 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 >= 0) {
+ 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);