mt76: mt7915: process txfree and txstatus without allocating skbs

Reduces pressure on the memory allocator

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index a1556fe..f25b36f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1373,15 +1373,16 @@ out:
 }
 
 static void
-mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)
+mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
 {
-       struct mt7915_tx_free *free = (struct mt7915_tx_free *)skb->data;
+       struct mt7915_tx_free *free = (struct mt7915_tx_free *)data;
        struct mt76_dev *mdev = &dev->mt76;
        struct mt76_phy *mphy_ext = mdev->phy2;
        struct mt76_txwi_cache *txwi;
        struct ieee80211_sta *sta = NULL;
        LIST_HEAD(free_list);
-       struct sk_buff *tmp;
+       struct sk_buff *skb, *tmp;
+       void *end = data + len;
        u8 i, count;
        bool wake = false;
 
@@ -1399,6 +1400,9 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)
         * Should avoid accessing WTBL to get Tx airtime, and use it instead.
         */
        count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl));
+       if (WARN_ON_ONCE((void *)&free->info[count] > end))
+               return;
+
        for (i = 0; i < count; i++) {
                u32 msdu, info = le32_to_cpu(free->info[i]);
 
@@ -1441,8 +1445,6 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)
 
        mt76_worker_schedule(&dev->mt76.tx_worker);
 
-       napi_consume_skb(skb, 1);
-
        list_for_each_entry_safe(skb, tmp, &free_list, list) {
                skb_list_del_init(skb);
                napi_consume_skb(skb, 1);
@@ -1617,6 +1619,27 @@ out:
        rcu_read_unlock();
 }
 
+bool mt7915_rx_check(struct mt76_dev *mdev, void *data, int len)
+{
+       struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);
+       __le32 *rxd = (__le32 *)data;
+       __le32 *end = (__le32 *)&rxd[len / 4];
+       enum rx_pkt_type type;
+
+       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       switch (type) {
+       case PKT_TYPE_TXRX_NOTIFY:
+               mt7915_mac_tx_free(dev, data, len);
+               return false;
+       case PKT_TYPE_TXS:
+               for (rxd += 2; rxd + 8 <= end; rxd += 8)
+                   mt7915_mac_add_txs(dev, rxd);
+               return false;
+       default:
+               return true;
+       }
+}
+
 void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                         struct sk_buff *skb)
 {
@@ -1629,7 +1652,8 @@ void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
 
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:
-               mt7915_mac_tx_free(dev, skb);
+               mt7915_mac_tx_free(dev, skb->data, skb->len);
+               napi_consume_skb(skb, 1);
                break;
        case PKT_TYPE_RX_EVENT:
                mt7915_mcu_rx_event(dev, skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index c6c846d..10e4330 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -519,6 +519,7 @@ void mt7915_tx_token_put(struct mt7915_dev *dev);
 int mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc);
 void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                         struct sk_buff *skb);
+bool mt7915_rx_check(struct mt76_dev *mdev, void *data, int len);
 void mt7915_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);
 void mt7915_stats_work(struct work_struct *work);
 int mt76_dfs_start_rdd(struct mt7915_dev *dev, bool force);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
index 0af4cdb..8130ea4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
@@ -230,6 +230,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev,
                .tx_prepare_skb = mt7915_tx_prepare_skb,
                .tx_complete_skb = mt7915_tx_complete_skb,
                .rx_skb = mt7915_queue_rx_skb,
+               .rx_check = mt7915_rx_check,
                .rx_poll_complete = mt7915_rx_poll_complete,
                .sta_ps = mt7915_sta_ps,
                .sta_add = mt7915_mac_sta_add,