mt76: use threaded NAPI

With threaded NAPI, the rx handler function is no longer bound to the CPU that
fired the interrupt, which significantly helps to spread the workload over
multiple CPUs, especially when multiple devices are using threaded NAPI at the
same time.
Exclude the tx handler from threaded NAPI by using a separate dummy netdev.
The work is small and short-lived enough that it makes more sense to run it in
softirq instead of creating a dedicated thread

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 2f27c43ad76df3f354f6196fb49e3df911a45ad4..6273b2cfce4f1030f46d85b50e419fc4b754dd86 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -602,7 +602,6 @@ mt76_dma_rx_poll(struct napi_struct *napi, int budget)
        dev = container_of(napi->dev, struct mt76_dev, napi_dev);
        qid = napi - dev->napi;
 
-       local_bh_disable();
        rcu_read_lock();
 
        do {
@@ -612,7 +611,6 @@ mt76_dma_rx_poll(struct napi_struct *napi, int budget)
        } while (cur && done < budget);
 
        rcu_read_unlock();
-       local_bh_enable();
 
        if (done < budget && napi_complete(napi))
                dev->drv->rx_poll_complete(dev, qid);
@@ -626,6 +624,10 @@ mt76_dma_init(struct mt76_dev *dev)
        int i;
 
        init_dummy_netdev(&dev->napi_dev);
+       init_dummy_netdev(&dev->tx_napi_dev);
+       snprintf(dev->napi_dev.name, sizeof(dev->napi_dev.name), "%s",
+                wiphy_name(dev->hw->wiphy));
+       dev->napi_dev.threaded = 1;
 
        mt76_for_each_q_rx(dev, i) {
                netif_napi_add(&dev->napi_dev, &dev->napi[i], mt76_dma_rx_poll,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 5561f81c64f7b35ea499ec9e21228b7ab1cc6bed..4d71ca228de2d26fbcc81570dc0acac61b2acac8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -637,6 +637,7 @@ struct mt76_dev {
        struct mt76_mcu mcu;
 
        struct net_device napi_dev;
+       struct net_device tx_napi_dev;
        spinlock_t rx_lock;
        struct napi_struct napi[__MT_RXQ_MAX];
        struct sk_buff_head rx_skb[__MT_RXQ_MAX];

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 0086f18cb79ab05a3d96810541b45583ce0527a4..2b62441168420e1f67eabe3d1c70b3c71504564c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -223,7 +223,7 @@ int mt7603_dma_init(struct mt7603_dev *dev)
        if (ret)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.napi_dev, &dev->mt76.tx_napi,
+       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
                          mt7603_poll_tx, NAPI_POLL_WEIGHT);
        napi_enable(&dev->mt76.tx_napi);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index 25e3069cf2b1e8acd0630c99dc895334bc2a4bc0..2e3120eb2da9e5e7c0dce020adea7d37bba38d12 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -245,7 +245,7 @@ int mt7615_dma_init(struct mt7615_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.napi_dev, &dev->mt76.tx_napi,
+       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
                          mt7615_poll_tx, NAPI_POLL_WEIGHT);
        napi_enable(&dev->mt76.tx_napi);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index e7a46ac97f512311e1ab547b49e5f3bc916b8b30..fc12824ab74e4342be0e1dabf699cdb6a42db8be 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -230,7 +230,7 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)
        if (ret)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.napi_dev, &dev->mt76.tx_napi,
+       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
                          mt76x02_poll_tx, NAPI_POLL_WEIGHT);
        napi_enable(&dev->mt76.tx_napi);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index bf51304a770b781b4482442cb9c1bae85f094219..3c961bf55e97ad7dae6e46a9eaee478e0f24e049 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -325,7 +325,7 @@ int mt7915_dma_init(struct mt7915_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.napi_dev, &dev->mt76.tx_napi,
+       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
                          mt7915_poll_tx, NAPI_POLL_WEIGHT);
        napi_enable(&dev->mt76.tx_napi);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
index cd96656102846a3180f1505ff82de0863b35fdd4..60de29a921a8d8e18b35e0c4f0350771b1038de1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
@@ -299,7 +299,7 @@ int mt7921_dma_init(struct mt7921_dev *dev)
        if (ret < 0)
                return ret;
 
-       netif_tx_napi_add(&dev->mt76.napi_dev, &dev->mt76.tx_napi,
+       netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
                          mt7921_poll_tx, NAPI_POLL_WEIGHT);
        napi_enable(&dev->mt76.tx_napi);