Commit 885eb0a5 authored Mar 11, 2016 by Jesper Dangaard Brouer Committed by David S. Miller Mar 13, 2016

net: adjust napi_consume_skb to handle non-NAPI callers



Some drivers reuse/share code paths that free SKBs between NAPI
and non-NAPI calls. Adjust napi_consume_skb to handle this
use-case.

Before, calls from netpoll (w/ IRQs disabled) was handled and
indicated with a budget zero indication.  Use the same zero
indication to handle calls not originating from NAPI/softirq.
Simply handled by using dev_consume_skb_any().

This adds an extra branch+call for the netpoll case (checking
in_irq() + irqs_disabled()), but that is okay as this is a slowpath.

Suggested-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c4556975

net/core/skbuff.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -801,9 +801,9 @@ void napi_consume_skb(struct sk_buff *skb, int budget)
		if (unlikely(!skb))
		return;

		/* if budget is 0 assume netpoll w/ IRQs disabled */
		/* Zero budget indicate non-NAPI context called us, like netpoll */
		if (unlikely(!budget)) {
		dev_consume_skb_irq(skb);
		dev_consume_skb_any(skb);
		return;
		}

Admin message