Skip to content

Commit d0d006a

Browse files
Denis Kirjanovdavem330
authored andcommitted
be2net: disable bh with spin_lock in be_process_mcc
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>
1 parent debea2c commit d0d006a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

drivers/net/ethernet/emulex/benet/be_cmds.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ int be_process_mcc(struct be_adapter *adapter)
550550
int num = 0, status = 0;
551551
struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
552552

553-
spin_lock(&adapter->mcc_cq_lock);
553+
spin_lock_bh(&adapter->mcc_cq_lock);
554554

555555
while ((compl = be_mcc_compl_get(adapter))) {
556556
if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
@@ -566,7 +566,7 @@ int be_process_mcc(struct be_adapter *adapter)
566566
if (num)
567567
be_cq_notify(adapter, mcc_obj->cq.id, mcc_obj->rearm_cq, num);
568568

569-
spin_unlock(&adapter->mcc_cq_lock);
569+
spin_unlock_bh(&adapter->mcc_cq_lock);
570570
return status;
571571
}
572572

@@ -581,9 +581,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
581581
if (be_check_error(adapter, BE_ERROR_ANY))
582582
return -EIO;
583583

584-
local_bh_disable();
585584
status = be_process_mcc(adapter);
586-
local_bh_enable();
587585

588586
if (atomic_read(&mcc_obj->q.used) == 0)
589587
break;

drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5630,9 +5630,7 @@ static void be_worker(struct work_struct *work)
56305630
* mcc completions
56315631
*/
56325632
if (!netif_running(adapter->netdev)) {
5633-
local_bh_disable();
56345633
be_process_mcc(adapter);
5635-
local_bh_enable();
56365634
goto reschedule;
56375635
}
56385636

0 commit comments

Comments
 (0)