From: Alex Williamson <alex.williamson@redhat.com>
To: intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] igb: Teardown SR-IOV before unregister_netdev()
Date: Mon, 27 Jul 2015 17:18:34 -0600 [thread overview]
Message-ID: <20150727231834.10121.62918.stgit@gimli.home> (raw)
In-Reply-To: <20150727223753.10121.78169.stgit@gimli.home>
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>
---
drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 517746f..606a7ae 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2805,14 +2805,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);
next prev parent reply other threads:[~2015-07-27 23:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 23:18 [PATCH 0/2] igb/ixgbe: Fix ordering of SR-IOV teardown Alex Williamson
2015-07-27 23:18 ` Alex Williamson [this message]
2015-07-27 23:42 ` [Intel-wired-lan] [PATCH 1/2] igb: Teardown SR-IOV before unregister_netdev() Williams, Mitch A
2015-08-11 2:11 ` Brown, Aaron F
2015-07-27 23:18 ` [PATCH 2/2] ixgbe: " Alex Williamson
2015-07-27 23:42 ` [Intel-wired-lan] " Williams, Mitch A
2015-07-29 19:16 ` [PATCH 0/2] igb/ixgbe: Fix ordering of SR-IOV teardown David Miller
2015-07-29 19:33 ` Alex Williamson
2015-07-29 21:31 ` David Miller
2015-08-03 22:51 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150727231834.10121.62918.stgit@gimli.home \
--to=alex.williamson@redhat.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).