Commit 9fe278f4 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Move log messages before issuing command to firmware 



There is a probability that the SRB structure might have been released by the
time the debug log message dereferences it.  This patch moved the log messages
before the command is issued to the firmware to prevent unknown behavior and
kernel crash

Fixes: 726b8548 ("qla2xxx: Add framework for async fabric discovery")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@cavium.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bcc71cc3

drivers/scsi/qla2xxx/qla_gs.c

+8 −7
Original line number Diff line number Diff line
@@ -3124,15 +3124,15 @@ int qla24xx_async_gpsc(scsi_qla_host_t *vha, fc_port_t *fcport) 
	sp->u.iocb_cmd.timeout = qla2x00_async_iocb_timeout;

	sp->done = qla24xx_async_gpsc_sp_done;



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_disc, vha, 0x205e,

	    "Async-%s %8phC hdl=%x loopid=%x portid=%02x%02x%02x.\n",

	    sp->name, fcport->port_name, sp->handle,

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

	    fcport->d_id.b.area, fcport->d_id.b.al_pa);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;

	return rval;



done_free_sp:
@@ -3450,13 +3450,14 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id) 
	sp->u.iocb_cmd.timeout = qla2x00_async_iocb_timeout;

	sp->done = qla2x00_async_gpnid_sp_done;



	ql_dbg(ql_dbg_disc, vha, 0x2067,

	    "Async-%s hdl=%x ID %3phC.\n", sp->name,

	    sp->handle, ct_req->req.port_id.port_id);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_disc, vha, 0x2067,

	    "Async-%s hdl=%x ID %3phC.\n", sp->name,

	    sp->handle, ct_req->req.port_id.port_id);

	return rval;



done_free_sp:

drivers/scsi/qla2xxx/qla_init.c

+25 −23
Original line number Diff line number Diff line
@@ -247,6 +247,12 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, 


	}



	ql_dbg(ql_dbg_disc, vha, 0x2072,

	    "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "

		"retries=%d.\n", fcport->port_name, sp->handle, fcport->loop_id,

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

	    fcport->login_retry);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS) {

		fcport->flags |= FCF_LOGIN_NEEDED;
@@ -254,11 +260,6 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, 
		goto done_free_sp;

	}



	ql_dbg(ql_dbg_disc, vha, 0x2072,

	    "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "

		"retries=%d.\n", fcport->port_name, sp->handle, fcport->loop_id,

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

	    fcport->login_retry);

	return rval;



done_free_sp:
@@ -303,15 +304,16 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport) 
	qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);



	sp->done = qla2x00_async_logout_sp_done;

	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_disc, vha, 0x2070,

	    "Async-logout - hdl=%x loop-id=%x portid=%02x%02x%02x %8phC.\n",

	    sp->handle, fcport->loop_id, fcport->d_id.b.domain,

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

		fcport->port_name);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;

	return rval;



done_free_sp:
@@ -491,13 +493,15 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport, 
	sp->done = qla2x00_async_adisc_sp_done;

	if (data[1] & QLA_LOGIO_LOGIN_RETRIED)

		lio->u.logio.flags |= SRB_LOGIN_RETRIED;

	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_disc, vha, 0x206f,

	    "Async-adisc - hdl=%x loopid=%x portid=%06x %8phC.\n",

	    sp->handle, fcport->loop_id, fcport->d_id.b24, fcport->port_name);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	return rval;



done_free_sp:
@@ -1156,14 +1160,13 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt) 


	sp->done = qla24xx_async_gpdb_sp_done;



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_disc, vha, 0x20dc,

	    "Async-%s %8phC hndl %x opt %x\n",

	    sp->name, fcport->port_name, sp->handle, opt);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;

	return rval;



done_free_sp:
@@ -1761,15 +1764,14 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, 
	tm_iocb->u.tmf.data = tag;

	sp->done = qla2x00_tmf_sp_done;



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_taskm, vha, 0x802f,

	    "Async-tmf hdl=%x loop-id=%x portid=%02x%02x%02x.\n",

	    sp->handle, fcport->loop_id, fcport->d_id.b.domain,

	    fcport->d_id.b.area, fcport->d_id.b.al_pa);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;

	wait_for_completion(&tm_iocb->u.tmf.comp);



	rval = tm_iocb->u.tmf.data;
@@ -1850,14 +1852,14 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) 


	sp->done = qla24xx_abort_sp_done;



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	ql_dbg(ql_dbg_async, vha, 0x507c,

	    "Abort command issued - hdl=%x, type=%x\n",

	    cmd_sp->handle, cmd_sp->type);



	rval = qla2x00_start_sp(sp);

	if (rval != QLA_SUCCESS)

		goto done_free_sp;



	if (wait) {

		wait_for_completion(&abt_iocb->u.abt.comp);

		rval = abt_iocb->u.abt.comp_status == CS_COMPLETE ?

CRA Git | Maintained and supported by SUSTech CRA and CCSE