diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2016-03-11 09:43:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-14 03:35:35 +0100 |
| commit | 885eb0a516e4d686849b91c5a1ba25c70b7a6540 (patch) | |
| tree | d6c23320fc70f5b5ab7354574a26447e5065d5e5 /net/core | |
| parent | r8169:Remove unnecessary phy reset for pcie nic when setting link spped. (diff) | |
| download | linux-885eb0a516e4d686849b91c5a1ba25c70b7a6540.tar.xz linux-885eb0a516e4d686849b91c5a1ba25c70b7a6540.zip | |
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 51d768e7bc90..f044f970f1a6 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; } |