Skip to content

Commit 6206b79

Browse files
justin-hedavem330
authored andcommitted
qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()
Liajian reported a bug_on hit on a ThunderX2 arm64 server with FastLinQ QL41000 ethernet controller: BUG: scheduling while atomic: kworker/0:4/531/0x00000200 [qed_probe:488()]hw prepare failed kernel BUG at mm/vmalloc.c:2355! Internal error: Oops - BUG: 0 [#1] SMP CPU: 0 PID: 531 Comm: kworker/0:4 Tainted: G W 5.4.0-77-generic #86-Ubuntu pstate: 00400009 (nzcv daif +PAN -UAO) Call trace: vunmap+0x4c/0x50 iounmap+0x48/0x58 qed_free_pci+0x60/0x80 [qed] qed_probe+0x35c/0x688 [qed] __qede_probe+0x88/0x5c8 [qede] qede_probe+0x60/0xe0 [qede] local_pci_probe+0x48/0xa0 work_for_cpu_fn+0x24/0x38 process_one_work+0x1d0/0x468 worker_thread+0x238/0x4e0 kthread+0xf0/0x118 ret_from_fork+0x10/0x18 In this case, qed_hw_prepare() returns error due to hw/fw error, but in theory work queue should be in process context instead of interrupt. The root cause might be the unpaired spin_{un}lock_bh() in _qed_mcp_cmd_and_union(), which causes botton half is disabled incorrectly. Reported-by: Lijian Zhang <[email protected]> Signed-off-by: Jia He <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 991e634 commit 6206b79

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

drivers/net/ethernet/qlogic/qed/qed_mcp.c

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,18 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
474474

475475
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
476476

477-
if (!qed_mcp_has_pending_cmd(p_hwfn))
477+
if (!qed_mcp_has_pending_cmd(p_hwfn)) {
478+
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
478479
break;
480+
}
479481

480482
rc = qed_mcp_update_pending_cmd(p_hwfn, p_ptt);
481-
if (!rc)
483+
if (!rc) {
484+
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
482485
break;
483-
else if (rc != -EAGAIN)
486+
} else if (rc != -EAGAIN) {
484487
goto err;
488+
}
485489

486490
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
487491

@@ -498,6 +502,8 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
498502
return -EAGAIN;
499503
}
500504

505+
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
506+
501507
/* Send the mailbox command */
502508
qed_mcp_reread_offsets(p_hwfn, p_ptt);
503509
seq_num = ++p_hwfn->mcp_info->drv_mb_seq;
@@ -524,14 +530,18 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
524530

525531
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
526532

527-
if (p_cmd_elem->b_is_completed)
533+
if (p_cmd_elem->b_is_completed) {
534+
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
528535
break;
536+
}
529537

530538
rc = qed_mcp_update_pending_cmd(p_hwfn, p_ptt);
531-
if (!rc)
539+
if (!rc) {
540+
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
532541
break;
533-
else if (rc != -EAGAIN)
542+
} else if (rc != -EAGAIN) {
534543
goto err;
544+
}
535545

536546
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
537547
} while (++cnt < max_retries);
@@ -554,6 +564,7 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
554564
return -EAGAIN;
555565
}
556566

567+
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
557568
qed_mcp_cmd_del_elem(p_hwfn, p_cmd_elem);
558569
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
559570

0 commit comments

Comments
 (0)