Commit b0dcce74 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen

scsi: qla2xxx: Fix abort command deadlock due to spinlock

Original code acquires hardware_lock to add Abort IOCB onto driver
request queue for processing. However, abort_command() will also acquire
hardware lock to look up sp pointer before issuing abort IOCB command
resulting into a deadlock. This patch safely removes the possible
deadlock scenario by removing extra spinlock.

Fixes: 6eb54715 ("qla2xxx: Added interface to send explicit LOGO.")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 23c64559
...@@ -2394,7 +2394,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) ...@@ -2394,7 +2394,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data)
struct scsi_qla_host *vha = sp->vha; struct scsi_qla_host *vha = sp->vha;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct srb_iocb *lio = &sp->u.iocb_cmd; struct srb_iocb *lio = &sp->u.iocb_cmd;
unsigned long flags = 0;
ql_dbg(ql_dbg_io, vha, 0x3069, ql_dbg(ql_dbg_io, vha, 0x3069,
"%s Timeout, hdl=%x, portid=%02x%02x%02x\n", "%s Timeout, hdl=%x, portid=%02x%02x%02x\n",
...@@ -2402,7 +2401,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) ...@@ -2402,7 +2401,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data)
fcport->d_id.b.al_pa); fcport->d_id.b.al_pa);
/* Abort the exchange */ /* Abort the exchange */
spin_lock_irqsave(&ha->hardware_lock, flags);
if (ha->isp_ops->abort_command(sp)) { if (ha->isp_ops->abort_command(sp)) {
ql_dbg(ql_dbg_io, vha, 0x3070, ql_dbg(ql_dbg_io, vha, 0x3070,
"mbx abort_command failed.\n"); "mbx abort_command failed.\n");
...@@ -2410,7 +2408,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data) ...@@ -2410,7 +2408,6 @@ qla2x00_els_dcmd_iocb_timeout(void *data)
ql_dbg(ql_dbg_io, vha, 0x3071, ql_dbg(ql_dbg_io, vha, 0x3071,
"mbx abort_command success.\n"); "mbx abort_command success.\n");
} }
spin_unlock_irqrestore(&ha->hardware_lock, flags);
complete(&lio->u.els_logo.comp); complete(&lio->u.els_logo.comp);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment