Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c23d92b8 authored by Alex Williamson's avatar Alex Williamson Committed by Jeff Kirsher
Browse files

igb: 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: default avatarAlex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 51045ecf

drivers/net/ethernet/intel/igb/igb_main.c

+4 −4
Original line number Diff line number Diff line
@@ -2809,14 +2809,14 @@ static void igb_remove(struct pci_dev *pdev) 
	 */

	igb_release_hw_control(adapter);



	unregister_netdev(netdev);



	igb_clear_interrupt_scheme(adapter);



#ifdef CONFIG_PCI_IOV

	igb_disable_sriov(pdev);

#endif



	unregister_netdev(netdev);



	igb_clear_interrupt_scheme(adapter);



	pci_iounmap(pdev, hw->hw_addr);

	if (hw->flash_address)

		iounmap(hw->flash_address);