From: Sean Wang <sean.wang@mediatek.com> To: <john@phrozen.org>, <davem@davemloft.net> Cc: <nbd@openwrt.org>, <netdev@vger.kernel.org>, <linux-mediatek@lists.infradead.org>, <keyhaede@gmail.com>, Sean Wang <sean.wang@mediatek.com> Subject: [PATCH v2 5/5] net: ethernet: mediatek: enhance RX path by aggregating more skbs into NAPI Date: Tue, 16 Aug 2016 01:51:26 +0800 [thread overview] Message-ID: <1471283487-24113-6-git-send-email-sean.wang@mediatek.com> (raw) In-Reply-To: <1471283487-24113-1-git-send-email-sean.wang@mediatek.com> The patch adds support for aggregating more skbs feed into NAPI in order to get more benifits from generic receive offload (GRO) by peeking at the RX ring status and moving more packets right before returning from NAPI RX polling handler if NAPI budgets are still available. Signed-off-by: Sean Wang <sean.wang@mediatek.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 53e24c1..742b9ec 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -902,9 +902,6 @@ release_desc: wmb(); mtk_w32(eth, ring->calc_idx, MTK_QRX_CRX_IDX0); - if (done < budget) - mtk_w32(eth, MTK_RX_DONE_INT, MTK_QMTK_INT_STATUS); - return done; } @@ -1023,8 +1020,10 @@ static int mtk_napi_rx(struct napi_struct *napi, int budget) struct mtk_eth *eth = container_of(napi, struct mtk_eth, rx_napi); u32 status, mask; int rx_done = 0; + int remain_budget = budget; mtk_handle_status_irq(eth); +poll_again: mtk_w32(eth, MTK_RX_DONE_INT, MTK_QMTK_INT_STATUS); rx_done = mtk_poll_rx(napi, budget, eth); @@ -1035,14 +1034,14 @@ static int mtk_napi_rx(struct napi_struct *napi, int budget) "done rx %d, intr 0x%08x/0x%x\n", rx_done, status, mask); } - - if (rx_done == budget) + if (rx_done == remain_budget) return budget; status = mtk_r32(eth, MTK_QMTK_INT_STATUS); - if (status & MTK_RX_DONE_INT) - return budget; - + if (status & MTK_RX_DONE_INT) { + remain_budget -= rx_done; + goto poll_again; + } napi_complete(napi); mtk_irq_enable(eth, MTK_RX_DONE_INT); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Sean Wang <sean.wang@mediatek.com> To: john@phrozen.org, davem@davemloft.net Cc: nbd@openwrt.org, netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, keyhaede@gmail.com, Sean Wang <sean.wang@mediatek.com> Subject: [PATCH v2 5/5] net: ethernet: mediatek: enhance RX path by aggregating more skbs into NAPI Date: Tue, 16 Aug 2016 01:51:26 +0800 [thread overview] Message-ID: <1471283487-24113-6-git-send-email-sean.wang@mediatek.com> (raw) In-Reply-To: <1471283487-24113-1-git-send-email-sean.wang@mediatek.com> The patch adds support for aggregating more skbs feed into NAPI in order to get more benifits from generic receive offload (GRO) by peeking at the RX ring status and moving more packets right before returning from NAPI RX polling handler if NAPI budgets are still available. Signed-off-by: Sean Wang <sean.wang@mediatek.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 53e24c1..742b9ec 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -902,9 +902,6 @@ release_desc: wmb(); mtk_w32(eth, ring->calc_idx, MTK_QRX_CRX_IDX0); - if (done < budget) - mtk_w32(eth, MTK_RX_DONE_INT, MTK_QMTK_INT_STATUS); - return done; } @@ -1023,8 +1020,10 @@ static int mtk_napi_rx(struct napi_struct *napi, int budget) struct mtk_eth *eth = container_of(napi, struct mtk_eth, rx_napi); u32 status, mask; int rx_done = 0; + int remain_budget = budget; mtk_handle_status_irq(eth); +poll_again: mtk_w32(eth, MTK_RX_DONE_INT, MTK_QMTK_INT_STATUS); rx_done = mtk_poll_rx(napi, budget, eth); @@ -1035,14 +1034,14 @@ static int mtk_napi_rx(struct napi_struct *napi, int budget) "done rx %d, intr 0x%08x/0x%x\n", rx_done, status, mask); } - - if (rx_done == budget) + if (rx_done == remain_budget) return budget; status = mtk_r32(eth, MTK_QMTK_INT_STATUS); - if (status & MTK_RX_DONE_INT) - return budget; - + if (status & MTK_RX_DONE_INT) { + remain_budget -= rx_done; + goto poll_again; + } napi_complete(napi); mtk_irq_enable(eth, MTK_RX_DONE_INT); -- 1.7.9.5
next prev parent reply other threads:[~2016-08-15 17:51 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-15 17:51 [PATCH v2 0/5] Fix warning, issue and give some enhancements Sean Wang 2016-08-15 17:51 ` Sean Wang 2016-08-15 17:51 ` [PATCH v2 1/5] net: ethernet: mediatek: add REVMII and fix RMII mode supported by GMAC Sean Wang 2016-08-15 17:51 ` Sean Wang 2016-08-15 17:51 ` [PATCH v2 2/5] net: ethernet: mediatek: fix flow control settings on GMAC0 is not being enabled properly Sean Wang 2016-08-15 17:51 ` Sean Wang 2016-08-15 17:51 ` [PATCH v2 3/5] net: ethernet: mediatek: fix runtime warning raised by inconsistent struct device pointers passed to DMA API Sean Wang 2016-08-15 17:51 ` Sean Wang 2016-08-15 17:51 ` [PATCH v2 4/5] net: ethernet: mediatek: enhance RX path by reducing the frequency of the memory barrier used Sean Wang 2016-08-15 17:51 ` Sean Wang 2016-08-15 17:51 ` Sean Wang [this message] 2016-08-15 17:51 ` [PATCH v2 5/5] net: ethernet: mediatek: enhance RX path by aggregating more skbs into NAPI Sean Wang 2016-08-15 20:50 ` [PATCH v2 0/5] Fix warning, issue and give some enhancements David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1471283487-24113-6-git-send-email-sean.wang@mediatek.com \ --to=sean.wang@mediatek.com \ --cc=davem@davemloft.net \ --cc=john@phrozen.org \ --cc=keyhaede@gmail.com \ --cc=linux-mediatek@lists.infradead.org \ --cc=nbd@openwrt.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.