diff mbox

[dpdk-dev] net/ixgbe: fix intr callback unregister by adding retry

Message ID 1521635290-9652-1-git-send-email-wangyunjian@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Helin Zhang
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Yunjian Wang March 21, 2018, 12:28 p.m. UTC 
  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: 2866c5f1b87e ("ixgbe: support port hotplug")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Comments

Qi Zhang March 28, 2018, 12:56 a.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of wangyunjian
> Sent: Wednesday, March 21, 2018 8:28 PM
> To: dev@dpdk.org
> Cc: caihe@huawei.com; Yunjian Wang <wangyunjian@huawei.com>
> Subject: [dpdk-dev] [PATCH] net/ixgbe: 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: 2866c5f1b87e ("ixgbe: support port hotplug")
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Zhang, Helin March 29, 2018, 5:07 a.m. UTC | #2 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhang, Qi Z
> Sent: Wednesday, March 28, 2018 8:56 AM
> To: wangyunjian; dev@dpdk.org
> Cc: caihe@huawei.com
> Subject: Re: [dpdk-dev] [PATCH] net/ixgbe: fix intr callback unregister by adding
> retry
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of wangyunjian
> > Sent: Wednesday, March 21, 2018 8:28 PM
> > To: dev@dpdk.org
> > Cc: caihe@huawei.com; Yunjian Wang <wangyunjian@huawei.com>
> > Subject: [dpdk-dev] [PATCH] net/ixgbe: 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: 2866c5f1b87e ("ixgbe: support port hotplug")
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> 
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel, thanks!

/Helin
diff mbox

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 4483258..6c01683 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1339,6 +1339,8 @@  struct rte_ixgbe_xstats_name_off {
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 	struct ixgbe_hw *hw;
+	int retries = 0;
+	int ret;
 
 	PMD_INIT_FUNC_TRACE();
 
@@ -1359,8 +1361,20 @@  struct rte_ixgbe_xstats_name_off {
 
 	/* disable uio intr before callback unregister */
 	rte_intr_disable(intr_handle);
-	rte_intr_callback_unregister(intr_handle,
-				     ixgbe_dev_interrupt_handler, eth_dev);
+
+	do {
+		ret = rte_intr_callback_unregister(intr_handle,
+				ixgbe_dev_interrupt_handler, eth_dev);
+		if (ret >= 0) {
+			break;
+		} else if (ret != -EAGAIN) {
+			PMD_INIT_LOG(ERR,
+				"intr callback unregister failed: %d",
+				ret);
+			return ret;
+		}
+		rte_delay_ms(100);
+	} while (retries++ < (10 + IXGBE_LINK_UP_TIME));
 
 	/* uninitialize PF if max_vfs not zero */
 	ixgbe_pf_host_uninit(eth_dev);