From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932652AbbG0XmX (ORCPT ); Mon, 27 Jul 2015 19:42:23 -0400 Received: from mga09.intel.com ([134.134.136.24]:55856 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754984AbbG0XmT convert rfc822-to-8bit (ORCPT ); Mon, 27 Jul 2015 19:42:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,558,1432623600"; d="scan'208";a="771030561" From: "Williams, Mitch A" To: "'Alex Williamson'" , "intel-wired-lan@lists.osuosl.org" , "Kirsher, Jeffrey T" CC: "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: [Intel-wired-lan] [PATCH 2/2] ixgbe: Teardown SR-IOV before unregister_netdev() Thread-Topic: [Intel-wired-lan] [PATCH 2/2] ixgbe: Teardown SR-IOV before unregister_netdev() Thread-Index: AQHQyMKXYbk6i7+2+EK1fjOvtONeE53v+jIA Date: Mon, 27 Jul 2015 23:42:15 +0000 Message-ID: References: <20150727223753.10121.78169.stgit@gimli.home> <20150727231840.10121.31628.stgit@gimli.home> In-Reply-To: <20150727231840.10121.31628.stgit@gimli.home> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.1.200.106] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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