| Message ID | 20240326083740.23364-2-paul.barker.ct@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | [1/2] net: ravb: Always process TX descriptor ring | expand |
Hi Paul, Thanks for your work. On 2024-03-26 08:37:40 +0000, Paul Barker wrote: > The error statistics should be updated each time the poll function is > called, even if the full RX work budget has been consumed. This prevents > the counts from becoming stuck when RX bandwidth usage is high. > > This also ensures that error counters are not updated after we've > re-enabled interrupts as that could result in a race condition. > > Also drop an unnecessary space. > > Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver") Same comment about fixes tag is in patch 1/2. > Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com> > --- > drivers/net/ethernet/renesas/ravb_main.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c > index 4f98e4e2badb..a95703948a36 100644 > --- a/drivers/net/ethernet/renesas/ravb_main.c > +++ b/drivers/net/ethernet/renesas/ravb_main.c > @@ -1339,6 +1339,15 @@ static int ravb_poll(struct napi_struct *napi, int budget) > netif_wake_subqueue(ndev, q); > spin_unlock_irqrestore(&priv->lock, flags); > > + /* Receive error message handling */ > + priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; While you are dropping spaces s/= priv/= priv/ here. > + if (info->nc_queues) > + priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; > + if (priv->rx_over_errors != ndev->stats.rx_over_errors) > + ndev->stats.rx_over_errors = priv->rx_over_errors; > + if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) > + ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; > + > if (!rearm) > goto out; > > @@ -1355,14 +1364,6 @@ static int ravb_poll(struct napi_struct *napi, int budget) > } > spin_unlock_irqrestore(&priv->lock, flags); > > - /* Receive error message handling */ > - priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; > - if (info->nc_queues) > - priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; > - if (priv->rx_over_errors != ndev->stats.rx_over_errors) > - ndev->stats.rx_over_errors = priv->rx_over_errors; > - if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) > - ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; > out: > return budget - quota; > } > -- > 2.44.0 >
On 3/26/24 11:37 AM, Paul Barker wrote: > The error statistics should be updated each time the poll function is > called, even if the full RX work budget has been consumed. This prevents > the counts from becoming stuck when RX bandwidth usage is high. > > This also ensures that error counters are not updated after we've > re-enabled interrupts as that could result in a race condition. > > Also drop an unnecessary space. Which one? I'm seeing one intact... :-) > Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver") As have been already said, it's wrong... :-/ > Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com> > --- > drivers/net/ethernet/renesas/ravb_main.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c > index 4f98e4e2badb..a95703948a36 100644 > --- a/drivers/net/ethernet/renesas/ravb_main.c > +++ b/drivers/net/ethernet/renesas/ravb_main.c > @@ -1339,6 +1339,15 @@ static int ravb_poll(struct napi_struct *napi, int budget) > netif_wake_subqueue(ndev, q); > spin_unlock_irqrestore(&priv->lock, flags); > > + /* Receive error message handling */ > + priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; So you missed this extra space... > + if (info->nc_queues) > + priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; > + if (priv->rx_over_errors != ndev->stats.rx_over_errors) > + ndev->stats.rx_over_errors = priv->rx_over_errors; > + if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) > + ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; > + > if (!rearm) > goto out; > [...] MBR, Sergey
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 4f98e4e2badb..a95703948a36 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1339,6 +1339,15 @@ static int ravb_poll(struct napi_struct *napi, int budget) netif_wake_subqueue(ndev, q); spin_unlock_irqrestore(&priv->lock, flags); + /* Receive error message handling */ + priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; + if (info->nc_queues) + priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; + if (priv->rx_over_errors != ndev->stats.rx_over_errors) + ndev->stats.rx_over_errors = priv->rx_over_errors; + if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) + ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; + if (!rearm) goto out; @@ -1355,14 +1364,6 @@ static int ravb_poll(struct napi_struct *napi, int budget) } spin_unlock_irqrestore(&priv->lock, flags); - /* Receive error message handling */ - priv->rx_over_errors = priv->stats[RAVB_BE].rx_over_errors; - if (info->nc_queues) - priv->rx_over_errors += priv->stats[RAVB_NC].rx_over_errors; - if (priv->rx_over_errors != ndev->stats.rx_over_errors) - ndev->stats.rx_over_errors = priv->rx_over_errors; - if (priv->rx_fifo_errors != ndev->stats.rx_fifo_errors) - ndev->stats.rx_fifo_errors = priv->rx_fifo_errors; out: return budget - quota; }
The error statistics should be updated each time the poll function is called, even if the full RX work budget has been consumed. This prevents the counts from becoming stuck when RX bandwidth usage is high. This also ensures that error counters are not updated after we've re-enabled interrupts as that could result in a race condition. Also drop an unnecessary space. Fixes: a0d2f20650e8 ("Renesas Ethernet AVB PTP clock driver") Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com> --- drivers/net/ethernet/renesas/ravb_main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)