mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	Alexandre Torgue <alexandre.torgue@foss.st.com>,
	Jose Abreu <joabreu@synopsys.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	Russell King <linux@armlinux.org.uk>,
	Andrew Lunn <andrew@lunn.ch>,
	Heiner Kallweit <hkallweit1@gmail.com>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
	Serge Semin <fancer.lancer@gmail.com>,
	Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
	Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>,
	Christian Marangi <ansuelsmth@gmail.com>,
	Biao Huang <biao.huang@mediatek.com>,
	Yang Yingliang <yangyingliang@huawei.com>,
	<netdev@vger.kernel.org>,
	<linux-stm32@st-md-mailman.stormreply.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	Jose Abreu <Jose.Abreu@synopsys.com>
Subject: [PATCH net 08/13] net: stmmac: Fix Rx IC bit setting procedure for Rx-mitigation
Date: Tue, 14 Mar 2023 01:42:32 +0300	[thread overview]
Message-ID: <20230313224237.28757-9-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20230313224237.28757-1-Sergey.Semin@baikalelectronics.ru>

The WDT-less Rx-traffic mitigation is simple: enable the Rx-descriptor
Completion interrupt only when a particular number of descriptors handled
by the NIC. Alas it's broken now because the data variable rx_count_frames
is always set to zero due to commit 6fa9d691b91a ("net: stmmac: Prevent
divide-by-zero") (++rx_count_frames + rx_coal_frames > rx_coal_frames
always if no overflow happens). So Rx IC will be enabled for each
descriptor as soon as rx_coal_frames is non-zero or there is no Rx WDT
available, which basically disables the Rx-mitigation in the framework of
the number of received frames part. Fix that by discarding the statement:
rx_q->rx_count_frames += priv->rx_coal_frames.

Fixes: 6fa9d691b91a ("net: stmmac: Prevent divide-by-zero")
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 229f827d7572..32aa7953d296 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4627,7 +4627,6 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
 		stmmac_refill_desc3(priv, rx_q, p);
 
 		rx_q->rx_count_frames++;
-		rx_q->rx_count_frames += priv->rx_coal_frames[queue];
 		if (rx_q->rx_count_frames > priv->rx_coal_frames[queue])
 			rx_q->rx_count_frames = 0;
 
@@ -4967,7 +4966,6 @@ static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
 		stmmac_refill_desc3(priv, rx_q, rx_desc);
 
 		rx_q->rx_count_frames++;
-		rx_q->rx_count_frames += priv->rx_coal_frames[queue];
 		if (rx_q->rx_count_frames > priv->rx_coal_frames[queue])
 			rx_q->rx_count_frames = 0;
 
-- 
2.39.2



  parent reply	other threads:[~2023-03-13 22:44 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-13 22:42 [PATCH net 00/13] net: stmmac: Fixes bundle #1 Serge Semin
2023-03-13 22:42 ` [PATCH net 01/13] net: phy: realtek: Fix events detection failure in LPI mode Serge Semin
2023-03-14  0:39   ` Andrew Lunn
2023-03-14 11:16     ` Serge Semin
2023-03-13 22:42 ` [PATCH net 02/13] net: stmmac: Omit last desc flag for non-linear jumbos in chain-mode Serge Semin
2023-03-13 22:42 ` [PATCH net 03/13] net: stmmac: Fix extended descriptors usage for " Serge Semin
2023-03-13 22:42 ` [PATCH net 04/13] net: stmmac: dwmac-sun8i: Don't modify chain-mode module parameter Serge Semin
2023-03-13 22:42 ` [PATCH net 05/13] net: stmmac: Enable ATDS for chain-mode Serge Semin
2023-03-14 11:42   ` Piotr Raczynski
2023-03-13 22:42 ` [PATCH net 06/13] net: stmmac: Free temporary Rx SKB on request Serge Semin
2023-03-14 11:26   ` Piotr Raczynski
2023-03-13 22:42 ` [PATCH net 07/13] net: stmmac: Free Rx descs on Tx allocation failure Serge Semin
2023-03-14  9:22   ` Piotr Raczynski
2023-03-13 22:42 ` Serge Semin [this message]
2023-03-13 22:42 ` [PATCH net 09/13] net: stmmac: Remove default maxmtu DT-platform setting Serge Semin
2023-03-14 11:20   ` Piotr Raczynski
2023-03-14 12:03     ` Serge Semin
2023-03-13 22:42 ` [PATCH net 10/13] net: stmmac: Make buf_sz module parameter useful Serge Semin
2023-03-13 22:42 ` [PATCH net 11/13] net: stmmac: gmac4: Use dwmac410_disable_dma_irq for DW MAC v4.10 DMA Serge Semin
2023-03-13 22:42 ` [PATCH net 12/13] net: stmmac: Stop overriding the PTP clock info static instance Serge Semin
2023-03-13 22:42 ` [PATCH net 13/13] net: dwmac-loongson: Perceive zero IRQ as invalid Serge Semin
2023-03-14  8:20   ` Piotr Raczynski
2023-03-14 11:38     ` Serge Semin

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=20230313224237.28757-9-Sergey.Semin@baikalelectronics.ru \
    --to=sergey.semin@baikalelectronics.ru \
    --cc=Alexey.Malahov@baikalelectronics.ru \
    --cc=Jose.Abreu@synopsys.com \
    --cc=Pavel.Parkhomenko@baikalelectronics.ru \
    --cc=alexandre.torgue@foss.st.com \
    --cc=andrew@lunn.ch \
    --cc=ansuelsmth@gmail.com \
    --cc=biao.huang@mediatek.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=fancer.lancer@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=joabreu@synopsys.com \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=linux@armlinux.org.uk \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=peppe.cavallaro@st.com \
    --cc=yangyingliang@huawei.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

all inboxes | Powered by JetHome®