Skip to content

Commit f10f582

Browse files
mikechristiemartinkpetersen
authored andcommitted
scsi: qedi: Fix ABBA deadlock in qedi_process_tmf_resp() and qedi_process_cmd_cleanup_resp()
This fixes a deadlock added with commit b40f389 ("scsi: qedi: Complete TMF works before disconnect") Bug description from Jia-Ju Bai: qedi_process_tmf_resp() spin_lock(&session->back_lock); --> Line 201 (Lock A) spin_lock(&qedi_conn->tmf_work_lock); --> Line 230 (Lock B) qedi_process_cmd_cleanup_resp() spin_lock_bh(&qedi_conn->tmf_work_lock); --> Line 752 (Lock B) spin_lock_bh(&conn->session->back_lock); --> Line 784 (Lock A) When qedi_process_tmf_resp() and qedi_process_cmd_cleanup_resp() are concurrently executed, the deadlock can occur. This patch fixes the deadlock by not holding the tmf_work_lock in qedi_process_cmd_cleanup_resp while holding the back_lock. The tmf_work_lock is only needed while we remove the tmf_work from the work_list. Link: https://lore.kernel.org/r/20220208185448.6206-1-michael.christie@oracle.com Fixes: b40f389 ("scsi: qedi: Complete TMF works before disconnect") Cc: Manish Rangankar <mrangankar@marvell.com> Cc: Nilesh Javali <njavali@marvell.com> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> Reported-by: Jia-Ju Bai <baijiaju1990@gmail.com> Signed-off-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 5852ed2 commit f10f582

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/qedi/qedi_fw.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,11 +771,10 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
771771
qedi_cmd->list_tmf_work = NULL;
772772
}
773773
}
774+
spin_unlock_bh(&qedi_conn->tmf_work_lock);
774775

775-
if (!found) {
776-
spin_unlock_bh(&qedi_conn->tmf_work_lock);
776+
if (!found)
777777
goto check_cleanup_reqs;
778-
}
779778

780779
QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,
781780
"TMF work, cqe->tid=0x%x, tmf flags=0x%x, cid=0x%x\n",
@@ -806,7 +805,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
806805
qedi_cmd->state = CLEANUP_RECV;
807806
unlock:
808807
spin_unlock_bh(&conn->session->back_lock);
809-
spin_unlock_bh(&qedi_conn->tmf_work_lock);
810808
wake_up_interruptible(&qedi_conn->wait_queue);
811809
return;
812810

0 commit comments

Comments
 (0)