Messages in this thread Patch in this message | | | Date | Thu, 13 Aug 2009 12:49:44 -0700 | From | Greg KH <> | Subject | [patch 09/74] gro: Flush GRO packets in napi_disable_pending path |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------
From: Herbert Xu <herbert@gondor.apana.org.au>
[ Upstream commit ff780cd8f2fa928b193554f593b36d1243554212 ]
When NAPI is disabled while we're in net_rx_action, we end up calling __napi_complete without flushing GRO packets. This is a bug as it would cause the GRO packets to linger, of course it also literally BUGs to catch error like this :)
This patch changes it to napi_complete, with the obligatory IRQ reenabling. This should be safe because we've only just disabled IRQs and it does not materially affect the test conditions in between.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/core/dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
--- a/net/core/dev.c +++ b/net/core/dev.c @@ -2788,9 +2788,11 @@ static void net_rx_action(struct softirq * move the instance around on the list at-will. */ if (unlikely(work == weight)) { - if (unlikely(napi_disable_pending(n))) - __napi_complete(n); - else + if (unlikely(napi_disable_pending(n))) { + local_irq_enable(); + napi_complete(n); + local_irq_disable(); + } else list_move_tail(&n->poll_list, list); }
| |