Skip to content

Commit

Permalink
igb: Teardown SR-IOV before unregister_netdev()
Browse files Browse the repository at this point in the history
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: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Alex Williamson authored and Jeff Kirsher committed Aug 18, 2015
1 parent 51045ec commit c23d92b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/intel/igb/igb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c23d92b

Please sign in to comment.