• Hannes Reinecke's avatar
    [SCSI] Fix USB deadlock caused by SCSI error handling · 7daf4804
    Hannes Reinecke authored
    USB requires that every command be aborted first before we escalate to reset.
    In particular, USB will deadlock if we try to reset first before aborting the
    command.
    
    Unfortunately, the flag we use to tell if a command has already been aborted:
    SCSI_EH_ABORT_SCHEDULED is not cleared properly leading to cases where we can
    requeue a command with the flag set and proceed immediately to reset if it
    fails (thus causing USB to deadlock).
    
    Fix by clearing the SCSI_EH_ABORT_SCHEDULED flag if it has been set.  Which
    means this will be the second time scsi_abort_command() has been called for
    the same command.  IE the first abort went out, did its thing, but now the
    same command has timed out again.
    
    So this flag gets cleared, and scsi_abort_command() returns FAILED, and _no_
    asynchronous abort is being scheduled.  scsi_times_out() will then proceed to
    call scsi_eh_scmd_add().  But as we've cleared the SCSI_EH_ABORT_SCHEDULED
    flag the SCSI_EH_CANCEL_CMD flag will continue to be set, and the command will
    be aborted with the main SCSI EH routine.
    Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
    Tested-by: default avatarAndreas Reis <andreas.reis@gmail.com>
    Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
    Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
    7daf4804
scsi_error.c 69.6 KB