Commit a6055864 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

wifi: mt76: move napi_enable() from under BH 



mt76 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.

Fixes: 413f0271 ("net: protect NAPI enablement with netdev_lock()")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/dcfd56bc-de32-4b11-9e19-d8bd1543745d@stanley.mountain


Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250124031841.1179756-8-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 09a93948

drivers/net/wireless/mediatek/mt76/mt7603/mac.c

+4 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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_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/mt76x02_mmio.c

+5 −3
Original line number Diff line number Diff line
@@ -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();