Commit 303c6a02 authored Mar 17, 2009 by Herbert Xu Committed by David S. Miller Mar 17, 2009

gro: Fix legacy path napi_complete crash



On the legacy netif_rx path, I incorrectly tried to optimise
the napi_complete call by using __napi_complete before we reenable
IRQs.  This simply doesn't work since we need to flush the held
GRO packets first.

This patch fixes it by doing the obvious thing of reenabling
IRQs first and then calling napi_complete.

Reported-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ea8dbdd1

net/core/dev.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2588,9 +2588,9 @@ 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();
	break;		napi_complete(napi);
			goto out;
	}		}
	local_irq_enable();		local_irq_enable();

	@@ -2599,6 +2599,7 @@ static int process_backlog(struct napi_struct *napi, int quota)

	napi_gro_flush(napi);		napi_gro_flush(napi);

			out:
	return work;		return work;
	}		}

Admin message