sugar/linux
1
0
Fork 0
Code Activity

scsi: qla2xxx: Fix FC-NVMe IO abort during driver reset

Browse Source 
Signed-off-by: Darren Trapp <darren.trapp@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Darren Trapp
2018-03-20 23:09:38 -07:00
committed by Martin K. Petersen
parent 1cbc0efcd9
commit 623ee824e5
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/qla2xxx/qla_nvme.c
View File

@@ -489,6 +489,9 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
vha = fcport->vha;
if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
return rval;
/*
* If we know the dev is going away while the transport is still sending
* IO's return busy back to stall the IO Q. This happens when the
@@ -597,14 +600,18 @@ static int qla_nvme_wait_on_command(srb_t *sp)
return ret;
}
void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp)
void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp, int res)
{
int rval;
rval = ha->isp_ops->abort_command(sp);
if (!rval && !qla_nvme_wait_on_command(sp))
ql_log(ql_log_warn, NULL, 0x2112,
"nvme_wait_on_comand timed out waiting on sp=%p\n", sp);
if (!test_bit(ABORT_ISP_ACTIVE, &sp->vha->dpc_flags)) {
rval = ha->isp_ops->abort_command(sp);
if (!rval && !qla_nvme_wait_on_command(sp))
ql_log(ql_log_warn, NULL, 0x2112,
"timed out waiting on sp=%p\n", sp);
} else {
sp->done(sp, res);
}
}
static void qla_nvme_unregister_remote_port(struct work_struct *work)