From: Sieng Piaw Liew <liew.s.piaw@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: bcm-kernel-feedback-list@broadcom.com,
Sieng Piaw Liew <liew.s.piaw@gmail.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v3 2/7] bcm63xx_enet: add BQL support
Date: Wed, 6 Jan 2021 22:42:03 +0800 [thread overview]
Message-ID: <20210106144208.1935-3-liew.s.piaw@gmail.com> (raw)
In-Reply-To: <20210106144208.1935-1-liew.s.piaw@gmail.com>
Add Byte Queue Limits support to reduce/remove bufferbloat in
bcm63xx_enet.
Signed-off-by: Sieng Piaw Liew <liew.s.piaw@gmail.com>
---
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index b82b7805c36a..90f8214b4d22 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -417,9 +417,11 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
{
struct bcm_enet_priv *priv;
+ unsigned int bytes;
int released;
priv = netdev_priv(dev);
+ bytes = 0;
released = 0;
while (priv->tx_desc_count < priv->tx_ring_size) {
@@ -456,10 +458,13 @@ static int bcm_enet_tx_reclaim(struct net_device *dev, int force)
if (desc->len_stat & DMADESC_UNDER_MASK)
dev->stats.tx_errors++;
+ bytes += skb->len;
dev_kfree_skb(skb);
released++;
}
+ netdev_completed_queue(dev, released, bytes);
+
if (netif_queue_stopped(dev) && released)
netif_wake_queue(dev);
@@ -626,6 +631,8 @@ bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
desc->len_stat = len_stat;
wmb();
+ netdev_sent_queue(dev, skb->len);
+
/* kick tx dma */
enet_dmac_writel(priv, priv->dma_chan_en_mask,
ENETDMAC_CHANCFG, priv->tx_chan);
@@ -1169,6 +1176,7 @@ static int bcm_enet_stop(struct net_device *dev)
kdev = &priv->pdev->dev;
netif_stop_queue(dev);
+ netdev_reset_queue(dev);
napi_disable(&priv->napi);
if (priv->has_phy)
phy_stop(dev->phydev);
@@ -2338,6 +2346,7 @@ static int bcm_enetsw_stop(struct net_device *dev)
del_timer_sync(&priv->swphy_poll);
netif_stop_queue(dev);
+ netdev_reset_queue(dev);
napi_disable(&priv->napi);
del_timer_sync(&priv->rx_timeout);
--
2.17.1
next prev parent reply other threads:[~2021-01-06 14:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 14:42 [PATCH net-next v3 0/7] bcm63xx_enet: major makeover of driver Sieng Piaw Liew
2021-01-06 14:42 ` [PATCH net-next v3 1/7] bcm63xx_enet: batch process rx path Sieng Piaw Liew
2021-01-06 17:04 ` Florian Fainelli
2021-01-06 14:42 ` Sieng Piaw Liew [this message]
2021-01-06 17:05 ` [PATCH net-next v3 2/7] bcm63xx_enet: add BQL support Florian Fainelli
2021-01-06 14:42 ` [PATCH net-next v3 3/7] bcm63xx_enet: add xmit_more support Sieng Piaw Liew
2021-01-06 17:05 ` Florian Fainelli
2021-01-06 14:42 ` [PATCH net-next v3 4/7] bcm63xx_enet: alloc rx skb with NET_IP_ALIGN Sieng Piaw Liew
2021-01-06 17:06 ` Florian Fainelli
2021-01-06 14:42 ` [PATCH net-next v3 5/7] bcm63xx_enet: consolidate rx SKB ring cleanup code Sieng Piaw Liew
2021-01-06 17:07 ` Florian Fainelli
2021-01-06 14:42 ` [PATCH net-next v3 6/7] bcm63xx_enet: convert to build_skb Sieng Piaw Liew
2021-01-06 17:08 ` Florian Fainelli
2021-01-06 14:42 ` [PATCH net-next v3 7/7] bcm63xx_enet: improve rx loop Sieng Piaw Liew
2021-01-06 17:08 ` Florian Fainelli
2021-01-06 17:03 ` [PATCH net-next v3 0/7] bcm63xx_enet: major makeover of driver Florian Fainelli
2021-01-07 20:41 ` Jakub Kicinski
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=20210106144208.1935-3-liew.s.piaw@gmail.com \
--to=liew.s.piaw@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.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: 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).