On 09/20/2013 09:59 AM, Ren Mingxin wrote:
Hi, Hannes: On 09/02/2013 07:58 PM, Hannes Reinecke wrote:+scmd_eh_abort_handler(struct work_struct *work) +{ + struct scsi_cmnd *scmd = + container_of(work, struct scsi_cmnd, abort_work.work); + struct scsi_device *sdev = scmd->device; + unsigned long flags; + int rtn; + + spin_lock_irqsave(sdev->host->host_lock, flags); + if (scsi_host_eh_past_deadline(sdev->host)) { + spin_unlock_irqrestore(sdev->host->host_lock, flags); + SCSI_LOG_ERROR_RECOVERY(3, + scmd_printk(KERN_INFO, scmd, + "scmd %p eh timeout, not aborting\n", scmd)); + } else { + spin_unlock_irqrestore(sdev->host->host_lock, flags); + SCSI_LOG_ERROR_RECOVERY(3, + scmd_printk(KERN_INFO, scmd, + "aborting command %p\n", scmd)); + rtn = scsi_try_to_abort_cmd(sdev->host->hostt, scmd); + if (rtn == SUCCESS) { + scmd->result |= DID_TIME_OUT<< 16; + if (!scsi_noretry_cmd(scmd)&& + (++scmd->retries<= scmd->allowed)) {I think scsi_host_eh_past_deadline() should be checked here like: - if (!scsi_noretry_cmd(scmd)&& + if (!scsi_host_eh_past_deadline(sdev->host)&& + !scsi_noretry_cmd(scmd)&& According to my test, once retry requires 30 seconds. If eh_deadline is reached, we can stop EH here without waiting for long term retrying.
Hmm. We could. Providing the eh_deadline patches are going in. James, should I resend the patchset? Does it even have a chance of getting in? Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@xxxxxxx +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
