niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ixgbe: handle close/suspend race with netif_device_detach/present

Browse source 
When an interface is part of a namespace it is possible that
ixgbe_close() may be called while __ixgbe_shutdown() is running
which ends up in a double free WARN and/or a BUG in free_msi_irqs().

To handle this situation we extend the rtnl_lock() to protect the
call to netif_device_detach() and ixgbe_clear_interrupt_scheme()
in __ixgbe_shutdown() and check for netif_device_present()
to avoid clearing the interrupts second time in ixgbe_close();

Also extend the rtnl lock in ixgbe_resume() to netif_device_attach().

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Emil Tantilov 2016-11-11 10:07:47 -08:00 • committed by Jeff Kirsher
parent f215266470
commit f7f37e7ff2
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View file

@ -6200,6 +6200,7 @@ int ixgbe_close(struct net_device *netdev)
ixgbe_ptp_stop(adapter); ixgbe_ptp_stop(adapter);
if (netif_device_present(netdev))
ixgbe_close_suspend(adapter); ixgbe_close_suspend(adapter);
ixgbe_fdir_filter_exit(adapter); ixgbe_fdir_filter_exit(adapter);
@ -6245,14 +6246,12 @@ static int ixgbe_resume(struct pci_dev *pdev)
if (!err && netif_running(netdev)) if (!err && netif_running(netdev))
err = ixgbe_open(netdev); err = ixgbe_open(netdev);
if (!err)
netif_device_attach(netdev);
rtnl_unlock(); rtnl_unlock();
if (err)
return err; return err;
netif_device_attach(netdev);
return 0;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
@ -6267,14 +6266,14 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
int retval = 0; int retval = 0;
#endif #endif
rtnl_lock();
netif_device_detach(netdev); netif_device_detach(netdev);
rtnl_lock();
if (netif_running(netdev)) if (netif_running(netdev))
ixgbe_close_suspend(adapter); ixgbe_close_suspend(adapter);
rtnl_unlock();
ixgbe_clear_interrupt_scheme(adapter); ixgbe_clear_interrupt_scheme(adapter);
rtnl_unlock();
#ifdef CONFIG_PM #ifdef CONFIG_PM
retval = pci_save_state(pdev); retval = pci_save_state(pdev);