eth: fix calling napi_enable() in atomic context
Subsystems (7)
Jakub Kicinski
maintainerv3 cover eth: fix calling napi_enable() in atomic context
Dan has reported that I missed a lot of drivers which call napi_enable() in atomic with the naive coccinelle search for spin locks:
https://lore.kernel.org/[email protected]
Fix them. Most of the fixes involve taking the netdev_lock() before the spin lock. mt76 is special because we can just move napi_enable() from the BH section.
All patches compile tested only.
v3:
- [patch 1] move the annotation
v2: https://lore.kernel.org/[email protected]
- [patch 1] correct commit msg (can't sleep -> needs to sleep)
- [patch 1] add re-locking annotation to tg3_irq_quiesce()
- [patch 6] actually switch to napi_enable_locked()
- [patch 7] reword the commit msg slightly
v1: https://lore.kernel.org/[email protected]
Jakub Kicinski (7):
eth: tg3: fix calling napi_enable() in atomic context
eth: forcedeth: remove local wrappers for napi enable/disable
eth: forcedeth: fix calling napi_enable() in atomic context
eth: 8139too: fix calling napi_enable() in atomic context
eth: niu: fix calling napi_enable() in atomic context
eth: via-rhine: fix calling napi_enable() in atomic context
wifi: mt76: move napi_enable() from under BH
drivers/net/ethernet/broadcom/tg3.c | 35 ++++++++++++++++--- drivers/net/ethernet/nvidia/forcedeth.c | 32 ++++++----------- drivers/net/ethernet/realtek/8139too.c | 4 ++- drivers/net/ethernet/sun/niu.c | 10 +++++- drivers/net/ethernet/via/via-rhine.c | 11 +++++- .../net/wireless/mediatek/mt76/mt7603/mac.c | 9 +++-- .../net/wireless/mediatek/mt76/mt7615/pci.c | 8 +++-- .../wireless/mediatek/mt76/mt7615/pci_mac.c | 8 +++-- .../net/wireless/mediatek/mt76/mt76x0/pci.c | 8 +++-- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 8 +++-- .../net/wireless/mediatek/mt76/mt76x2/pci.c | 7 ++-- .../net/wireless/mediatek/mt76/mt7915/mac.c | 17 ++++++--- .../net/wireless/mediatek/mt76/mt7921/pci.c | 7 ++-- .../wireless/mediatek/mt76/mt7921/pci_mac.c | 7 ++-- .../net/wireless/mediatek/mt76/mt7925/pci.c | 7 ++-- .../wireless/mediatek/mt76/mt7925/pci_mac.c | 7 ++-- .../net/wireless/mediatek/mt76/mt7996/mac.c | 12 +++---- 17 files changed, 132 insertions(+), 65 deletions(-)
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 1/7 eth: tg3: fix calling napi_enable() in atomic context
tg3 has a spin lock protecting most of the config, switch to taking netdev_lock() explicitly on enable/start paths. Disable/stop paths seem to not be under the spin lock (since napi_disable() already needs to sleep), so leave that side as is.
tg3_restart_hw() releases and re-takes the spin lock, we need to do the same because dev_close() needs to take netdev_lock().
---
v3:
- move the annotation to the correct place
v2: https://lore.kernel.org/[email protected]
- correct commit msg (can't sleep -> needs to sleep)
- add re-locking annotation to tg3_irq_quiesce()
v1: https://lore.kernel.org/[email protected]
--- drivers/net/ethernet/broadcom/tg3.c | 35 +++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +31 -4
@@ -7424,7 +7424,7 @@ static void tg3_napi_enable(struct tg3 *tp)for (i =0 ; i < tp->irq_cnt; i++) { tnapi = &tp->napi[i]; -napi_enable (&tnapi->napi); +napi_enable_locked (&tnapi->napi);if (tnapi->tx_buffers) { netif_queue_set_napi(tp->dev, txq_idx, NETDEV_QUEUE_TYPE_TX,
@@ -7445,9 +7445,10 @@ static void tg3_napi_init(struct tg3 *tp)int i;for (i =0 ; i < tp->irq_cnt; i++) { -netif_napi_add (tp->dev, &tp->napi[i].napi, - i ? tg3_poll_msix : tg3_poll); -netif_napi_set_irq (&tp->napi[i].napi, tp->napi[i].irq_vec); +netif_napi_add_locked (tp->dev, &tp->napi[i].napi, + i ? tg3_poll_msix : tg3_poll); +netif_napi_set_irq_locked (&tp->napi[i].napi, + tp->napi[i].irq_vec); } }
@@ -11259,6 +11260,8 @@ static void tg3_timer_stop(struct tg3 *tp)static int tg3_restart_hw (struct tg3 *tp,bool reset_phy) __releases(tp->lock) __acquires(tp->lock) + __releases(tp->dev->lock) + __acquires(tp->dev->lock) {int err;
@@ -11271,7 +11274,9 @@ static int tg3_restart_hw(struct tg3 *tp, bool reset_phy)tg3_timer_stop (tp); tp->irq_sync =0 ;tg3_napi_enable (tp); +netdev_unlock (tp->dev);dev_close (tp->dev); +netdev_lock (tp->dev);tg3_full_lock (tp,0 ); }return err;
@@ -11299,6 +11304,7 @@ static void tg3_reset_task(struct work_struct *work)tg3_netif_stop (tp); +netdev_lock (tp->dev);tg3_full_lock (tp,1 );if (tg3_flag (tp,TX_RECOVERY_PENDING )) {
@@ -11318,12 +11324,14 @@ static void tg3_reset_task(struct work_struct *work)* call cancel_work_sync() and wait forever. */ tg3_flag_clear (tp,RESET_TASK_PENDING ); +netdev_unlock (tp->dev);dev_close (tp->dev); goto out; }tg3_netif_start (tp);tg3_full_unlock (tp); +netdev_unlock (tp->dev);tg3_phy_start (tp);tg3_flag_clear (tp,RESET_TASK_PENDING ); out:
@@ -11683,9 +11691,11 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,if (err) goto out_ints_fini; +netdev_lock (dev);tg3_napi_init (tp);tg3_napi_enable (tp); +netdev_unlock (dev);for (i =0 ; i < tp->irq_cnt; i++) { err =tg3_request_irq (tp, i);
@@ -12569,6 +12579,7 @@ static int tg3_set_ringparam(struct net_device *dev, irq_sync =1 ; } +netdev_lock (dev);tg3_full_lock (tp, irq_sync); tp->rx_pending = ering->rx_pending;
@@ -12597,6 +12608,7 @@ static int tg3_set_ringparam(struct net_device *dev, }tg3_full_unlock (tp); +netdev_unlock (dev);if (irq_sync && !err)tg3_phy_start (tp);
@@ -12678,6 +12690,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam irq_sync =1 ; } +netdev_lock (dev);tg3_full_lock (tp, irq_sync);if (epause->autoneg)
@@ -12707,6 +12720,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam }tg3_full_unlock (tp); +netdev_unlock (dev); } tp->phy_flags |=TG3_PHYFLG_USER_CONFIGURED ;
@@ -13911,6 +13925,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest, data[TG3_INTERRUPT_TEST ] =1 ; } +netdev_lock (dev);tg3_full_lock (tp,0 );tg3_halt (tp,RESET_KIND_SHUTDOWN ,1 );
@@ -13922,6 +13937,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest, }tg3_full_unlock (tp); +netdev_unlock (dev);if (irq_sync && !err2)tg3_phy_start (tp);
@@ -14365,6 +14381,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)tg3_set_mtu (dev, tp, new_mtu); +netdev_lock (dev);tg3_full_lock (tp,1 );tg3_halt (tp,RESET_KIND_SHUTDOWN ,1 );
@@ -14384,6 +14401,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)tg3_netif_start (tp);tg3_full_unlock (tp); +netdev_unlock (dev);if (!err)tg3_phy_start (tp);
@@ -18164,6 +18182,7 @@ static int tg3_resume(struct device *device)netif_device_attach (dev); +netdev_lock (dev);tg3_full_lock (tp,0 );tg3_ape_driver_state_change (tp,RESET_KIND_INIT );
@@ -18180,6 +18199,7 @@ static int tg3_resume(struct device *device) out:tg3_full_unlock (tp); +netdev_unlock (dev);if (!err)tg3_phy_start (tp);
@@ -18260,7 +18280,9 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, done:if (state == pci_channel_io_perm_failure) {if (netdev) { +netdev_lock (netdev);tg3_napi_enable (tp); +netdev_unlock (netdev);dev_close (netdev); } err =PCI_ERS_RESULT_DISCONNECT ;
@@ -18314,7 +18336,9 @@ static pci_ers_result_t tg3_io_slot_reset(struct pci_dev *pdev) done:if (rc !=PCI_ERS_RESULT_RECOVERED && netdev &&netif_running (netdev)) { +netdev_lock (netdev);tg3_napi_enable (tp); +netdev_unlock (netdev);dev_close (netdev); }rtnl_unlock ();
@@ -18340,12 +18364,14 @@ static void tg3_io_resume(struct pci_dev *pdev)if (!netdev || !netif_running (netdev)) goto done; +netdev_lock (netdev);tg3_full_lock (tp,0 );tg3_ape_driver_state_change (tp,RESET_KIND_INIT );tg3_flag_set (tp,INIT_COMPLETE ); err =tg3_restart_hw (tp, true);if (err) {tg3_full_unlock (tp); +netdev_unlock (netdev);netdev_err (netdev,"Cannot restart hardware after reset.\n" ); goto done; }
@@ -18357,6 +18383,7 @@ static void tg3_io_resume(struct pci_dev *pdev)tg3_netif_start (tp);tg3_full_unlock (tp); +netdev_unlock (netdev);tg3_phy_start (tp);
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 2/7 eth: forcedeth: remove local wrappers for napi enable/disable
In reply to Jakub KicinskiThe local helpers for calling napi_enable() and napi_disable() don't serve much purpose and they will complicate the fix in the subsequent patch. Remove them, call the core functions directly.
---
CC: [email protected]
--- drivers/net/ethernet/nvidia/forcedeth.c | 30 +++++++------------------ 1 file changed, 8 insertions(+), 22 deletions(-)
drivers/net/ethernet/nvidia/forcedeth.c +8 -22
@@ -1120,20 +1120,6 @@ static void nv_disable_hw_interrupts(struct net_device *dev, u32 mask) } } -static void nv_napi_enable (struct net_device *dev) -{ -struct fe_priv *np =get_nvpriv (dev); - -napi_enable (&np->napi); -} - -static void nv_napi_disable (struct net_device *dev) -{ -struct fe_priv *np =get_nvpriv (dev); - -napi_disable (&np->napi); -} -#define MII_READ (-1)/* mii_rw: read/write a register on the PHY. *
@@ -3114,7 +3100,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)* Changing the MTU is a rare event, it shouldn't matter. */ nv_disable_irq (dev); -nv_napi_disable (dev); +napi_disable (&np->napi);netif_tx_lock_bh (dev);netif_addr_lock (dev);spin_lock (&np->lock);
@@ -3143,7 +3129,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)spin_unlock (&np->lock);netif_addr_unlock (dev);netif_tx_unlock_bh (dev); -nv_napi_enable (dev); +napi_enable (&np->napi);nv_enable_irq (dev); }return 0 ;
@@ -4731,7 +4717,7 @@ static int nv_set_ringparam(struct net_device *dev,if (netif_running (dev)) {nv_disable_irq (dev); -nv_napi_disable (dev); +napi_disable (&np->napi);netif_tx_lock_bh (dev);netif_addr_lock (dev);spin_lock (&np->lock);
@@ -4784,7 +4770,7 @@ static int nv_set_ringparam(struct net_device *dev,spin_unlock (&np->lock);netif_addr_unlock (dev);netif_tx_unlock_bh (dev); -nv_napi_enable (dev); +napi_enable (&np->napi);nv_enable_irq (dev); }return 0 ;
@@ -5277,7 +5263,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64if (test->flags Ð_TEST_FL_OFFLINE ) {if (netif_running (dev)) {netif_stop_queue (dev); -nv_napi_disable (dev); +napi_disable (&np->napi);netif_tx_lock_bh (dev);netif_addr_lock (dev);spin_lock_irq (&np->lock);
@@ -5334,7 +5320,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64/* restart rx engine */ nv_start_rxtx (dev);netif_start_queue (dev); -nv_napi_enable (dev); +napi_enable (&np->napi);nv_enable_hw_interrupts (dev, np->irqmask); } }
@@ -5594,7 +5580,7 @@ static int nv_open(struct net_device *dev) ret =nv_update_linkspeed (dev);nv_start_rxtx (dev);netif_start_queue (dev); -nv_napi_enable (dev); +napi_enable (&np->napi);if (ret) {netif_carrier_on (dev);
@@ -5632,7 +5618,7 @@ static int nv_close(struct net_device *dev)spin_lock_irq (&np->lock); np->in_shutdown =1 ;spin_unlock_irq (&np->lock); -nv_napi_disable (dev); +napi_disable (&np->napi);synchronize_irq (np->pci_dev->irq);del_timer_sync (&np->oom_kick);
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 3/7 eth: forcedeth: fix calling napi_enable() in atomic context
In reply to Jakub Kicinskinapi_enable() may sleep now, take netdev_lock() before np->lock.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/nvidia/forcedeth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/nvidia/forcedeth.c +3 -1
@@ -5562,6 +5562,7 @@ static int nv_open(struct net_device *dev)/* ask for interrupts */ nv_enable_hw_interrupts (dev, np->irqmask); +netdev_lock (dev);spin_lock_irq (&np->lock);writel (NVREG_MCASTADDRA_FORCE , base + NvRegMulticastAddrA);writel (0 , base + NvRegMulticastAddrB);
@@ -5580,7 +5581,7 @@ static int nv_open(struct net_device *dev) ret =nv_update_linkspeed (dev);nv_start_rxtx (dev);netif_start_queue (dev); -napi_enable (&np->napi); +napi_enable_locked (&np->napi);if (ret) {netif_carrier_on (dev);
@@ -5597,6 +5598,7 @@ static int nv_open(struct net_device *dev) round_jiffies(jiffies + STATS_INTERVAL));spin_unlock_irq (&np->lock); +netdev_unlock (dev);/* If the loopback feature was set while the device was down, make sure * that it's set correctly now.
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 4/7 eth: 8139too: fix calling napi_enable() in atomic context
In reply to Jakub Kicinskinapi_enable() may sleep now, take netdev_lock() before tp->lock and tp->rx_lock.
---
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/realtek/8139too.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/8139too.c +3 -1
@@ -1684,6 +1684,7 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)if (tmp8 & CmdTxEnb)RTL_W8 (ChipCmd, CmdRxEnb); +netdev_lock (dev);spin_lock_bh (&tp->rx_lock);/* Disable interrupts by clearing the interrupt mask. */ RTL_W16 (IntrMask,0x0000 );
@@ -1694,11 +1695,12 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)spin_unlock_irq (&tp->lock);/* ...and finally, reset everything */ -napi_enable (&tp->napi); +napi_enable_locked (&tp->napi);rtl8139_hw_start (dev);netif_wake_queue (dev);spin_unlock_bh (&tp->rx_lock); +netdev_unlock (dev); }static void rtl8139_tx_timeout (struct net_device *dev,unsigned int txqueue)
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 5/7 eth: niu: fix calling napi_enable() in atomic context
In reply to Jakub Kicinskinapi_enable() may sleep now, take netdev_lock() before np->lock.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/sun/niu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/sun/niu.c +9 -1
@@ -6086,7 +6086,7 @@ static void niu_enable_napi(struct niu *np)int i;for (i =0 ; i < np->num_ldg; i++) -napi_enable (&np->ldg[i].napi); +napi_enable_locked (&np->ldg[i].napi); }static void niu_disable_napi (struct niu *np)
@@ -6116,7 +6116,9 @@ static int niu_open(struct net_device *dev)if (err) goto out_free_channels; +netdev_lock (dev);niu_enable_napi (np); +netdev_unlock (dev);spin_lock_irq (&np->lock);
@@ -6521,6 +6523,7 @@ static void niu_reset_task(struct work_struct *work)niu_reset_buffers (np); +netdev_lock (np->dev);spin_lock_irqsave (&np->lock, flags); err =niu_init_hw (np);
@@ -6531,6 +6534,7 @@ static void niu_reset_task(struct work_struct *work) }spin_unlock_irqrestore (&np->lock, flags); +netdev_unlock (np->dev); }static void niu_tx_timeout (struct net_device *dev,unsigned int txqueue)
@@ -6761,7 +6765,9 @@ static int niu_change_mtu(struct net_device *dev, int new_mtu)niu_free_channels (np); +netdev_lock (dev);niu_enable_napi (np); +netdev_unlock (dev); err =niu_alloc_channels (np);if (err)
@@ -9937,6 +9943,7 @@ static int __maybe_unused niu_resume(struct device *dev_d)spin_lock_irqsave (&np->lock, flags); +netdev_lock (dev); err =niu_init_hw (np);if (!err) { np->timer.expires = jiffies +HZ ;
@@ -9945,6 +9952,7 @@ static int __maybe_unused niu_resume(struct device *dev_d) }spin_unlock_irqrestore (&np->lock, flags); +netdev_unlock (dev);return err; }
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 6/7 eth: via-rhine: fix calling napi_enable() in atomic context
In reply to Jakub Kicinskinapi_enable() may sleep now, take netdev_lock() before rp->lock. napi_enable() is hidden inside init_registers().
Note that this patch orders netdev_lock after rp->task_lock, to avoid having to take the netdev_lock() around disable path.
---
v2:
- actually switch to napi_enable_locked()
v1: https://lore.kernel.org/[email protected]
--- drivers/net/ethernet/via/via-rhine.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/ethernet/via/via-rhine.c +10 -1
@@ -1568,7 +1568,7 @@ static void init_registers(struct net_device *dev)if (rp->quirks & rqMgmt)rhine_init_cam_filter (dev); -napi_enable (&rp->napi); +napi_enable_locked (&rp->napi);iowrite16 (RHINE_EVENT &0xffff , ioaddr + IntrEnable);
@@ -1696,7 +1696,10 @@ static int rhine_open(struct net_device *dev)rhine_power_init (dev);rhine_chip_reset (dev);rhine_task_enable (rp); + +netdev_lock (dev);init_registers (dev); +netdev_unlock (dev); netif_dbg(rp, ifup, dev, "%s() Done - status %04x MII status: %04x\n", __func__, ioread16(ioaddr + ChipCmd),
@@ -1727,6 +1730,8 @@ static void rhine_reset_task(struct work_struct *work)napi_disable (&rp->napi);netif_tx_disable (dev); + +netdev_lock (dev);spin_lock_bh (&rp->lock);/* clear all descriptors */
@@ -1740,6 +1745,7 @@ static void rhine_reset_task(struct work_struct *work)init_registers (dev);spin_unlock_bh (&rp->lock); +netdev_unlock (dev);netif_trans_update (dev);/* prevent tx timeout */ dev->stats.tx_errors++;
@@ -2541,9 +2547,12 @@ static int rhine_resume(struct device *device)alloc_tbufs (dev);rhine_reset_rbufs (rp);rhine_task_enable (rp); + +netdev_lock (dev);spin_lock_bh (&rp->lock);init_registers (dev);spin_unlock_bh (&rp->lock); +netdev_unlock (dev);netif_device_attach (dev);
Signature · 1 line
2.48.1
Jakub Kicinski
maintainerPATCH v3 7/7 wifi: mt76: move napi_enable() from under BH
In reply to Jakub Kicinskimt76 does a lot of:
local_bh_disable(); napi_enable(...napi); napi_schedule(...napi); local_bh_enable();
local_bh_disable() is not a real lock, its most likely taken because napi_schedule() requires that we invoke softirqs at some point. napi_enable() needs to take a mutex, so move it from under the BH protection.
---
v2:
- reword the commit msg slightly
v1: https://lore.kernel.org/[email protected]
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 9 ++++----- drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 8 ++++++-- .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 8 +++++--- drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 8 +++++--- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 8 +++++--- drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 17 +++++++++++++---- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 7 +++++-- .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 7 +++++-- .../net/wireless/mediatek/mt76/mt7925/pci_mac.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 12 ++++++------ 12 files changed, 69 insertions(+), 36 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +4 -5
@@ -1479,14 +1479,13 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)tasklet_enable (&dev->mt76.pre_tbtt_tasklet);mt7603_beacon_set_timer (dev,-1 , beacon_int); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); -napi_schedule (&dev->mt76.tx_napi); -napi_enable (&dev->mt76.napi[0 ]); -napi_schedule (&dev->mt76.napi[0 ]); -napi_enable (&dev->mt76.napi[1 ]); + +local_bh_disable (); +napi_schedule (&dev->mt76.tx_napi); +napi_schedule (&dev->mt76.napi[0 ]);napi_schedule (&dev->mt76.napi[1 ]);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7615/pci.c +6 -2
@@ -164,12 +164,16 @@ static int mt7615_pci_resume(struct pci_dev *pdev)dev_err (mdev->dev,"PDMA engine must be reinitialized\n" );mt76_worker_enable (&mdev->tx_worker); -local_bh_disable (); +mt76_for_each_q_rx (mdev, i) {napi_enable (&mdev->napi[i]); -napi_schedule (&mdev->napi[i]); }napi_enable (&mdev->tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) { +napi_schedule (&mdev->napi[i]); + }napi_schedule (&mdev->tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c +5 -3
@@ -262,12 +262,14 @@ void mt7615_mac_reset_work(struct work_struct *work)mt76_worker_enable (&dev->mt76.tx_worker); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); -napi_schedule (&dev->mt76.tx_napi); -mt76_for_each_q_rx (&dev->mt76, i) {napi_enable (&dev->mt76.napi[i]); + } + +local_bh_disable (); +napi_schedule (&dev->mt76.tx_napi); +mt76_for_each_q_rx (&dev->mt76, i) {napi_schedule (&dev->mt76.napi[i]); }local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +5 -3
@@ -282,14 +282,16 @@ static int mt76x0e_resume(struct pci_dev *pdev)mt76_worker_enable (&mdev->tx_worker); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {mt76_queue_rx_reset (dev, i);napi_enable (&mdev->napi[i]); + } +napi_enable (&mdev->tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) {napi_schedule (&mdev->napi[i]); } - -napi_enable (&mdev->tx_napi);napi_schedule (&mdev->tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +5 -3
@@ -504,12 +504,14 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)mt76_worker_enable (&dev->mt76.tx_worker);tasklet_enable (&dev->mt76.pre_tbtt_tasklet); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); -napi_schedule (&dev->mt76.tx_napi); -mt76_for_each_q_rx (&dev->mt76, i) {napi_enable (&dev->mt76.napi[i]); + } + +local_bh_disable (); +napi_schedule (&dev->mt76.tx_napi); +mt76_for_each_q_rx (&dev->mt76, i) {napi_schedule (&dev->mt76.napi[i]); }local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +5 -2
@@ -151,12 +151,15 @@ mt76x2e_resume(struct pci_dev *pdev)mt76_worker_enable (&mdev->tx_worker); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {napi_enable (&mdev->napi[i]); -napi_schedule (&mdev->napi[i]); }napi_enable (&mdev->tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) { +napi_schedule (&mdev->napi[i]); + }napi_schedule (&mdev->tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +13 -4
@@ -1356,10 +1356,15 @@ mt7915_mac_restart(struct mt7915_dev *dev)mt7915_dma_reset (dev, true); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {if (mdev->q_rx[i].ndesc) {napi_enable (&dev->mt76.napi[i]); + } + } + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) { +if (mdev->q_rx[i].ndesc) {napi_schedule (&dev->mt76.napi[i]); } }
@@ -1419,8 +1424,9 @@ mt7915_mac_restart(struct mt7915_dev *dev)if (phy2)clear_bit (MT76_RESET , &phy2->mt76->state); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); + +local_bh_disable ();napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
@@ -1570,9 +1576,12 @@ void mt7915_mac_reset_work(struct work_struct *work)if (phy2)clear_bit (MT76_RESET , &phy2->mt76->state); -local_bh_disable ();mt76_for_each_q_rx (&dev->mt76, i) {napi_enable (&dev->mt76.napi[i]); + } + +local_bh_disable (); +mt76_for_each_q_rx (&dev->mt76, i) {napi_schedule (&dev->mt76.napi[i]); }local_bh_enable ();
@@ -1581,8 +1590,8 @@ void mt7915_mac_reset_work(struct work_struct *work)mt76_worker_enable (&dev->mt76.tx_worker); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); +local_bh_disable ();napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +5 -2
@@ -523,12 +523,15 @@ static int mt7921_pci_resume(struct device *device)mt76_worker_enable (&mdev->tx_worker); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {napi_enable (&mdev->napi[i]); -napi_schedule (&mdev->napi[i]); }napi_enable (&mdev->tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) { +napi_schedule (&mdev->napi[i]); + }napi_schedule (&mdev->tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c +5 -2
@@ -81,9 +81,12 @@ int mt7921e_mac_reset(struct mt792x_dev *dev)mt792x_wpdma_reset (dev, true); -local_bh_disable ();mt76_for_each_q_rx (&dev->mt76, i) {napi_enable (&dev->mt76.napi[i]); + } + +local_bh_disable (); +mt76_for_each_q_rx (&dev->mt76, i) {napi_schedule (&dev->mt76.napi[i]); }local_bh_enable ();
@@ -115,8 +118,8 @@ int mt7921e_mac_reset(struct mt792x_dev *dev) err =__mt7921_start (&dev->phy); out: -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); +local_bh_disable ();napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7925/pci.c +5 -2
@@ -556,12 +556,15 @@ static int mt7925_pci_resume(struct device *device)mt76_worker_enable (&mdev->tx_worker); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {napi_enable (&mdev->napi[i]); -napi_schedule (&mdev->napi[i]); }napi_enable (&mdev->tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (mdev, i) { +napi_schedule (&mdev->napi[i]); + }napi_schedule (&mdev->tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c +5 -2
@@ -101,12 +101,15 @@ int mt7925e_mac_reset(struct mt792x_dev *dev)mt792x_wpdma_reset (dev, true); -local_bh_disable ();mt76_for_each_q_rx (&dev->mt76, i) {napi_enable (&dev->mt76.napi[i]); -napi_schedule (&dev->mt76.napi[i]); }napi_enable (&dev->mt76.tx_napi); + +local_bh_disable (); +mt76_for_each_q_rx (&dev->mt76, i) { +napi_schedule (&dev->mt76.napi[i]); + }napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +6 -6
@@ -1695,7 +1695,6 @@ mt7996_mac_restart(struct mt7996_dev *dev)mt7996_dma_reset (dev, true); -local_bh_disable ();mt76_for_each_q_rx (mdev, i) {if (mtk_wed_device_active (&dev->mt76.mmio.wed) &&mt76_queue_is_wed_rro (&mdev->q_rx[i]))
@@ -1703,10 +1702,11 @@ mt7996_mac_restart(struct mt7996_dev *dev)if (mdev->q_rx[i].ndesc) {napi_enable (&dev->mt76.napi[i]); +local_bh_disable ();napi_schedule (&dev->mt76.napi[i]); +local_bh_enable (); } } -local_bh_enable ();clear_bit (MT76_MCU_RESET , &dev->mphy.state);clear_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);
@@ -1764,8 +1764,8 @@ mt7996_mac_restart(struct mt7996_dev *dev)if (phy3)clear_bit (MT76_RESET , &phy3->mt76->state); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); +local_bh_disable ();napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
@@ -1958,23 +1958,23 @@ void mt7996_mac_reset_work(struct work_struct *work)if (phy3)clear_bit (MT76_RESET , &phy3->mt76->state); -local_bh_disable ();mt76_for_each_q_rx (&dev->mt76, i) {if (mtk_wed_device_active (&dev->mt76.mmio.wed) &&mt76_queue_is_wed_rro (&dev->mt76.q_rx[i]))continue ;napi_enable (&dev->mt76.napi[i]); +local_bh_disable ();napi_schedule (&dev->mt76.napi[i]); +local_bh_enable (); } -local_bh_enable ();tasklet_schedule (&dev->mt76.irq_tasklet);mt76_worker_enable (&dev->mt76.tx_worker); -local_bh_disable ();napi_enable (&dev->mt76.tx_napi); +local_bh_disable ();napi_schedule (&dev->mt76.tx_napi);local_bh_enable ();
Signature · 1 line
2.48.1
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 23 Jan 2025 19:18:34 -0800 you wrote:
Dan has reported that I missed a lot of drivers which call
napi_enable()in atomic with the naive coccinelle search for spin locks:
https://lore.kernel.org/[email protected]Fix them. Most of the fixes involve taking the
netdev_lock()before the spin lock. mt76 is special because we can just movenapi_enable()from the BH section.[...]
Here is the summary with links:
- [net,v3,1/7] eth: tg3: fix calling napi_enable() in atomic context
https://git.kernel.org/netdev/net/c/8ed47e4e0b42 - [net,v3,2/7] eth: forcedeth: remove local wrappers for napi enable/disable https://git.kernel.org/netdev/net/c/a878f3e4ace7 - [net,v3,3/7] eth: forcedeth: fix calling napi_enable() in atomic context https://git.kernel.org/netdev/net/c/5c4470a1719c - [net,v3,4/7] eth: 8139too: fix calling napi_enable() in atomic context https://git.kernel.org/netdev/net/c/d19e612c47f4 - [net,v3,5/7] eth: niu: fix calling napi_enable() in atomic context https://git.kernel.org/netdev/net/c/f1d12bc7a596 - [net,v3,6/7] eth: via-rhine: fix calling napi_enable() in atomic context https://git.kernel.org/netdev/net/c/09a939487fc8 - [net,v3,7/7] wifi: mt76: move napi_enable() from under BH https://git.kernel.org/netdev/net/c/a60558644e20
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html