Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa83e658 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: ensure async flags are reset correctly 



The fcport flags FCF_ASYNC_ACTIVE and FCF_ASYNC_SENT are used to
throttle the state machine, so we need to ensure to always set and unset
them correctly. Not doing so will lead to the state machine getting
confused and no login attempt into remote ports.

Cc: Quinn Tran <quinn.tran@cavium.com>
Cc: Himanshu Madhani <himanshu.madhani@cavium.com>
Fixes: 3dbec59b ("scsi: qla2xxx: Prevent multiple active discovery commands per session")
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 07ea4b60

drivers/scsi/qla2xxx/qla_gs.c

+2 −0
Original line number Diff line number Diff line
@@ -3179,6 +3179,7 @@ int qla24xx_async_gidpn(scsi_qla_host_t *vha, fc_port_t *fcport) 
	sp->free(sp);

	fcport->flags &= ~FCF_ASYNC_SENT;

done:

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	return rval;

}
@@ -3370,6 +3371,7 @@ int qla24xx_async_gpsc(scsi_qla_host_t *vha, fc_port_t *fcport) 
	sp->free(sp);

	fcport->flags &= ~FCF_ASYNC_SENT;

done:

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	return rval;

}

drivers/scsi/qla2xxx/qla_init.c

+10 −3
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, 
	sp->free(sp);

	fcport->flags &= ~FCF_ASYNC_SENT;

done:

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	return rval;

}
@@ -263,7 +264,7 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport) 
done_free_sp:

	sp->free(sp);

done:

	fcport->flags &= ~FCF_ASYNC_SENT;

	fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

	return rval;

}
@@ -271,6 +272,7 @@ void 
qla2x00_async_prlo_done(struct scsi_qla_host *vha, fc_port_t *fcport,

    uint16_t *data)

{

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

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

	if (!fcport->tgt_session)

		qla2x00_mark_device_lost(vha, fcport, 1, 0);
@@ -284,6 +286,7 @@ qla2x00_async_prlo_sp_done(void *s, int res) 
	struct srb_iocb *lio = &sp->u.iocb_cmd;

	struct scsi_qla_host *vha = sp->vha;



	sp->fcport->flags &= ~FCF_ASYNC_ACTIVE;

	if (!test_bit(UNLOADING, &vha->dpc_flags))

		qla2x00_post_async_prlo_done_work(sp->fcport->vha, sp->fcport,

		    lio->u.logio.data);
@@ -322,6 +325,7 @@ qla2x00_async_prlo(struct scsi_qla_host *vha, fc_port_t *fcport) 
done_free_sp:

	sp->free(sp);

done:

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	return rval;

}
@@ -375,6 +379,8 @@ qla2x00_async_adisc_sp_done(void *ptr, int res) 
	    "Async done-%s res %x %8phC\n",

	    sp->name, res, sp->fcport->port_name);



	sp->fcport->flags &= ~FCF_ASYNC_SENT;



	memset(&ea, 0, sizeof(ea));

	ea.event = FCME_ADISC_DONE;

	ea.rc = res;
@@ -425,7 +431,7 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport, 
done_free_sp:

	sp->free(sp);

done:

	fcport->flags &= ~FCF_ASYNC_SENT;

	fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

	qla2x00_post_async_adisc_work(vha, fcport, data);

	return rval;

}
@@ -1799,6 +1805,7 @@ qla2x00_async_logout_done(struct scsi_qla_host *vha, fc_port_t *fcport, 
	qla2x00_mark_device_lost(vha, fcport, 1, 0);

	qlt_logo_completion_handler(fcport, data[0]);

	fcport->login_gen++;

	fcport->flags &= ~FCF_ASYNC_ACTIVE;

	return;

}
@@ -1806,6 +1813,7 @@ void 
qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport,

    uint16_t *data)

{

	fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

	if (data[0] == MBS_COMMAND_COMPLETE) {

		qla2x00_update_fcport(vha, fcport);
@@ -1813,7 +1821,6 @@ qla2x00_async_adisc_done(struct scsi_qla_host *vha, fc_port_t *fcport, 
	}



	/* Retry login. */

	fcport->flags &= ~FCF_ASYNC_SENT;

	if (data[1] & QLA_LOGIO_LOGIN_RETRIED)

		set_bit(RELOGIN_NEEDED, &vha->dpc_flags);

	else