Address IRQ related crash seen due to io_perm_failure
Subsystems (3)
v2 cover Address IRQ related crash seen due to io_perm_failure
David Dai had submitted a patch[1] to address a reported issue with e1000e calling pci_disable_msi without first freeing the interrupts. Looking over the issue it seems the problem was the fact that e1000e_down was being called in e1000_io_error_detected without calling e1000_free_irq, and this was resulting in e1000e_close skipping over the call to e1000e_down and e1000_free_irq.
The use of the __E1000_DOWN flag for the close test seems to have come from the runtime power management changes that were made some time ago. From what I can tell in the close path we should be disabling runtime power management via a call to pm_runtime_get_sync. As such we can remove the test for the __E1000_DOWN bit. However in comparing this with other drivers we do need to avoid freeing the IRQs more than once. So in order to address that I have copied the approach taken in igb and taken it a bit further so that we will always detach the interface and if the interface is up we will bring it down and free the IRQs. In addition we are able to reuse some of the power management code so I have taken the opportunity to merge those bits.
[1]: https://lore.kernel.org/lkml/1570121672-12172-1-git-send-email-zdai at linux.vnet.ibm.com/
v2: Move e1000e_pm_thaw out of CONFIG_PM region to fix build issue on Sparc64
---
Alexander Duyck (2):
e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm
e1000e: Drop unnecessary __E1000_DOWN bit twiddling
drivers/net/ethernet/intel/e1000e/netdev.c | 75 +++++++++++++--------------- 1 file changed, 36 insertions(+), 39 deletions(-)
--
PATCH v2 1/2 e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm
From: Alexander Duyck <[email protected]>
This patch is meant to address possible race conditions that can exist between network configuration and power management. A similar issue was fixed for igb in commit 9474933caf21 ("igb: close/suspend race in netif_device_detach").
In addition it consolidates the code so that the PCI error handling code will essentially perform the power management freeze on the device prior to attempting a reset, and will thaw the device afterwards if that is what it is planning to do. Otherwise when we call close on the interface it should see it is detached and not attempt to call the logic to down the interface and free the IRQs again.
From what I can tell the check that was adding the check for __E1000_DOWN in e1000e_close was added when runtime power management was added. However it should not be relevant for us as we perform a call to pm_runtime_get_sync before we call e1000_down/free_irq so it should always be back up before we call into this anyway.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 68 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 33 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +35 -33
@@ -4715,12 +4715,12 @@ int e1000e_close(struct net_device *netdev)pm_runtime_get_sync (&pdev->dev); -if (!test_bit (__E1000_DOWN, &adapter->state)) { +if (netif_device_present (netdev)) {e1000e_down (adapter, true);e1000_free_irq (adapter);/* Link status message must follow this format */ -pr_info ("%s NIC Link is Down\n" , adapter->netdev->name); +pr_info ("%s NIC Link is Down\n" , netdev->name); }napi_disable (&adapter->napi);
@@ -6298,10 +6298,14 @@ static int e1000e_pm_freeze(struct device *dev) {struct net_device *netdev =dev_get_drvdata (dev);struct e1000_adapter *adapter =netdev_priv (netdev); +bool present; +rtnl_lock (); + + present =netif_device_present (netdev);netif_device_detach (netdev); -if (netif_running (netdev)) { +if (present &&netif_running (netdev)) {int count =E1000_CHECK_RESET_COUNT ;while (test_bit (__E1000_RESETTING, &adapter->state) && count--)
@@ -6313,6 +6317,8 @@ static int e1000e_pm_freeze(struct device *dev)e1000e_down (adapter, false);e1000_free_irq (adapter); } +rtnl_unlock (); +e1000e_reset_interrupt_capability (adapter);/* Allow time for pending master requests to run */
@@ -6560,6 +6566,30 @@ static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)__e1000e_disable_aspm (pdev, state,1 ); } +static int e1000e_pm_thaw (struct device *dev) +{ +struct net_device *netdev =dev_get_drvdata (dev); +struct e1000_adapter *adapter =netdev_priv (netdev); +int rc =0 ; + +e1000e_set_interrupt_capability (adapter); + +rtnl_lock (); +if (netif_running (netdev)) { + rc =e1000_request_irq (adapter); +if (rc) + goto err_irq; + +e1000e_up (adapter); + } + +netif_device_attach (netdev); +err_irq: +rtnl_unlock (); + +return rc; +} +#ifdef CONFIG_PM static int __e1000_resume (struct pci_dev *pdev) {
@@ -6627,26 +6657,6 @@ static int __e1000_resume(struct pci_dev *pdev) }#ifdef CONFIG_PM_SLEEP -static int e1000e_pm_thaw (struct device *dev) -{ -struct net_device *netdev =dev_get_drvdata (dev); -struct e1000_adapter *adapter =netdev_priv (netdev); - -e1000e_set_interrupt_capability (adapter); -if (netif_running (netdev)) { -u32 err =e1000_request_irq (adapter); - -if (err) -return err; - -e1000e_up (adapter); - } - -netif_device_attach (netdev); - -return 0 ; -} -static int e1000e_pm_suspend (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
@@ -6818,16 +6828,11 @@ static void e1000_netpoll(struct net_device *netdev)static pci_ers_result_t e1000_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) { -struct net_device *netdev =pci_get_drvdata (pdev); -struct e1000_adapter *adapter =netdev_priv (netdev); - -netif_device_detach (netdev); +e1000e_pm_freeze (&pdev->dev);if (state == pci_channel_io_perm_failure)return PCI_ERS_RESULT_DISCONNECT ; -if (netif_running (netdev)) -e1000e_down (adapter, true);pci_disable_device (pdev);/* Request a slot slot reset. */
@@ -6893,10 +6898,7 @@ static void e1000_io_resume(struct pci_dev *pdev)e1000_init_manageability_pt (adapter); -if (netif_running (netdev)) -e1000e_up (adapter); - -netif_device_attach (netdev); +e1000e_pm_thaw (&pdev->dev);/* If the controller has AMT, do not set DRV_LOAD until the interface * is up. For all other cases, let the f/w know that the h/w is now
RE: [next-queue PATCH v2 1/2] e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm
Quoted 32 lines
From: netdev-owner at vger.kernel.org <[email protected]> On Behalf Of Alexander Duyck
Sent: Friday, October 11, 2019 8:35 AM
To: alexander.h.duyck at linux.intel.com; intel-wired-lan at lists.osuosl.org; Kirsher, Jeffrey T <[email protected]>
Cc: netdev at vger.kernel.org; zdai at us.ibm.com; zdai at linux.vnet.ibm.com
Subject: [next-queue PATCH v2 1/2] e1000e: Usertnl_lockto prevent race conditions between net and pci/pmFrom: Alexander Duyck <[email protected]>
This patch is meant to address possible race conditions that can exist between network configuration and power management. A similar issue was fixed for igb in commit
9474933caf21("igb: close/suspend race innetif_device_detach").In addition it consolidates the code so that the PCI error handling code will essentially perform the power management freeze on the device prior to attempting a reset, and will thaw the device afterwards if that is what it is planning to do. Otherwise when we call close on the interface it should see it is detached and not attempt to call the logic to down the interface and free the IRQs again.
Quoted 1 line
From what I can tell the check that was adding the check for
__E1000_DOWN
ine1000e_closewas added when runtime power management was added. However
it should not be relevant for us as we perform a call topm_runtime_get_syncbefore we call e1000_down/free_irq so it should always
be back up before we call into this anyway.
Quoted 7 lines
Reported-by Morumuri Srivalli <[email protected]>Tested-by David Dai <[email protected]>Signed-off-by Alexander Duyck <[email protected]>--- drivers/net/ethernet/intel/e1000e/netdev.c | 68 ++++++++++++++--------- ----- 1 file changed, 35 insertions(+), 33 deletions(-)
PATCH v2 2/2 e1000e: Drop unnecessary __E1000_DOWN bit twiddling
In reply to Alexander DuyckFrom: Alexander Duyck <[email protected]>
Since we no longer check for __E1000_DOWN in e1000e_close we can drop the spot where we were restoring the bit. This saves us a bit of unnecessary complexity.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +1 -6
@@ -7409,15 +7409,13 @@ static void e1000_remove(struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev);struct e1000_adapter *adapter =netdev_priv (netdev); -bool down =test_bit (__E1000_DOWN, &adapter->state);e1000e_ptp_remove (adapter);/* The timers may be rescheduled, so explicitly disable them * from being rescheduled. */ -if (!down) -set_bit (__E1000_DOWN, &adapter->state); +set_bit (__E1000_DOWN, &adapter->state);del_timer_sync (&adapter->phy_info_timer);cancel_work_sync (&adapter->reset_task);
@@ -7437,9 +7435,6 @@ static void e1000_remove(struct pci_dev *pdev) } } -/* Don't lie to e1000_close() down the road. */ -if (!down) -clear_bit (__E1000_DOWN, &adapter->state);unregister_netdev (netdev);if (pci_dev_run_wake (pdev))
RE: [Intel-wired-lan] [next-queue PATCH v2 2/2] e1000e: Drop unnecessary __E1000_DOWN bit twiddling
Quoted 16 lines
From: Intel-wired-lan <[email protected]> On Behalf Of Alexander Duyck
Sent: Friday, October 11, 2019 8:35 AM
To: alexander.h.duyck at linux.intel.com; intel-wired-lan at lists.osuosl.org; Kirsher, Jeffrey T <[email protected]>
Cc: netdev at vger.kernel.org; zdai at us.ibm.com; zdai at linux.vnet.ibm.com
Subject: [Intel-wired-lan] [next-queue PATCH v2 2/2] e1000e: Drop unnecessary__E1000_DOWNbit twiddlingFrom: Alexander Duyck <[email protected]>
Since we no longer check for
__E1000_DOWNine1000e_closewe can drop the
spot where we were restoring the bit. This saves us a bit of unnecessary complexity.
Quoted 5 lines
Signed-off-by Alexander Duyck <[email protected]>--- drivers/net/ethernet/intel/e1000e/netdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
Quoted 25 lines · Alexander Duyck
David Dai had submitted a patch[1] to address a reported issue with e1000e calling
pci_disable_msiwithout first freeing the interrupts. Looking over the issue it seems the problem was the fact thate1000e_downwas being called ine1000_io_error_detectedwithout callinge1000_free_irq, and this was resulting ine1000e_closeskipping over the call toe1000e_downande1000_free_irq.The use of the
__E1000_DOWNflag for the close test seems to have come from the runtime power management changes that were made some time ago. From what I can tell in the close path we should be disabling runtime power management via a call topm_runtime_get_sync. As such we can remove the test for the__E1000_DOWNbit. However in comparing this with other drivers we do need to avoid freeing the IRQs more than once. So in order to address that I have copied the approach taken in igb and taken it a bit further so that we will always detach the interface and if the interface is up we will bring it down and free the IRQs. In addition we are able to reuse some of the power management code so I have taken the opportunity to merge those bits.[1]: https://lore.kernel.org/lkml/1570121672-12172-1-git-send-email-zdai at linux.vnet.ibm.com/
v2: Move
e1000e_pm_thawout ofCONFIG_PMregion to fix build issue on Sparc64---
Quoted 8 lines
Alexander Duyck (2):
e1000e: Usertnl_lockto prevent race conditions between net and pci/pm
e1000e: Drop unnecessary__E1000_DOWNbit twiddlingdrivers/net/ethernet/intel/e1000e/netdev.c | 75 +++++++++++++--------------- 1 file changed, 36 insertions(+), 39 deletions(-)
I am not familiar with the process. Don't mean to push you in any way. Just want to check if these 2 v2 patches will be accepted by upstream? or any thing else needs to be done to finish the process?
Thanks! - David