Commit 6a45c8e1 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix disk failure to rediscover 

User experienced some of the LUN failed to get rediscovered after long
cable pull test. The issue is triggered by a race condition between driver
setting session online state vs starting the LUN scan process at the same
time. Current code set the online state after notifying the session is
available. In this case, trigger to start the LUN scan process happened
before driver could set the session in online state.  LUN scan ends up with
failure due to the session online check was failing.

Set the online state before reporting of the availability of the session.

Link: https://lore.kernel.org/r/20220310092604.22950-3-njavali@marvell.com


Fixes: aecf0434 ("scsi: qla2xxx: Fix Remote port registration")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 58ca5999

drivers/scsi/qla2xxx/qla_init.c

+3 −2
Original line number Diff line number Diff line
@@ -5758,6 +5758,8 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) 
	if (atomic_read(&fcport->state) == FCS_ONLINE)

		return;



	qla2x00_set_fcport_state(fcport, FCS_ONLINE);



	rport_ids.node_name = wwn_to_u64(fcport->node_name);

	rport_ids.port_name = wwn_to_u64(fcport->port_name);

	rport_ids.port_id = fcport->d_id.b.domain << 16 |
@@ -5858,6 +5860,7 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) 
		qla2x00_reg_remote_port(vha, fcport);

		break;

	case MODE_TARGET:

		qla2x00_set_fcport_state(fcport, FCS_ONLINE);

		if (!vha->vha_tgt.qla_tgt->tgt_stop &&

			!vha->vha_tgt.qla_tgt->tgt_stopped)

			qlt_fc_port_added(vha, fcport);
@@ -5875,8 +5878,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) 
	if (NVME_TARGET(vha->hw, fcport))

		qla_nvme_register_remote(vha, fcport);



	qla2x00_set_fcport_state(fcport, FCS_ONLINE);



	if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {

		if (fcport->id_changed) {

			fcport->id_changed = 0;

drivers/scsi/qla2xxx/qla_nvme.c

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) 
		(fcport->nvme_flag & NVME_FLAG_REGISTERED))

		return 0;



	if (atomic_read(&fcport->state) == FCS_ONLINE)

		return 0;



	qla2x00_set_fcport_state(fcport, FCS_ONLINE);



	fcport->nvme_flag &= ~NVME_FLAG_RESETTING;



	memset(&req, 0, sizeof(struct nvme_fc_port_info));