Commit 3c75ad1d authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Remove defer flag to indicate immeadiate port loss 

During cable pull test case, if the port is disconnected for time larger
than devloss timeout, driver does not mark path offline.  In such case,
instead of notifying SCSI-ML of loop down, driver goes into endless loop of
device relogin because defer flag is set.

With newer handling of device relogin in driver discovery, defer flag is
now redundant. This patch removes defer flag and cleans up code handling
port lost indication to SCSI-ML.

Link: https://lore.kernel.org/r/20191217220617.28084-2-hmadhani@marvell.com


Signed-off-by: default avatarQuinn Tran <qtran@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d8dd7d76

drivers/scsi/qla2xxx/qla_gbl.h

+2 −2
Original line number Diff line number Diff line
@@ -253,8 +253,8 @@ extern scsi_qla_host_t *qla24xx_create_vhost(struct fc_vport *); 
extern void qla2x00_sp_free_dma(srb_t *sp);

extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);



extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);

extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);

extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int);

extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *);



extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_init.c

+9 −9
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ qla2x00_async_prlo_done(struct scsi_qla_host *vha, fc_port_t *fcport, 
	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	/* Don't re-login in target mode */

	if (!fcport->tgt_session)

		qla2x00_mark_device_lost(vha, fcport, 1, 0);

		qla2x00_mark_device_lost(vha, fcport, 1);

	qlt_logo_completion_handler(fcport, data[0]);

}
@@ -2000,7 +2000,7 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) 
		if (ea->data[1] & QLA_LOGIO_LOGIN_RETRIED)

			set_bit(RELOGIN_NEEDED, &vha->dpc_flags);

		else

			qla2x00_mark_device_lost(vha, ea->fcport, 1, 0);

			qla2x00_mark_device_lost(vha, ea->fcport, 1);

		break;

	case MBS_LOOP_ID_USED:

		/* data[1] = IO PARAM 1 = nport ID  */
@@ -5230,7 +5230,7 @@ skip_login: 
			    qla_ini_mode_enabled(vha)) &&

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

				qla2x00_mark_device_lost(vha, fcport,

					ql2xplogiabsentdevice, 0);

					ql2xplogiabsentdevice);

				if (fcport->loop_id != FC_NO_LOOP_ID &&

				    (fcport->flags & FCF_FCP2_DEVICE) == 0 &&

				    fcport->port_type != FCT_INITIATOR &&
@@ -5905,7 +5905,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha) 
			    qla_ini_mode_enabled(vha)) &&

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

				qla2x00_mark_device_lost(vha, fcport,

					ql2xplogiabsentdevice, 0);

					ql2xplogiabsentdevice);

				if (fcport->loop_id != FC_NO_LOOP_ID &&

				    (fcport->flags & FCF_FCP2_DEVICE) == 0 &&

				    fcport->port_type != FCT_INITIATOR &&
@@ -6071,7 +6071,7 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport, 
			ha->isp_ops->fabric_logout(vha, fcport->loop_id,

			    fcport->d_id.b.domain, fcport->d_id.b.area,

			    fcport->d_id.b.al_pa);

			qla2x00_mark_device_lost(vha, fcport, 1, 0);

			qla2x00_mark_device_lost(vha, fcport, 1);



			rval = 1;

			break;
@@ -6585,9 +6585,9 @@ qla2x00_quiesce_io(scsi_qla_host_t *vha) 
	atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);

	if (atomic_read(&vha->loop_state) != LOOP_DOWN) {

		atomic_set(&vha->loop_state, LOOP_DOWN);

		qla2x00_mark_all_devices_lost(vha, 0);

		qla2x00_mark_all_devices_lost(vha);

		list_for_each_entry(vp, &ha->vp_list, list)

			qla2x00_mark_all_devices_lost(vp, 0);

			qla2x00_mark_all_devices_lost(vp);

	} else {

		if (!atomic_read(&vha->loop_down_timer))

			atomic_set(&vha->loop_down_timer,
@@ -6663,14 +6663,14 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) 
	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);

	if (atomic_read(&vha->loop_state) != LOOP_DOWN) {

		atomic_set(&vha->loop_state, LOOP_DOWN);

		qla2x00_mark_all_devices_lost(vha, 0);

		qla2x00_mark_all_devices_lost(vha);



		spin_lock_irqsave(&ha->vport_slock, flags);

		list_for_each_entry(vp, &ha->vp_list, list) {

			atomic_inc(&vp->vref_count);

			spin_unlock_irqrestore(&ha->vport_slock, flags);



			qla2x00_mark_all_devices_lost(vp, 0);

			qla2x00_mark_all_devices_lost(vp);



			spin_lock_irqsave(&ha->vport_slock, flags);

			atomic_dec(&vp->vref_count);

drivers/scsi/qla2xxx/qla_isr.c

+7 −9
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ skip_rio: 
		if (atomic_read(&vha->loop_state) != LOOP_DOWN) {

			atomic_set(&vha->loop_state, LOOP_DOWN);

			atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);

			qla2x00_mark_all_devices_lost(vha, 1);

			qla2x00_mark_all_devices_lost(vha);

		}



		if (vha->vp_idx) {
@@ -861,7 +861,7 @@ skip_rio: 
			}



			vha->device_flags |= DFLG_NO_CABLE;

			qla2x00_mark_all_devices_lost(vha, 1);

			qla2x00_mark_all_devices_lost(vha);

		}



		if (vha->vp_idx) {
@@ -881,7 +881,7 @@ skip_rio: 
		if (atomic_read(&vha->loop_state) != LOOP_DOWN) {

			atomic_set(&vha->loop_state, LOOP_DOWN);

			atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);

			qla2x00_mark_all_devices_lost(vha, 1);

			qla2x00_mark_all_devices_lost(vha);

		}



		if (vha->vp_idx) {
@@ -924,7 +924,7 @@ skip_rio: 
				atomic_set(&vha->loop_down_timer,

				    LOOP_DOWN_TIME);

			if (!N2N_TOPO(ha))

				qla2x00_mark_all_devices_lost(vha, 1);

				qla2x00_mark_all_devices_lost(vha);

		}



		if (vha->vp_idx) {
@@ -953,7 +953,7 @@ skip_rio: 
			if (!atomic_read(&vha->loop_down_timer))

				atomic_set(&vha->loop_down_timer,

				    LOOP_DOWN_TIME);

			qla2x00_mark_all_devices_lost(vha, 1);

			qla2x00_mark_all_devices_lost(vha);

		}



		if (vha->vp_idx) {
@@ -1022,7 +1022,6 @@ skip_rio: 
			    "Marking port lost loopid=%04x portid=%06x.\n",

			    fcport->loop_id, fcport->d_id.b24);

			if (qla_ini_mode_enabled(vha)) {

				qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);

				fcport->logout_on_delete = 0;

				qlt_schedule_sess_for_deletion(fcport);

			}
@@ -1034,14 +1033,14 @@ global_port_update: 
				atomic_set(&vha->loop_down_timer,

				    LOOP_DOWN_TIME);

				vha->device_flags |= DFLG_NO_CABLE;

				qla2x00_mark_all_devices_lost(vha, 1);

				qla2x00_mark_all_devices_lost(vha);

			}



			if (vha->vp_idx) {

				atomic_set(&vha->vp_state, VP_FAILED);

				fc_vport_set_state(vha->fc_vport,

				    FC_VPORT_FAILED);

				qla2x00_mark_all_devices_lost(vha, 1);

				qla2x00_mark_all_devices_lost(vha);

			}



			vha->flags.management_server_logged_in = 0;
@@ -2745,7 +2744,6 @@ check_scsi_status: 
				port_state_str[FCS_ONLINE],

				comp_status);



			qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);

			qlt_schedule_sess_for_deletion(fcport);

		}

drivers/scsi/qla2xxx/qla_mid.c

+3 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha) 
		    "Marking port dead, loop_id=0x%04x : %x.\n",

		    fcport->loop_id, fcport->vha->vp_idx);



		qla2x00_mark_device_lost(vha, fcport, 0, 0);

		qla2x00_mark_device_lost(vha, fcport, 0);

		qla2x00_set_fcport_state(fcport, FCS_UNCONFIGURED);

	}

}
@@ -167,7 +167,7 @@ qla24xx_disable_vp(scsi_qla_host_t *vha) 
	list_for_each_entry(fcport, &vha->vp_fcports, list)

		fcport->logout_on_delete = 0;



	qla2x00_mark_all_devices_lost(vha, 0);

	qla2x00_mark_all_devices_lost(vha);



	/* Remove port id from vp target map */

	spin_lock_irqsave(&vha->hw->hardware_lock, flags);
@@ -327,7 +327,7 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha) 
	 */

	if (atomic_read(&vha->loop_state) != LOOP_DOWN) {

		atomic_set(&vha->loop_state, LOOP_DOWN);

		qla2x00_mark_all_devices_lost(vha, 0);

		qla2x00_mark_all_devices_lost(vha);

	} else {

		if (!atomic_read(&vha->loop_down_timer))

			atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);

drivers/scsi/qla2xxx/qla_mr.c

+5 −5
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ qlafx00_find_all_targets(scsi_qla_host_t *vha, 
				    " Existing TGT-ID %x did not get "

				    " offline event from firmware.\n",

				    fcport->old_tgt_id);

				qla2x00_mark_device_lost(vha, fcport, 0, 0);

				qla2x00_mark_device_lost(vha, fcport, 0);

				set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);

				kfree(new_fcport);

				return rval;
@@ -1274,7 +1274,7 @@ qlafx00_configure_all_targets(scsi_qla_host_t *vha) 


		if (atomic_read(&fcport->state) == FCS_DEVICE_LOST) {

			if (fcport->port_type != FCT_INITIATOR)

				qla2x00_mark_device_lost(vha, fcport, 0, 0);

				qla2x00_mark_device_lost(vha, fcport, 0);

		}

	}
@@ -1706,7 +1706,7 @@ qlafx00_tgt_detach(struct scsi_qla_host *vha, int tgt_id) 
	if (!fcport)

		return;



	qla2x00_mark_device_lost(vha, fcport, 0, 0);

	qla2x00_mark_device_lost(vha, fcport, 0);



	return;

}
@@ -1740,7 +1740,7 @@ qlafx00_process_aen(struct scsi_qla_host *vha, struct qla_work_evt *evt) 
				set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);

			} else if (evt->u.aenfx.mbx[2] == 2) {

				vha->device_flags |= DFLG_NO_CABLE;

				qla2x00_mark_all_devices_lost(vha, 1);

				qla2x00_mark_all_devices_lost(vha);

			}

		}

		break;
@@ -2513,7 +2513,7 @@ check_scsi_status: 
		    atomic_read(&fcport->state));



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

			qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);

			qla2x00_mark_device_lost(fcport->vha, fcport, 1);

		break;



	case CS_ABORTED:

CRA Git | Maintained and supported by SUSTech CRA and CCSE