Skip to content

Commit

Permalink
netpoll: re-enable irq in poll_napi()
Browse files Browse the repository at this point in the history
napi->poll() needs IRQ enabled, so we have to re-enable IRQ before
calling it.

Cc: David Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Amerigo Wang authored and davem330 committed Aug 14, 2012
1 parent 689971b commit 6bdb7fe
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion net/core/netpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,24 @@ static void poll_napi(struct net_device *dev)
struct napi_struct *napi;
int budget = 16;

WARN_ON_ONCE(!irqs_disabled());

list_for_each_entry(napi, &dev->napi_list, dev_list) {
local_irq_enable();
if (napi->poll_owner != smp_processor_id() &&
spin_trylock(&napi->poll_lock)) {
rcu_read_lock_bh();
budget = poll_one_napi(rcu_dereference_bh(dev->npinfo),
napi, budget);
rcu_read_unlock_bh();
spin_unlock(&napi->poll_lock);

if (!budget)
if (!budget) {
local_irq_disable();
break;
}
}
local_irq_disable();
}
}

Expand Down

0 comments on commit 6bdb7fe

Please sign in to comment.