Message ID | 20150727231840.10121.31628.stgit@gimli.home |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
ACK > -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On > Behalf Of Alex Williamson > Sent: Monday, July 27, 2015 4:19 PM > To: intel-wired-lan@lists.osuosl.org; Kirsher, Jeffrey T > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH 2/2] 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> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index f775123..e27813c 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -9035,12 +9035,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); > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@lists.osuosl.org > http://lists.osuosl.org/mailman/listinfo/intel-wired-lan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index f775123..e27813c 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9035,12 +9035,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);
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/ixgbe/ixgbe_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html