Commit 072a9c48 authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller

netpoll: revert 6bdb7fe3 and fix be_poll() instead

Against -net.

In the patch "netpoll: re-enable irq in poll_napi()", I tried to
fix the following warning:

[100718.051041] ------------[ cut here ]------------
[100718.051048] WARNING: at kernel/softirq.c:159 local_bh_enable_ip+0x7d/0xb0()
(Not tainted)
[100718.051049] Hardware name: ProLiant BL460c G7
...
[100718.051068] Call Trace:
[100718.051073]  [<ffffffff8106b747>] ? warn_slowpath_common+0x87/0xc0
[100718.051075]  [<ffffffff8106b79a>] ? warn_slowpath_null+0x1a/0x20
[100718.051077]  [<ffffffff810747ed>] ? local_bh_enable_ip+0x7d/0xb0
[100718.051080]  [<ffffffff8150041b>] ? _spin_unlock_bh+0x1b/0x20
[100718.051085]  [<ffffffffa00ee974>] ? be_process_mcc+0x74/0x230 [be2net]
[100718.051088]  [<ffffffffa00ea68c>] ? be_poll_tx_mcc+0x16c/0x290 [be2net]
[100718.051090]  [<ffffffff8144fe76>] ? netpoll_poll_dev+0xd6/0x490
[100718.051095]  [<ffffffffa01d24a5>] ? bond_poll_controller+0x75/0x80 [bonding]
[100718.051097]  [<ffffffff8144fde5>] ? netpoll_poll_dev+0x45/0x490
[100718.051100]  [<ffffffff81161b19>] ? ksize+0x19/0x80
[100718.051102]  [<ffffffff81450437>] ? netpoll_send_skb_on_dev+0x157/0x240

by reenabling IRQ before calling ->poll, but it seems more
problems are introduced after that patch:

http://ozlabs.org/~akpm/stuff/IMG_20120824_122054.jpg
http://marc.info/?l=linux-netdev&m=134563282530588&w=2

So it is safe to fix be2net driver code directly.

This patch reverts the offending commit and fixes be_poll() by
avoid disabling BH there, this is okay because be_poll()
can be called either by poll_napi() which already disables
IRQ, or by net_rx_action() which already disables BH.
Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reported-by: default avatarSylvain Munaut <s.munaut@whatever-company.com>
Cc: Sylvain Munaut <s.munaut@whatever-company.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Miller <davem@davemloft.net>
Cc: Sathya Perla <sathya.perla@emulex.com>
Cc: Subbu Seetharaman <subbu.seetharaman@emulex.com>
Cc: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Tested-by: default avatarSylvain Munaut <s.munaut@whatever-company.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f88cf73d
...@@ -259,7 +259,7 @@ int be_process_mcc(struct be_adapter *adapter) ...@@ -259,7 +259,7 @@ int be_process_mcc(struct be_adapter *adapter)
int num = 0, status = 0; int num = 0, status = 0;
struct be_mcc_obj *mcc_obj = &adapter->mcc_obj; struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
spin_lock_bh(&adapter->mcc_cq_lock); spin_lock(&adapter->mcc_cq_lock);
while ((compl = be_mcc_compl_get(adapter))) { while ((compl = be_mcc_compl_get(adapter))) {
if (compl->flags & CQE_FLAGS_ASYNC_MASK) { if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
/* Interpret flags as an async trailer */ /* Interpret flags as an async trailer */
...@@ -280,7 +280,7 @@ int be_process_mcc(struct be_adapter *adapter) ...@@ -280,7 +280,7 @@ int be_process_mcc(struct be_adapter *adapter)
if (num) if (num)
be_cq_notify(adapter, mcc_obj->cq.id, mcc_obj->rearm_cq, num); be_cq_notify(adapter, mcc_obj->cq.id, mcc_obj->rearm_cq, num);
spin_unlock_bh(&adapter->mcc_cq_lock); spin_unlock(&adapter->mcc_cq_lock);
return status; return status;
} }
...@@ -295,7 +295,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter) ...@@ -295,7 +295,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
if (be_error(adapter)) if (be_error(adapter))
return -EIO; return -EIO;
local_bh_disable();
status = be_process_mcc(adapter); status = be_process_mcc(adapter);
local_bh_enable();
if (atomic_read(&mcc_obj->q.used) == 0) if (atomic_read(&mcc_obj->q.used) == 0)
break; break;
......
...@@ -3763,7 +3763,9 @@ static void be_worker(struct work_struct *work) ...@@ -3763,7 +3763,9 @@ static void be_worker(struct work_struct *work)
/* when interrupts are not yet enabled, just reap any pending /* when interrupts are not yet enabled, just reap any pending
* mcc completions */ * mcc completions */
if (!netif_running(adapter->netdev)) { if (!netif_running(adapter->netdev)) {
local_bh_disable();
be_process_mcc(adapter); be_process_mcc(adapter);
local_bh_enable();
goto reschedule; goto reschedule;
} }
......
...@@ -168,25 +168,17 @@ static void poll_napi(struct net_device *dev) ...@@ -168,25 +168,17 @@ static void poll_napi(struct net_device *dev)
struct napi_struct *napi; struct napi_struct *napi;
int budget = 16; int budget = 16;
WARN_ON_ONCE(!irqs_disabled());
list_for_each_entry(napi, &dev->napi_list, dev_list) { list_for_each_entry(napi, &dev->napi_list, dev_list) {
local_irq_enable();
if (napi->poll_owner != smp_processor_id() && if (napi->poll_owner != smp_processor_id() &&
spin_trylock(&napi->poll_lock)) { spin_trylock(&napi->poll_lock)) {
rcu_read_lock_bh();
budget = poll_one_napi(rcu_dereference_bh(dev->npinfo), budget = poll_one_napi(rcu_dereference_bh(dev->npinfo),
napi, budget); napi, budget);
rcu_read_unlock_bh();
spin_unlock(&napi->poll_lock); spin_unlock(&napi->poll_lock);
if (!budget) { if (!budget)
local_irq_disable();
break; break;
} }
} }
local_irq_disable();
}
} }
static void service_arp_queue(struct netpoll_info *npi) static void service_arp_queue(struct netpoll_info *npi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment