ixgbe: handle close/suspend race with netif_device_detach/present
Subsystems (2)
PATCH v2 1/1 ixgbe: handle close/suspend race with netif_device_detach/present
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() and ixgbe_remove().
Also extend the rtnl lock in ixgbe_resume() to netif_device_attach().
v2 - add rtnl locks and a check in ixgbe_remove()
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +12 -10
@@ -6200,7 +6200,8 @@ int ixgbe_close(struct net_device *netdev)ixgbe_ptp_stop (adapter); -ixgbe_close_suspend (adapter); +if (netif_device_present (netdev)) +ixgbe_close_suspend (adapter);ixgbe_fdir_filter_exit (adapter);
@@ -6245,14 +6246,12 @@ static int ixgbe_resume(struct pci_dev *pdev)if (!err &&netif_running (netdev)) err =ixgbe_open (netdev); -rtnl_unlock (); - -if (err) -return err; -netif_device_attach (netdev); +if (!err) +netif_device_attach (netdev); +rtnl_unlock (); - return 0; + return err; }#endif /* CONFIG_PM */
@@ -6267,14 +6266,14 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)int retval =0 ;#endif +rtnl_lock ();netif_device_detach (netdev); -rtnl_lock ();if (netif_running (netdev))ixgbe_close_suspend (adapter); -rtnl_unlock ();ixgbe_clear_interrupt_scheme (adapter); +rtnl_unlock ();#ifdef CONFIG_PM retval =pci_save_state (pdev);
@@ -9923,7 +9922,10 @@ static void ixgbe_remove(struct pci_dev *pdev)if (netdev->reg_state ==NETREG_REGISTERED )unregister_netdev (netdev); -ixgbe_clear_interrupt_scheme (adapter); +rtnl_lock (); +if (netif_device_present (netdev)) +ixgbe_clear_interrupt_scheme (adapter); +rtnl_unlock ();ixgbe_release_hw_control (adapter);
PATCH v2 1/1 ixgbe: handle close/suspend race with netif_device_detach/present
Quoted 70 lines · Emil Tantilov
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 infree_msi_irqs().To handle this situation we extend the
rtnl_lock()to protect the call tonetif_device_detach()andixgbe_clear_interrupt_scheme()in__ixgbe_shutdown()and check fornetif_device_present()to avoid clearing the interrupts second time inixgbe_close()andixgbe_remove().Also extend the rtnl lock in
ixgbe_resume()tonetif_device_attach().v2 - add rtnl locks and a check in
ixgbe_remove()Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8
-9@@ -6200,7 +6200,8 @@ int ixgbe_close(struct net_device *netdev)ixgbe_ptp_stop (adapter); -ixgbe_close_suspend (adapter); +if (netif_device_present (netdev)) +ixgbe_close_suspend (adapter);ixgbe_fdir_filter_exit (adapter);@@ -6245,14 +6246,12 @@ static int ixgbe_resume(struct pci_dev *pdev)if (!err &&netif_running (netdev)) err =ixgbe_open (netdev); -rtnl_unlock (); - -if (err) -return err; -netif_device_attach (netdev); +if (!err) +netif_device_attach (netdev); +rtnl_unlock (); - return 0; + return err; }#endif /* CONFIG_PM */ @@ -6267,14 +6266,14 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)int retval =0 ;#endif +rtnl_lock ();netif_device_detach (netdev); -rtnl_lock ();if (netif_running (netdev))ixgbe_close_suspend (adapter); -rtnl_unlock ();ixgbe_clear_interrupt_scheme (adapter); +rtnl_unlock ();#ifdef CONFIG_PM retval =pci_save_state (pdev);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static void ixgbe_remove(struct pci_dev *pdev) · line 9930
Quoted 10 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +4
-1@@ -9923,7 +9922,10 @@ static void ixgbe_remove(struct pci_dev *pdev)if (netdev->reg_state ==NETREG_REGISTERED )unregister_netdev (netdev); -ixgbe_clear_interrupt_scheme (adapter); +rtnl_lock (); +if (netif_device_present (netdev)) +ixgbe_clear_interrupt_scheme (adapter); +rtnl_unlock ();ixgbe_release_hw_control (adapter);
NACK for the same reason as the ixgbevf patch. However it looks like this driver can have us call ixgbe_clear_interrupt_scheme multiple times without triggering any NULL pointer accesses so you can probably just revert back to v1 and you should be good.
Thanks.
- Alex