netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] forcedeth: Account for consumed budget in napi poll
@ 2010-05-06  4:15 Tom Herbert
  2010-05-06  7:14 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Tom Herbert @ 2010-05-06  4:15 UTC (permalink / raw)
  To: netdev, davem

Repeated calls to nv_rx_process in napi poll routine do not take
portion of budget that has been consumed in previous calls.  Fix by
subtracting the number of packets processed.

Signed-off-by: Tom Herbert <therbert@google.com>
---
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index f9e1dd4..e282d0a 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3564,14 +3564,15 @@ static int nv_napi_poll(struct napi_struct *napi, int budget)
 			tx_work += nv_tx_done(dev, np->tx_ring_size);
 			spin_unlock_irqrestore(&np->lock, flags);
 
-			rx_count = nv_rx_process(dev, budget);
+			rx_count = nv_rx_process(dev, budget - rx_work);
 			retcode = nv_alloc_rx(dev);
 		} else {
 			spin_lock_irqsave(&np->lock, flags);
 			tx_work += nv_tx_done_optimized(dev, np->tx_ring_size);
 			spin_unlock_irqrestore(&np->lock, flags);
 
-			rx_count = nv_rx_process_optimized(dev, budget);
+			rx_count = nv_rx_process_optimized(dev,
+			    budget - rx_work);
 			retcode = nv_alloc_rx_optimized(dev);
 		}
 	} while (retcode == 0 &&

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] forcedeth: Account for consumed budget in napi poll
  2010-05-06  4:15 [PATCH] forcedeth: Account for consumed budget in napi poll Tom Herbert
@ 2010-05-06  7:14 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-05-06  7:14 UTC (permalink / raw)
  To: therbert; +Cc: netdev

From: Tom Herbert <therbert@google.com>
Date: Wed, 5 May 2010 21:15:21 -0700 (PDT)

> Repeated calls to nv_rx_process in napi poll routine do not take
> portion of budget that has been consumed in previous calls.  Fix by
> subtracting the number of packets processed.
> 
> Signed-off-by: Tom Herbert <therbert@google.com>

Applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-06  7:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-06  4:15 [PATCH] forcedeth: Account for consumed budget in napi poll Tom Herbert
2010-05-06  7:14 ` David Miller

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).