leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure

Browse Source 
Current code will send PRLI with FC-NVMe bit set for the targets which
support only FCP. This may result into issue with targets which do not
understand NVMe and will go into a strange state. This patch would restart
the login process by going back to PLOGI state. The PLOGI state will force
the target to respond to correct PRLI request.

Fixes: c76ae845ea ("scsi: qla2xxx: Add error handling for PLOGI ELS passthrough")
Cc: stable@vger.kernel.org # 5.4
Link: https://lore.kernel.org/r/20191105150657.8092-2-hmadhani@marvell.com
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Quinn Tran 2019-11-05 07:06:50 -08:00 committed by Martin K. Petersen
parent c8510d2403
commit 983f127603
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/scsi/qla2xxx/qla_init.c
View File

@ -1864,42 +1864,21 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
* FCP/NVMe port * FCP/NVMe port
*/ */
if (NVME_FCP_TARGET(ea->fcport)) { if (NVME_FCP_TARGET(ea->fcport)) {
if (vha->hw->fc4_type_priority == FC4_PRIORITY_NVME)
ea->fcport->fc4_type &= ~FS_FC4TYPE_NVME;
else
ea->fcport->fc4_type &= ~FS_FC4TYPE_FCP;
ql_dbg(ql_dbg_disc, vha, 0x2118, ql_dbg(ql_dbg_disc, vha, 0x2118,
"%s %d %8phC post %s prli\n", "%s %d %8phC post %s prli\n",
__func__, __LINE__, ea->fcport->port_name, __func__, __LINE__, ea->fcport->port_name,
(ea->fcport->fc4_type & FS_FC4TYPE_NVME) ? (ea->fcport->fc4_type & FS_FC4TYPE_NVME) ?
"NVMe" : "FCP"); "NVMe" : "FCP");
qla24xx_post_prli_work(vha, ea->fcport); if (vha->hw->fc4_type_priority == FC4_PRIORITY_NVME)
break; ea->fcport->fc4_type &= ~FS_FC4TYPE_NVME;
else
ea->fcport->fc4_type &= ~FS_FC4TYPE_FCP;
} }
/* at this point both PRLI NVME & PRLI FCP failed */
if (N2N_TOPO(vha->hw)) {
if (ea->fcport->n2n_link_reset_cnt < 3) {
ea->fcport->n2n_link_reset_cnt++;
/*
* remote port is not sending Plogi. Reset
* link to kick start his state machine
*/
set_bit(N2N_LINK_RESET, &vha->dpc_flags);
} else {
ql_log(ql_log_warn, vha, 0x2119,
"%s %d %8phC Unable to reconnect\n",
__func__, __LINE__, ea->fcport->port_name);
}
} else {
/*
* switch connect. login failed. Take connection
* down and allow relogin to retrigger
*/
ea->fcport->flags &= ~FCF_ASYNC_SENT; ea->fcport->flags &= ~FCF_ASYNC_SENT;
ea->fcport->keep_nport_handle = 0; ea->fcport->keep_nport_handle = 0;
ea->fcport->logout_on_delete = 1;
qlt_schedule_sess_for_deletion(ea->fcport); qlt_schedule_sess_for_deletion(ea->fcport);
}
break; break;
} }
} }

6
drivers/scsi/qla2xxx/qla_iocb.c
View File

@ -2764,6 +2764,7 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res)
ea.sp = sp; ea.sp = sp;
qla24xx_handle_plogi_done_event(vha, &ea); qla24xx_handle_plogi_done_event(vha, &ea);
break; break;
case CS_IOCB_ERROR: case CS_IOCB_ERROR:
switch (fw_status[1]) { switch (fw_status[1]) {
case LSC_SCODE_PORTID_USED: case LSC_SCODE_PORTID_USED:
@ -2834,6 +2835,7 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res)
fw_status[0], fw_status[1], fw_status[2]); fw_status[0], fw_status[1], fw_status[2]);
fcport->flags &= ~FCF_ASYNC_SENT; fcport->flags &= ~FCF_ASYNC_SENT;
fcport->disc_state = DSC_LOGIN_FAILED;
set_bit(RELOGIN_NEEDED, &vha->dpc_flags); set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
break; break;
} }
@ -2846,6 +2848,7 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res)
fw_status[0], fw_status[1], fw_status[2]); fw_status[0], fw_status[1], fw_status[2]);
sp->fcport->flags &= ~FCF_ASYNC_SENT; sp->fcport->flags &= ~FCF_ASYNC_SENT;
sp->fcport->disc_state = DSC_LOGIN_FAILED;
set_bit(RELOGIN_NEEDED, &vha->dpc_flags); set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
break; break;
} }
@ -2881,11 +2884,12 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,
return -ENOMEM; return -ENOMEM;
} }
fcport->flags |= FCF_ASYNC_SENT;
fcport->disc_state = DSC_LOGIN_PEND;
elsio = &sp->u.iocb_cmd; elsio = &sp->u.iocb_cmd;
ql_dbg(ql_dbg_io, vha, 0x3073, ql_dbg(ql_dbg_io, vha, 0x3073,
"Enter: PLOGI portid=%06x\n", fcport->d_id.b24); "Enter: PLOGI portid=%06x\n", fcport->d_id.b24);
fcport->flags |= FCF_ASYNC_SENT;
sp->type = SRB_ELS_DCMD; sp->type = SRB_ELS_DCMD;
sp->name = "ELS_DCMD"; sp->name = "ELS_DCMD";
sp->fcport = fcport; sp->fcport = fcport;