diff mbox

[v2,2/2] ixgbe: Teardown SR-IOV before unregister_netdev()

Message ID 20150729203821.10732.51057.stgit@gimli.home
State Accepted
Delegated to: Jeff Kirsher
Headers show

Commit Message

Alex Williamson July 29, 2015, 8:38 p.m. UTC
When the .remove() callback for a PF is called, SR-IOV support for the
device is disabled, which requires unbinding and removing the VFs.
The VFs may be in-use either by the host kernel or userspace, such as
assigned to a VM through vfio-pci.  In this latter case, the VFs may
be removed either by shutting down the VM or hot-unplugging the
devices from the VM.  Unfortunately in the case of a Windows 2012 R2
guest, hot-unplug is broken due to the ordering of the PF driver
teardown.  Disabling SR-IOV prior to unregister_netdev() avoids this

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Mitch Williams <mitch.a.williams@intel.com>
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox


diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 9aa6104..faa218c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8855,9 +8855,6 @@  static void ixgbe_remove(struct pci_dev *pdev)
 	/* remove the added san mac */
-	if (netdev->reg_state == NETREG_REGISTERED)
-		unregister_netdev(netdev);
 	 * Only disable SR-IOV on unload if the user specified the now
@@ -8866,6 +8863,9 @@  static void ixgbe_remove(struct pci_dev *pdev)
 	if (max_vfs)
+	if (netdev->reg_state == NETREG_REGISTERED)
+		unregister_netdev(netdev);