Fix close path on shutdown and remove in iavf driver.
Subsystems (2)
cover Fix close path on shutdown and remove in iavf driver.
iavf_shutdown was implementing an incomplete version of iavf_remove. It misses several calls to the kernel like iavf_free_misc_irq, iavf_reset_interrupt_capability, iounmap that might break the system on reboot or hibernation.
Fix a deadlock introduced by commit974578017fc1f ("iavf: Add waiting so the port is initialized in remove") due to race condition between iavf_shutdown and iavf_remove, where iavf_remove stucks forever in while loop since iavf_shutdown already set __IAVF_REMOVE adapter state.
SlawomirX Laba (2):
iavf: Fix shutdown pci callback to match the remove one
iavf: Fix race condition between iavf_shutdown and iavf_remove
drivers/net/ethernet/intel/iavf/iavf_main.c | 59 ++++++++------------- 1 file changed, 22 insertions(+), 37 deletions(-)
Signature · 6 lines
2.27.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 1/2 iavf: Fix shutdown pci callback to match the remove one
From: SlawomirX Laba <[email protected]>
Make the flow for pci shutdown be the same to the pci remove.
iavf_shutdown was implementing an incomplete version of iavf_remove. It misses several calls to the kernel like iavf_free_misc_irq, iavf_reset_interrupt_capability, iounmap that might break the system on reboot or hibernation.
Implement the call of iavf_remove directly in iavf_shutdown to close this gap.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 40 +++++++-------------- 1 file changed, 12 insertions(+), 28 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +12 -28
@@ -4545,34 +4545,6 @@ int iavf_process_config(struct iavf_adapter *adapter)return 0 ; } -/** -* iavf_shutdown - Shutdown the device in preparation for a reboot -* @pdev: pci device structure -**/ -static void iavf_shutdown (struct pci_dev *pdev) -{ -struct iavf_adapter *adapter =iavf_pdev_to_adapter (pdev); -struct net_device *netdev = adapter->netdev; - -netif_device_detach (netdev); - -if (netif_running (netdev)) -iavf_close (netdev); - -if (iavf_lock_timeout (&adapter->crit_lock,5000 )) -dev_warn (&adapter->pdev->dev,"failed to acquire crit_lock in %s\n" , __FUNCTION__); -/* Prevent the watchdog from running. */ -iavf_change_state (adapter, __IAVF_REMOVE); - adapter->aq_required =0 ; -mutex_unlock (&adapter->crit_lock); - -#ifdef CONFIG_PM -pci_save_state (pdev); - -#endif -pci_disable_device (pdev); -} -/** * iavf_probe - Device Initialization Routine * @pdev: PCI device information struct
@@ -4909,6 +4881,18 @@ static void iavf_remove(struct pci_dev *pdev)pci_disable_device (pdev); } +/** +* iavf_shutdown - Shutdown the device in preparation for a reboot +* @pdev: pci device structure +**/ +static void iavf_shutdown (struct pci_dev *pdev) +{ +iavf_remove (pdev); + +if (system_state ==SYSTEM_POWER_OFF ) +pci_set_power_state (pdev, PCI_D3hot); +} + static SIMPLE_DEV_PM_OPS(iavf_pm_ops, iavf_suspend, iavf_resume);static struct pci_driver iavf_driver = {
Signature · 6 lines
2.27.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Tony Nguyen
maintainerRe: [Intel-wired-lan] [PATCH net v1 1/2] iavf: Fix shutdown pci callback to match the remove one
Quoted 1 line · Mateusz Palczewski
From: SlawomirX Laba <[email protected]>
From:/Signed-off-by: email name mismatch: 'From: SlawomirX Laba <[email protected]>' != 'Signed-off-by: Slawomir Laba <[email protected]>'
Quoted 7 lines
Make the flow for pci shutdown be the same to the pci remove.
iavf_shutdownwas implementing an incomplete version ofiavf_remove. It misses several calls to the kernel likeiavf_free_misc_irq,iavf_reset_interrupt_capability, iounmap that might break the system on reboot or hibernation.
Quoted 6 lines
Implement the call of
iavf_removedirectly iniavf_shutdownto close this gap.Fixes 5eae00c57f5e ("i40evf: main driver core")Signed-off-by Slawomir Laba <[email protected]>Signed-off-by Mateusz Palczewski <[email protected]>
Same issue for patch 2.
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 2/2 iavf: Fix race condition between iavf_shutdown and iavf_remove
In reply to Mateusz PalczewskiFrom: SlawomirX Laba <[email protected]>
Fix a deadlock introduced by commit974578017fc1 ("iavf: Add waiting so the port is initialized in remove") due to race condition between iavf_shutdown and iavf_remove, where iavf_remove stucks forever in while loop since iavf_shutdown already set __IAVF_REMOVE adapter state.
Fix this by checking if the __IAVF_IN_REMOVE_TASK has already been set and return if so.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +10 -9
@@ -4744,23 +4744,24 @@ static int __maybe_unused iavf_resume(struct device *dev_d)static void iavf_remove (struct pci_dev *pdev) {struct iavf_adapter *adapter =iavf_pdev_to_adapter (pdev); -struct net_device *netdev = adapter->netdev;struct iavf_fdir_fltr *fdir, *fdirtmp;struct iavf_vlan_filter *vlf, *vlftmp; +struct iavf_cloud_filter *cf, *cftmp;struct iavf_adv_rss *rss, *rsstmp;struct iavf_mac_filter *f, *ftmp; -struct iavf_cloud_filter *cf, *cftmp; -struct iavf_hw *hw = &adapter->hw; +struct net_device *netdev; +struct iavf_hw *hw;int err; -/* When reboot/shutdown is in progress no need to do anything -* as the adapter is already REMOVE state that was set during -* iavf_shutdown() callback. -*/ -if (adapter->state == __IAVF_REMOVE) +if (!adapter) +return ; + + netdev = adapter->netdev; + hw = &adapter->hw; + +if (test_and_set_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section))return ; -set_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section);/* Wait until port initialization is complete. * There are flows where register/unregister netdev may race. */
Signature · 6 lines
2.27.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan