From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
To: Felix Fietkau <nbd@nbd.name>, John Crispin <john@phrozen.org>,
Sean Wang <sean.wang@mediatek.com>,
Mark Lee <Mark-MC.Lee@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Cc: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Subject: [PATCH net-next 06/14] net: ethernet: mtk_eth_soc: remove unnecessary TX queue stops
Date: Wed, 21 Apr 2021 21:09:06 -0700 [thread overview]
Message-ID: <20210422040914.47788-7-ilya.lipnitskiy@gmail.com> (raw)
In-Reply-To: <20210422040914.47788-1-ilya.lipnitskiy@gmail.com>
From: Felix Fietkau <nbd@nbd.name>
When running short on descriptors, only stop the queue for the netdev that
tx was attempted for. By the time something tries to send on the other
netdev, the ring might have some more room already.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index a3958e99a29f..223131645a37 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1129,17 +1129,6 @@ static void mtk_wake_queue(struct mtk_eth *eth)
}
}
-static void mtk_stop_queue(struct mtk_eth *eth)
-{
- int i;
-
- for (i = 0; i < MTK_MAC_COUNT; i++) {
- if (!eth->netdev[i])
- continue;
- netif_stop_queue(eth->netdev[i]);
- }
-}
-
static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mtk_mac *mac = netdev_priv(dev);
@@ -1160,7 +1149,7 @@ static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
tx_num = mtk_cal_txd_req(skb);
if (unlikely(atomic_read(&ring->free_count) <= tx_num)) {
- mtk_stop_queue(eth);
+ netif_stop_queue(dev);
netif_err(eth, tx_queued, dev,
"Tx Ring full when queue awake!\n");
spin_unlock(ð->page_lock);
@@ -1186,7 +1175,7 @@ static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
goto drop;
if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
- mtk_stop_queue(eth);
+ netif_stop_queue(dev);
spin_unlock(ð->page_lock);
--
2.31.1
next prev parent reply other threads:[~2021-04-22 4:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 4:09 [PATCH net-next 00/14] mtk_eth_soc: fixes and performance improvements Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 01/14] net: ethernet: mtk_eth_soc: fix RX VLAN offload Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 02/14] net: ethernet: mtk_eth_soc: unmap RX data before calling build_skb Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 03/14] net: ethernet: mtk_eth_soc: fix build_skb cleanup Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 04/14] net: ethernet: mtk_eth_soc: use napi_consume_skb Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 05/14] net: ethernet: mtk_eth_soc: reduce MDIO bus access latency Ilya Lipnitskiy
2021-04-22 12:18 ` Andrew Lunn
2021-04-22 12:33 ` Felix Fietkau
2021-04-23 4:16 ` Ilya Lipnitskiy
2021-04-22 4:09 ` Ilya Lipnitskiy [this message]
2021-04-22 4:09 ` [PATCH net-next 07/14] net: ethernet: mtk_eth_soc: use larger burst size for QDMA TX Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 08/14] net: ethernet: mtk_eth_soc: increase DMA ring sizes Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 09/14] net: ethernet: mtk_eth_soc: implement dynamic interrupt moderation Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 10/14] net: ethernet: mtk_eth_soc: cache HW pointer of last freed TX descriptor Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 11/14] net: ethernet: mtk_eth_soc: only read the full RX descriptor if DMA is done Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 12/14] net: ethernet: mtk_eth_soc: reduce unnecessary interrupts Ilya Lipnitskiy
2021-04-22 16:26 ` Jakub Kicinski
2021-04-23 4:20 ` Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 13/14] net: ethernet: mtk_eth_soc: set PPE flow hash as skb hash if present Ilya Lipnitskiy
2021-04-22 4:09 ` [PATCH net-next 14/14] net: ethernet: mtk_eth_soc: use iopoll.h macro for DMA init Ilya Lipnitskiy
2021-04-22 12:20 ` Andrew Lunn
2021-04-22 12:23 ` [PATCH net-next 00/14] mtk_eth_soc: fixes and performance improvements Andrew Lunn
2021-04-23 4:18 ` Ilya Lipnitskiy
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=20210422040914.47788-7-ilya.lipnitskiy@gmail.com \
--to=ilya.lipnitskiy@gmail.com \
--cc=Mark-MC.Lee@mediatek.com \
--cc=davem@davemloft.net \
--cc=john@phrozen.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=sean.wang@mediatek.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).