adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

GRO: Disable GRO on legacy netif_rx path

Browse source 
When I fixed the GRO crash in the legacy receive path I used
napi_complete to replace __napi_complete.  Unfortunately they're
not the same when NETPOLL is enabled, which may result in us
not calling __napi_complete at all.

What's more, we really do need to keep the __napi_complete call
within the IRQ-off section since in theory an IRQ can occur in
between and fill up the backlog to the maximum, causing us to
lock up.

Since we can't seem to find a fix that works properly right now,
this patch reverts all the GRO support from the netif_rx path.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2009-03-26 00:59:10 -07:00 committed by David S. Miller
parent be0ea69674
commit 8f1ead2d1a
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/core/dev.c
View file

@ -2627,18 +2627,15 @@ static int process_backlog(struct napi_struct *napi, int quota)
local_irq_disable(); local_irq_disable();
skb = __skb_dequeue(&queue->input_pkt_queue); skb = __skb_dequeue(&queue->input_pkt_queue);
if (!skb) { if (!skb) {
__napi_complete(napi);
local_irq_enable(); local_irq_enable();
napi_complete(napi); break;
goto out;
} }
local_irq_enable(); local_irq_enable();
napi_gro_receive(napi, skb); netif_receive_skb(skb);
} while (++work < quota && jiffies == start_time); } while (++work < quota && jiffies == start_time);
napi_gro_flush(napi);
out:
return work; return work;
} }