Re: [PATCH 7/8] qla2xxx: Stall mid-layer error handlers while rport is blocked.

James Smart
2006-10-02T19:26:23Z

Given this is the 3rd instance of this (qla2xxxx, lpfc, mpt fusion),
we should either:

- Fix the error handler. (but we all know this is a lot of work,
of which none of us have the time to do, nor expect it to
be complete in time for our next distro delivery).
or
- Write a transport wrapper function that our eh functions invoke.
The wrapper would perform the stall and validate port state.

-- james s

Andrew Vasquez wrote:
> Stall error handler if attempting recovery while an rport is
> blocked. This avoids device offline scenarios due to errors in
> the error handler.
>
> Reference implementation from lpfc/mptfc.
>
> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 25 +++++++++++++++++++++++++
> 1 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index cdc7fca..3ba8c23 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -589,6 +589,23 @@ qla2x00_wait_for_loop_ready(scsi_qla_hos
> return (return_status);
> }
>
> +static void
> +qla2x00_block_error_handler(struct scsi_cmnd *cmnd)
> +{
> + struct Scsi_Host *shost = cmnd->device->host;
> + struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
> + unsigned long flags;
> +
> + spin_lock_irqsave(shost->host_lock, flags);
> + while (rport->port_state == FC_PORTSTATE_BLOCKED) {
> + spin_unlock_irqrestore(shost->host_lock, flags);
> + msleep(1000);
> + spin_lock_irqsave(shost->host_lock, flags);
> + }
> + spin_unlock_irqrestore(shost->host_lock, flags);
> + return;
> +}
> +
> /**************************************************************************
> * qla2xxx_eh_abort
> *
> @@ -615,6 +632,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
> unsigned long flags;
> int wait = 0;
>
> + qla2x00_block_error_handler(cmd);
> +
> if (!CMD_SP(cmd))
> return SUCCESS;
>
> @@ -748,6 +767,8 @@ qla2xxx_eh_device_reset(struct scsi_cmnd
> unsigned int id, lun;
> unsigned long serial;
>
> + qla2x00_block_error_handler(cmd);
> +
> ret = FAILED;
>
> id = cmd->device->id;
> @@ -877,6 +898,8 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *c
> unsigned int id, lun;
> unsigned long serial;
>
> + qla2x00_block_error_handler(cmd);
> +
> ret = FAILED;
>
> id = cmd->device->id;
> @@ -936,6 +959,8 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *
> unsigned int id, lun;
> unsigned long serial;
>
> + qla2x00_block_error_handler(cmd);
> +
> ret = FAILED;
>
> id = cmd->device->id;