cxgb4: fix IRQ free race during driver unload
Subsystems (3)
PATCH 1/1 cxgb4: fix IRQ free race during driver unload
From: Shahjada Abul Husain <[email protected]>
IRQs are requested during driver's ndo_open() and then later freed up in disable_interrupts() during driver unload. A race exists where driver can set the CXGB4_FULL_INIT_DONE flag in ndo_open() after the disable_interrupts() in driver unload path checks it, and hence misses calling free_irq().
Fix by unregistering netdevice first and sync with driver's ndo_open(). This ensures disable_interrupts() checks the flag correctly and frees up the IRQs properly.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 18 ++++++++++-------- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +10 -8
@@ -2643,6 +2643,9 @@ static void detach_ulds(struct adapter *adap) {unsigned int i; +if (!is_uld (adap)) +return ; +mutex_lock (&uld_mutex);list_del (&adap->list_node);
@@ -7141,10 +7144,13 @@ static void remove_one(struct pci_dev *pdev)*/ destroy_workqueue (adapter->workq); -if (is_uld (adapter)) { -detach_ulds (adapter); -t4_uld_clean_up (adapter); - } +detach_ulds (adapter); + +for_each_port (adapter, i) +if (adapter->port[i]->reg_state ==NETREG_REGISTERED ) +unregister_netdev (adapter->port[i]); + +t4_uld_clean_up (adapter);adap_free_hma_mem (adapter);
@@ -7152,10 +7158,6 @@ static void remove_one(struct pci_dev *pdev)cxgb4_free_mps_ref_entries (adapter); -for_each_port (adapter, i) -if (adapter->port[i]->reg_state ==NETREG_REGISTERED ) -unregister_netdev (adapter->port[i]); -debugfs_remove_recursive (adapter->debugfs_root);if (!is_t4 (adapter->params.chip))
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +3 -0
@@ -581,6 +581,9 @@ void t4_uld_clean_up(struct adapter *adap) {unsigned int i; +if (!is_uld (adap)) +return ; +mutex_lock (&uld_mutex);for (i =0 ; i <CXGB4_ULD_MAX ; i++) {if (!adap->uld[i].handle)
Signature · 1 line
2.9.5
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Thu, 8 Jul 2021 21:51:56 +0530 you wrote:
From: Shahjada Abul Husain <[email protected]>
IRQs are requested during driver's
ndo_open()and then later freed up indisable_interrupts()during driver unload. A race exists where driver can set theCXGB4_FULL_INIT_DONEflag inndo_open()after thedisable_interrupts()in driver unload path checks it, and hence misses callingfree_irq().[...]
Here is the summary with links:
- [net] cxgb4: fix IRQ free race during driver unload
https://git.kernel.org/netdev/net/c/015fe6fd29c4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html