be2net: fix tx completion polling
Subsystems (2)
PATCH 1/1 be2net: fix tx completion polling
In tx/mcc polling, napi_complete() is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napi complete() after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).
Pls apply to net-2.6.
--- drivers/net/benet/be_cmds.c | 26 ++++++++++++------------ drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_main.c | 45 +++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 37 deletions(-)
drivers/net/benet/be_cmds.c +13 -13
@@ -104,10 +104,10 @@ static struct be_mcc_compl *be_mcc_compl_get(struct be_adapter *adapter)return NULL ; } -int be_process_mcc (struct be_adapter *adapter) +int be_process_mcc (struct be_adapter *adapter,int *status) {struct be_mcc_compl *compl; -int num =0 , status =0 ; +int num =0 ;spin_lock_bh (&adapter->mcc_cq_lock);while ((compl =be_mcc_compl_get (adapter))) {
@@ -119,31 +119,31 @@ int be_process_mcc(struct be_adapter *adapter)be_async_link_state_process (adapter, (struct be_async_event_link_state *) compl); }else if (compl->flags &CQE_FLAGS_COMPLETED_MASK ) { - status =be_mcc_compl_process (adapter, compl); + *status =be_mcc_compl_process (adapter, compl);atomic_dec (&adapter->mcc_obj.q.used); }be_mcc_compl_use (compl); num++; } -if (num) -be_cq_notify (adapter, adapter->mcc_obj.cq.id, true, num); -spin_unlock_bh (&adapter->mcc_cq_lock); -return status; +return num; }/* Wait till no more pending mcc requests are present */ static int be_mcc_wait_compl (struct be_adapter *adapter) {#define mcc_timeout 120000/* 12s timeout */ -int i, status; +int i, num, status =0 ; +struct be_mcc_obj *mcc_obj = &adapter->mcc_obj; +for (i =0 ; i < mcc_timeout; i++) { - status =be_process_mcc (adapter); -if (status) -return status; + num =be_process_mcc (adapter, &status); +if (num) +be_cq_notify (adapter, mcc_obj->cq.id, + true, num); -if (atomic_read (&adapter->mcc_obj.q.used) ==0 ) +if (atomic_read (&mcc_obj->q.used) ==0 )break ;udelay (100 ); }
@@ -151,7 +151,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)dev_err (&adapter->pdev->dev,"mccq poll timed out\n" );return -1 ; } -return 0 ; +return status; }/* Notify MCC requests and wait for completion */
drivers/net/benet/be_cmds.h +1 -1
@@ -907,7 +907,7 @@ extern int be_cmd_get_flow_control(struct be_adapter *adapter,extern int be_cmd_query_fw_cfg (struct be_adapter *adapter,u32 *port_num,u32 *cap);extern int be_cmd_reset_function (struct be_adapter *adapter); -extern int be_process_mcc (struct be_adapter *adapter); +extern int be_process_mcc (struct be_adapter *adapter,int *status);extern int be_cmd_set_beacon_state (struct be_adapter *adapter,u8 port_num,u8 beacon,u8 status,u8 state); extern int be_cmd_get_beacon_state(struct be_adapter *adapter,
drivers/net/benet/be_main.c +22 -23
69 lines not on this page · raw message
Signature · 1 line
1.6.3.3
David Miller
maintainerFrom: Sathya Perla <[email protected]>
Date: Thu, 25 Feb 2010 17:25:16 +0530
Quoted 7 lines
In tx/mcc polling,
napi_complete()is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napicomplete()after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).Pls apply to net-2.6.
net-2.6 is closed, 2.6.33 has been released.
Quoted 1 line
Signed-off-by Sathya Perla <[email protected]>
This patch does not apply to net-next-2.6
Quoted 9 lines · David Miller
From: Sathya Perla <[email protected]>
Date: Thu, 25 Feb 2010 17:25:16 +0530Quoted 6 lines
In tx/mcc polling,
napi_complete()is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napicomplete()after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).
Quoted 7 lines
Quoted 1 line
Pls apply to net-2.6.
net-2.6 is closed, 2.6.33 has been released.
Quoted 1 line
Signed-off-by Sathya Perla <[email protected]>This patch does not apply to net-next-2.6
I've re-done the patch for net-next-2.6: Pls apply; thanks!
In tx/mcc polling, napi_complete() is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napi complete() after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).
--- drivers/net/benet/be_cmds.c | 26 +++++++++++----------- drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_main.c | 47 +++++++++++++++++++++---------------------- 3 files changed, 37 insertions(+), 38 deletions(-)
drivers/net/benet/be_cmds.c +13 -13
@@ -119,10 +119,10 @@ void be_async_mcc_disable(struct be_adapter *adapter) adapter->mcc_obj.rearm_cq = false; } -int be_process_mcc (struct be_adapter *adapter) +int be_process_mcc (struct be_adapter *adapter,int *status) {struct be_mcc_compl *compl; -int num =0 , status =0 ; +int num =0 ;struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;spin_lock_bh (&adapter->mcc_cq_lock);
@@ -135,31 +135,31 @@ int be_process_mcc(struct be_adapter *adapter)be_async_link_state_process (adapter, (struct be_async_event_link_state *) compl); }else if (compl->flags &CQE_FLAGS_COMPLETED_MASK ) { - status =be_mcc_compl_process (adapter, compl); + *status =be_mcc_compl_process (adapter, compl);atomic_dec (&mcc_obj->q.used); }be_mcc_compl_use (compl); num++; } -if (num) -be_cq_notify (adapter, mcc_obj->cq.id, mcc_obj->rearm_cq, num); -spin_unlock_bh (&adapter->mcc_cq_lock); -return status; +return num; }/* Wait till no more pending mcc requests are present */ static int be_mcc_wait_compl (struct be_adapter *adapter) {#define mcc_timeout 120000/* 12s timeout */ -int i, status; +int i, num, status =0 ; +struct be_mcc_obj *mcc_obj = &adapter->mcc_obj; +for (i =0 ; i < mcc_timeout; i++) { - status =be_process_mcc (adapter); -if (status) -return status; + num =be_process_mcc (adapter, &status); +if (num) +be_cq_notify (adapter, mcc_obj->cq.id, + mcc_obj->rearm_cq, num); -if (atomic_read (&adapter->mcc_obj.q.used) ==0 ) +if (atomic_read (&mcc_obj->q.used) ==0 )break ;udelay (100 ); }
@@ -167,7 +167,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)dev_err (&adapter->pdev->dev,"mccq poll timed out\n" );return -1 ; } -return 0 ; +return status; }/* Notify MCC requests and wait for completion */
drivers/net/benet/be_cmds.h +1 -1
@@ -920,7 +920,7 @@ extern int be_cmd_get_flow_control(struct be_adapter *adapter,extern int be_cmd_query_fw_cfg (struct be_adapter *adapter,u32 *port_num,u32 *cap);extern int be_cmd_reset_function (struct be_adapter *adapter); -extern int be_process_mcc (struct be_adapter *adapter); +extern int be_process_mcc (struct be_adapter *adapter,int *status);extern int be_cmd_set_beacon_state (struct be_adapter *adapter,u8 port_num,u8 beacon,u8 status,u8 state); extern int be_cmd_get_beacon_state(struct be_adapter *adapter,
drivers/net/benet/be_main.c +23 -24
77 lines not on this page · raw message
Signature · 1 line
1.6.3.3
David Miller
maintainerFrom: Sathya Perla <[email protected]>
Date: Tue, 2 Mar 2010 12:06:15 +0530
Quoted 20 lines · David Miller
Quoted 9 lines
From: Sathya Perla <[email protected]>
Date: Thu, 25 Feb 2010 17:25:16 +0530Quoted 6 lines
In tx/mcc polling,
napi_complete()is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napicomplete()after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).Quoted 7 lines
Quoted 1 line
Pls apply to net-2.6.
net-2.6 is closed, 2.6.33 has been released.
Quoted 1 line
Signed-off-by Sathya Perla <[email protected]>This patch does not apply to net-next-2.6
I've re-done the patch for net-next-2.6: Pls apply; thanks!
Quoted 7 lines
In tx/mcc polling,
napi_complete()is being incorrectly called before reaping tx completions. This can cause tx compl processing to be scheduled on another cpu concurrently which can result in a panic. This if fixed by calling napicomplete()after tx/mcc compl processing but before re-enabling interrupts (via a cq notify).Signed-off-by Sathya Perla <[email protected]>
Applied thanks.