From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [net-next] Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()" Date: Fri, 18 May 2018 11:58:30 -0700 Message-ID: <20180518185830.23681-1-jeffrey.t.kirsher@intel.com> Cc: Jeff Kirsher , netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com, jogreene@redhat.com To: davem@davemloft.net Return-path: Received: from mga03.intel.com ([134.134.136.65]:61543 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751156AbeERS5L (ORCPT ); Fri, 18 May 2018 14:57:11 -0400 Sender: netdev-owner@vger.kernel.org List-ID: This reverts commit 6710f970d9979d8f03f6e292bb729b2ee1526d0e. Gotta love when developers have offline discussions, thinking everyone is reading their responses/dialog. The change had the potential for a number of race conditions on shutdown, which is why we are reverting the change. Signed-off-by: Jeff Kirsher --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5ddfb93ed491..a52d92e182ee 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -6698,15 +6698,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) rtnl_lock(); netif_device_detach(netdev); - if (netif_running(netdev)) { - /* Suspend takes a long time, device_shutdown may be - * parallelized this function, so drop lock for the - * duration of this call. - */ - rtnl_unlock(); + if (netif_running(netdev)) ixgbe_close_suspend(adapter); - rtnl_lock(); - } ixgbe_clear_interrupt_scheme(adapter); rtnl_unlock(); -- 2.17.0