Skip to content

Commit

Permalink
net: ravb: Always process TX descriptor ring
Browse files Browse the repository at this point in the history
[ Upstream commit 596a425 ]

The TX queue should be serviced each time the poll function is called,
even if the full RX work budget has been consumed. This prevents
starvation of the TX queue when RX bandwidth usage is high.

Fixes: c156633 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20240402145305.82148-1-paul.barker.ct@bp.renesas.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
pbrkr authored and gregkh committed Apr 10, 2024
1 parent a9fb2f7 commit 1dd9204
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/ethernet/renesas/ravb_main.c
Expand Up @@ -1292,12 +1292,12 @@ static int ravb_poll(struct napi_struct *napi, int budget)
int q = napi - priv->napi;
int mask = BIT(q);
int quota = budget;
bool unmask;

/* Processing RX Descriptor Ring */
/* Clear RX interrupt */
ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
if (ravb_rx(ndev, &quota, q))
goto out;
unmask = !ravb_rx(ndev, &quota, q);

/* Processing TX Descriptor Ring */
spin_lock_irqsave(&priv->lock, flags);
Expand All @@ -1307,6 +1307,9 @@ static int ravb_poll(struct napi_struct *napi, int budget)
netif_wake_subqueue(ndev, q);
spin_unlock_irqrestore(&priv->lock, flags);

if (!unmask)
goto out;

napi_complete(napi);

/* Re-enable RX/TX interrupts */
Expand Down

0 comments on commit 1dd9204

Please sign in to comment.