| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677 |
- From c30c4a82739090a2de4a4e3f245355ea4fb3ec14 Mon Sep 17 00:00:00 2001
- From: Felix Fietkau <[email protected]>
- Date: Thu, 22 Apr 2021 22:20:57 -0700
- Subject: [PATCH] net: ethernet: mtk_eth_soc: use napi_consume_skb
- Should improve performance, since it can use bulk free
- Signed-off-by: Felix Fietkau <[email protected]>
- Signed-off-by: Ilya Lipnitskiy <[email protected]>
- Signed-off-by: David S. Miller <[email protected]>
- ---
- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
- --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- @@ -879,7 +879,8 @@ static int txd_to_idx(struct mtk_tx_ring
- 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) {
- @@ -911,8 +912,12 @@ static void mtk_tx_unmap(struct mtk_eth
-
- 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;
- }
-
- @@ -1090,7 +1095,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))
- @@ -1409,7 +1414,7 @@ static int mtk_poll_tx_qdma(struct mtk_e
- 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);
- @@ -1446,7 +1451,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
- budget--;
- }
-
- - mtk_tx_unmap(eth, tx_buf);
- + mtk_tx_unmap(eth, tx_buf, true);
-
- desc = &ring->dma[cpu];
- ring->last_free = desc;
- @@ -1648,7 +1653,7 @@ static void mtk_tx_clean(struct mtk_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;
- }
|
