Commit 6b010e9b authored Jul 29, 2015 by Alex Williamson Committed by Jeff Kirsher Sep 15, 2015

ixgbe: Teardown SR-IOV before unregister_netdev()



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
issue.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 4ccc650c

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -9028,12 +9028,12 @@ static void ixgbe_remove(struct pci_dev *pdev)
		/* remove the added san mac */
		ixgbe_del_sanmac_netdev(netdev);

		if (netdev->reg_state == NETREG_REGISTERED)
		unregister_netdev(netdev);

		#ifdef CONFIG_PCI_IOV
		ixgbe_disable_sriov(adapter);
		#endif
		if (netdev->reg_state == NETREG_REGISTERED)
		unregister_netdev(netdev);

		ixgbe_clear_interrupt_scheme(adapter);

		ixgbe_release_hw_control(adapter);