net: ethernet: mtk_eth_soc: use napi_consume_skb

Should improve performance, since it can use bulk free

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 07daa5de8bec14f4a0ec4421175d0587ab4544f3..5cf64de3ddf8499d083d9c51286fdc8c688a073c 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -858,7 +858,8 @@ static int txd_to_idx(struct mtk_tx_ring *ring, struct mtk_tx_dma *dma)
        return ((void *)dma - (void *)ring->dma) / sizeof(*dma);
 }
 
-static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf)
+static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf,
+                        bool napi)
 {
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
                if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) {
@@ -890,8 +891,12 @@ static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf)
 
        tx_buf->flags = 0;
        if (tx_buf->skb &&
-           (tx_buf->skb != (struct sk_buff *)MTK_DMA_DUMMY_DESC))
-               dev_kfree_skb_any(tx_buf->skb);
+           (tx_buf->skb != (struct sk_buff *)MTK_DMA_DUMMY_DESC)) {
+               if (napi)
+                       napi_consume_skb(tx_buf->skb, napi);
+               else
+                       dev_kfree_skb_any(tx_buf->skb);
+       }
        tx_buf->skb = NULL;
 }
 
@@ -1069,7 +1074,7 @@ err_dma:
                tx_buf = mtk_desc_to_tx_buf(ring, itxd);
 
                /* unmap dma */
-               mtk_tx_unmap(eth, tx_buf);
+               mtk_tx_unmap(eth, tx_buf, false);
 
                itxd->txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU;
                if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
@@ -1388,7 +1393,7 @@ static int mtk_poll_tx_qdma(struct mtk_eth *eth, int budget,
                        done[mac]++;
                        budget--;
                }
-               mtk_tx_unmap(eth, tx_buf);
+               mtk_tx_unmap(eth, tx_buf, true);
 
                ring->last_free = desc;
                atomic_inc(&ring->free_count);
@@ -1425,7 +1430,7 @@ static int mtk_poll_tx_pdma(struct mtk_eth *eth, int budget,
                        budget--;
                }
 
-               mtk_tx_unmap(eth, tx_buf);
+               mtk_tx_unmap(eth, tx_buf, true);
 
                desc = &ring->dma[cpu];
                ring->last_free = desc;
@@ -1627,7 +1632,7 @@ static void mtk_tx_clean(struct mtk_eth *eth)
 
        if (ring->buf) {
                for (i = 0; i < MTK_DMA_SIZE; i++)
-                       mtk_tx_unmap(eth, &ring->buf[i]);
+                       mtk_tx_unmap(eth, &ring->buf[i], false);
                kfree(ring->buf);
                ring->buf = NULL;
        }