Message ID | 20120117051153.22344.92696.stgit@localhost6.localdomain6 |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
On Mon, Jan 16, 2012 at 9:11 PM, Dan Williams <dan.j.williams@intel.com> wrote: > This is called per-sdev but in the sas-transport case this waits for the > entire domain to recover which is never guaranteed to be less than 120 > seconds with libata taking nearly a minute per-device to recover. Ping > the waitqueue so that the hung task timer knows we're still making > progress. I'm now not so sure about this one. This was implemented before the change to asynchronously scan ata devices where serial discover could take inordinate amounts of time. Jack already reported a scan time reduction of 3 minutes down to 5 seconds with the async code, so I'll drop this patch. Even if recovery was taking a long time this patch would only move the hung task timeout backtrace to another location in the kernel that was dependent on the completion of error handling. -- Dan -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 37a9e73..a062adc 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -663,6 +663,11 @@ static void async_sas_ata_eh(void *data, async_cookie_t cookie) ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler"); ata_scsi_port_error_handler(ha->core.shost, ap); + + /* tell scsi_block_when_processing_errors() waiters that we are + * still making forward progress + */ + wake_up(&ha->core.shost->host_wait); } void sas_ata_strategy_handler(struct Scsi_Host *shost)
This is called per-sdev but in the sas-transport case this waits for the entire domain to recover which is never guaranteed to be less than 120 seconds with libata taking nearly a minute per-device to recover. Ping the waitqueue so that the hung task timer knows we're still making progress. Reported-by: Abraham Carranza <abrahamx.c.carranza@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/scsi/libsas/sas_ata.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html