7b7d8fe60d
Manually rebased: backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch hack-5.10/645-netfilter-connmark-introduce-set-dscpmark.patch Removed upstreamed: pending-5.10/706-netfilter-nf_flow_table-add-missing-locking.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.157&id=b8e494240e69f91517256adcd6fda62d0671772d Signed-off-by: John Audia <therealgraysky@proton.me>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 21 Mar 2022 20:39:59 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: enable threaded NAPI
|
|
|
|
This can improve performance under load by ensuring that NAPI processing is
|
|
not pinned on CPU 0.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -2199,8 +2199,8 @@ static irqreturn_t mtk_handle_irq_rx(int
|
|
|
|
eth->rx_events++;
|
|
if (likely(napi_schedule_prep(ð->rx_napi))) {
|
|
- __napi_schedule(ð->rx_napi);
|
|
mtk_rx_irq_disable(eth, MTK_RX_DONE_INT);
|
|
+ __napi_schedule(ð->rx_napi);
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
@@ -2212,8 +2212,8 @@ static irqreturn_t mtk_handle_irq_tx(int
|
|
|
|
eth->tx_events++;
|
|
if (likely(napi_schedule_prep(ð->tx_napi))) {
|
|
- __napi_schedule(ð->tx_napi);
|
|
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
|
|
+ __napi_schedule(ð->tx_napi);
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
@@ -3324,6 +3324,8 @@ static int mtk_probe(struct platform_dev
|
|
* for NAPI to work
|
|
*/
|
|
init_dummy_netdev(ð->dummy_dev);
|
|
+ eth->dummy_dev.threaded = 1;
|
|
+ strcpy(eth->dummy_dev.name, "mtk_eth");
|
|
netif_napi_add(ð->dummy_dev, ð->tx_napi, mtk_napi_tx,
|
|
MTK_NAPI_WEIGHT);
|
|
netif_napi_add(ð->dummy_dev, ð->rx_napi, mtk_napi_rx,
|