On Mon, 31 Mar 2014, Hannes Reinecke wrote:
> On 03/28/2014 06:49 PM, James Bottomley wrote:
> > The abort state is being stored persistently across commands, meaning if the
> > command times out a second time, the error handler thinks an abort is still
> > pending. Fix this by properly resetting the abort flag after the abort is
> > finished.
> >
> > Signed-off-by: James Bottomley <jbottom...@parallels.com>
> > ---
> > drivers/scsi/scsi_error.c | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> > index 771c16b..b9f3b07 100644
> > --- a/drivers/scsi/scsi_error.c
> > +++ b/drivers/scsi/scsi_error.c
> > @@ -869,10 +869,13 @@ static int scsi_try_bus_device_reset(struct scsi_cmnd
> > *scmd)
> >
> > static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt, struct
> > scsi_cmnd *scmd)
> > {
> > - if (!hostt->eh_abort_handler)
> > - return FAILED;
> > + int retval = FAILED;
> > +
> > + if (hostt->eh_abort_handler)
> > + retval = hostt->eh_abort_handler(scmd);
> >
> > - return hostt->eh_abort_handler(scmd);
> > + scmd->eh_eflags &= ~SCSI_EH_ABORT_SCHEDULED;
> > + return retval;
> > }
> >
> > static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
> >
> Hmm. No, I don't think this is correct.
>
> SCSI_EH_ABORT_SCHEDULED signifies whether scmd_eh_abort_handler()
> needs to run. As such it needs to be reset when the workqueue item
> is triggered.
>
> Can you try with this instead?
>
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index 771c16b..9694803 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -120,6 +120,8 @@ scmd_eh_abort_handler(struct work_struct *work)
> struct scsi_device *sdev = scmd->device;
> int rtn;
>
> + scmd->eh_eflags &= ~SCSI_EH_ABORT_SCHEDULED;
> +
> if (scsi_host_eh_past_deadline(sdev->host)) {
> SCSI_LOG_ERROR_RECOVERY(3,
> scmd_printk(KERN_INFO, scmd,
This doesn't seem like a good idea either, because the flag is tested
later on in scsi_decide_disposition().
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
