[dpdk-dev] [PATCH v3] net/i40e: fix intr callback unregister by adding retry

[wangyunjian]

Is it better to fix this way? Or other ideas?

-       /* register callback func to eal lib */
-       rte_intr_callback_unregister(intr_handle,
-                                    i40e_dev_interrupt_handler, dev);
-
+       /* unregister callback func to eal lib */
+       while ((ret = rte_intr_callback_unregister(intr_handle,
+                       i40e_dev_interrupt_handler, dev)) == -EAGAIN)
+               ;
+       if (ret < 0)
+               PMD_INIT_LOG(ERR,
+                       "cannot unregister interrupt handler %d",
+                       ret);

> -----Original Message-----
> From: Zhang, Qi Z [mailto:qi.z.zhang at intel.com]
> Sent: Wednesday, March 14, 2018 9:42 PM
> To: Rybalchenko, Kirill <kirill.rybalchenko at intel.com>; wangyunjian
> <wangyunjian at huawei.com>; dev at dpdk.org
> Cc: caihe <caihe at huawei.com>
> Subject: RE: [dpdk-dev] [PATCH v3] net/i40e: fix intr callback unregister by
> adding retry
> 
> 
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Rybalchenko,
> > Kirill
> > Sent: Wednesday, March 14, 2018 8:08 PM
> > To: wangyunjian <wangyunjian at huawei.com>; dev at dpdk.org
> > Cc: caihe at huawei.com
> > Subject: Re: [dpdk-dev] [PATCH v3] net/i40e: fix intr callback
> > unregister by adding retry
> >
> >
> >
> > > -----Original Message-----
> > > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of wangyunjian
> > > Sent: Wednesday 14 March 2018 12:02
> > > To: dev at dpdk.org
> > > Cc: caihe at huawei.com; Yunjian Wang <wangyunjian at huawei.com>
> > > Subject: [dpdk-dev] [PATCH v3] net/i40e: fix intr callback
> > > unregister by adding retry
> > >
> > > From: Yunjian Wang <wangyunjian at 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 at huawei.com>
> > > ---
> > > v2:
> > > * Fix return value check
> > > ---
> > > v3:
> > > * Fix comment suggested by Kirill Rybalchenko
> > > ---
> > >  drivers/net/i40e/i40e_ethdev.c | 18 +++++++++++++++---
> > >  1 file changed, 15 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > > b/drivers/net/i40e/i40e_ethdev.c index 508b417..6bb31f6 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();
> > >
> > > @@ -1574,9 +1575,20 @@ void i40e_flex_payload_reg_set_default(struct
> > > i40e_hw *hw)
> > >  	/* disable uio intr before callback unregister */
> > >  	rte_intr_disable(intr_handle);
> > >
> > > -	/* register callback func to eal lib */
> > > -	rte_intr_callback_unregister(intr_handle,
> > > -				     i40e_dev_interrupt_handler, dev);
> > > +	/* unregister callback func to eal lib */
> > > +	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
> > >
> >
> > Reviewed-by: Kirill Rybalchenko <kirill.rybalchenko at intel.com>
> >
> Acked-by: Qi Zhang <qi.z.zhang at intel.com>