From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Lorenzo Bianconi <lorenzo@kernel.org>,
Felix Fietkau <nbd@nbd.name>, Sean Wang <sean.wang@mediatek.com>,
Mark Lee <Mark-MC.Lee@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, netdev@vger.kernel.org,
upstream@airoha.com
Subject: [PATCH net-next] net: airoha: Implement BQL support
Date: Mon, 30 Sep 2024 14:58:35 +0200 [thread overview]
Message-ID: <20240930-en7581-bql-v1-1-064cdd570068@kernel.org> (raw)
Introduce BQL support in the airoha_eth driver to avoid queuing to much
packets into the device hw queues and keep the latency small.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/mediatek/airoha_eth.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c
index 930f180688e5..6dfde2828d93 100644
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
@@ -786,6 +786,7 @@ struct airoha_hw_stats {
};
struct airoha_qdma {
+ struct airoha_gdm_port *port;
struct airoha_eth *eth;
void __iomem *regs;
@@ -1658,6 +1659,7 @@ static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)
while (irq_q->queued > 0 && done < budget) {
u32 qid, last, val = irq_q->q[irq_q->head];
+ u32 bytes = 0, count = 0;
struct airoha_queue *q;
if (val == 0xff)
@@ -1684,7 +1686,6 @@ static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)
struct airoha_qdma_desc *desc = &q->desc[q->tail];
struct airoha_queue_entry *e = &q->entry[q->tail];
u32 desc_ctrl = le32_to_cpu(desc->ctrl);
- struct sk_buff *skb = e->skb;
u16 index = q->tail;
if (!(desc_ctrl & QDMA_DESC_DONE_MASK) &&
@@ -1700,15 +1701,11 @@ static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)
WRITE_ONCE(desc->msg0, 0);
WRITE_ONCE(desc->msg1, 0);
- if (skb) {
- struct netdev_queue *txq;
-
- txq = netdev_get_tx_queue(skb->dev, qid);
- if (netif_tx_queue_stopped(txq) &&
- q->ndesc - q->queued >= q->free_thr)
- netif_tx_wake_queue(txq);
+ if (e->skb) {
+ bytes += e->skb->len;
+ count++;
- dev_kfree_skb_any(skb);
+ dev_kfree_skb_any(e->skb);
e->skb = NULL;
}
@@ -1716,6 +1713,16 @@ static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)
break;
}
+ if (qdma->port) {
+ struct netdev_queue *txq;
+
+ txq = netdev_get_tx_queue(qdma->port->dev, qid);
+ netdev_tx_completed_queue(txq, count, bytes);
+ if (netif_tx_queue_stopped(txq) &&
+ q->ndesc - q->queued >= q->free_thr)
+ netif_tx_wake_queue(txq);
+ }
+
spin_unlock_bh(&q->lock);
}
@@ -2482,6 +2489,7 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb,
q->head = index;
q->queued += i;
+ netdev_tx_sent_queue(txq, skb->len);
skb_tx_timestamp(skb);
if (q->ndesc - q->queued < q->free_thr)
netif_tx_stop_queue(txq);
@@ -2650,6 +2658,7 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, struct device_node *np)
port->dev = dev;
port->id = id;
eth->ports[index] = port;
+ qdma->port = port;
return register_netdev(dev);
}
---
base-commit: c824deb1a89755f70156b5cdaf569fca80698719
change-id: 20240930-en7581-bql-552566f2078e
Best regards,
--
Lorenzo Bianconi <lorenzo@kernel.org>
next reply other threads:[~2024-09-30 13:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 12:58 Lorenzo Bianconi [this message]
2024-10-04 0:24 ` [PATCH net-next] net: airoha: Implement BQL support Jakub Kicinski
2024-10-04 8:30 ` Lorenzo Bianconi
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=20240930-en7581-bql-v1-1-064cdd570068@kernel.org \
--to=lorenzo@kernel.org \
--cc=Mark-MC.Lee@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.wang@mediatek.com \
--cc=upstream@airoha.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).