iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

be2net: disable bh with spin_lock in be_process_mcc

Browse Source 
be_process_mcc() is invoked in 3 different places and
always with BHs disabled except the be_poll function
but since it's invoked from softirq with BHs
disabled it won't hurt.

v1->v2: added explanation to the patch
v2->v3: add a missing call from be_cmds.c

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis Kirjanov 2019-08-06 12:51:11 +02:00 committed by David S. Miller
parent debea2cd31
commit d0d006a43e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/emulex/benet/be_cmds.c
View File

@ -550,7 +550,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(&adapter->mcc_cq_lock); spin_lock_bh(&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) {
@ -566,7 +566,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(&adapter->mcc_cq_lock); spin_unlock_bh(&adapter->mcc_cq_lock);
return status; return status;
} }
@ -581,9 +581,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
if (be_check_error(adapter, BE_ERROR_ANY)) if (be_check_error(adapter, BE_ERROR_ANY))
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;

2
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -5630,9 +5630,7 @@ static void be_worker(struct work_struct *work)
* 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;
} }