Hello, my name's Todd Brandt and I'm the project owner for Intel Open Source Technology Center's new project to optimize suspend/resume time. Our website is: https://01.org/suspendresume [The Problem] The vast majority of time spent in S3 resume is consumed by the ATA subsystem as it resumes the computer's hard drives. For large hard disks this time can be upwards of 10 seconds, which makes S3 suspend/resume too costly to use frequently. This time needs to be reduced. I've written a blog entry describing the details at this url: https://01.org/suspendresume/blogs/tebrandt/2013/hard-disk-resume-worst-offender [Proposed Solution] I've implemented a potential solution in this patch, which effectively reduces total resume time from multiple seconds to less than 700ms. The idea is to allow the ATA/SCSI subsystems to resume asynchronously without blocking system resume completion. The dpm_resume call currently waits for all asynchronous devices to finish resuming before it gives control back to the user. But in the case of ATA/SCSI we can give control back immediately, since the hard disks won't be needed immediately in lieu of RAM and cache. Patch1 goes through and sets the power.async_suspend flag for every device in the ATA/SCSI resume path. This includes the ata port, link, and dev devices, the scsi host and target devices, all their associated transport devices, the block devices, and block partitions. This allows the entire ATA resume path to be added to the async device queue in drivers/base/power/main.c. Without this, the ATA resume path ends up in both queues (sync and async), which causes interdependencies and backs up the two queues. It's also needed for the second patch to have any effect. Patch2 updates the drivers/base/power subsystem to allow any devices which have registered as asynchronous and who have not registered "compete" callbacks to be non-blocking. As it happens, the ATA subsystem devices don't register complete callbacks, so this is a simple way of adding the new functionality and getting ATA to conform immediately. ---------------------------------------------------------------- [PATCH1 - ata_resume_async.patch] Signed-off-by: Todd Brandt <todd.e.brandt@xxxxxxxxx> --- block/genhd.c | 2 ++ block/partition-generic.c | 1 + drivers/ata/libata-transport.c | 4 +++- drivers/base/attribute_container.c | 1 + drivers/base/core.c | 7 ++++++- drivers/scsi/scsi_sysfs.c | 2 +- drivers/scsi/sd.c | 3 +++ 7 files changed, 17 insertions(+), 3 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 7dcfdd8..8b88c05 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -525,6 +525,8 @@ static void register_disk(struct gendisk *disk) /* delay uevents, until we scanned partition table */ dev_set_uevent_suppress(ddev, 1); + device_enable_async_suspend(ddev); + if (device_add(ddev)) return; if (!sysfs_deprecated) { diff --git a/block/partition-generic.c b/block/partition-generic.c index 1cb4dec..7f136d1 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -325,6 +325,7 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, pdev->class = &block_class; pdev->type = &part_type; pdev->parent = ddev; + pdev->power.async_suspend = true; err = blk_alloc_devt(p, &devt); if (err) diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c index c04d393..493f5ce 100644 --- a/drivers/ata/libata-transport.c +++ b/drivers/ata/libata-transport.c @@ -285,13 +285,13 @@ int ata_tport_add(struct device *parent, dev->parent = get_device(parent); dev->release = ata_tport_release; dev_set_name(dev, "ata%d", ap->print_id); + device_enable_async_suspend(dev); transport_setup_device(dev); error = device_add(dev); if (error) { goto tport_err; } - device_enable_async_suspend(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); pm_runtime_forbid(dev); @@ -414,6 +414,7 @@ int ata_tlink_add(struct ata_link *link) else dev_set_name(dev, "link%d.%d", ap->print_id, link->pmp); + device_enable_async_suspend(dev); transport_setup_device(dev); error = device_add(dev); @@ -642,6 +643,7 @@ static int ata_tdev_add(struct ata_device *ata_dev) else dev_set_name(dev, "dev%d.%d.0", ap->print_id, link->pmp); + device_enable_async_suspend(dev); transport_setup_device(dev); error = device_add(dev); if (error) { diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c index d78b204..49cc02d 100644 --- a/drivers/base/attribute_container.c +++ b/drivers/base/attribute_container.c @@ -349,6 +349,7 @@ attribute_container_add_attrs(struct device *classdev) int attribute_container_add_class_device(struct device *classdev) { + classdev->power.async_suspend = true; int error = device_add(classdev); if (error) return error; diff --git a/drivers/base/core.c b/drivers/base/core.c index a235085..6c1cf6c 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1020,7 +1020,7 @@ int device_add(struct device *dev) goto name_error; } - pr_debug("device: '%s': %s\n", dev_name(dev), __func__); + pr_debug("device: '%s': %s, %s\n", dev_name(dev), __func__,(dev->power.async_suspend)?"ASYNC":"SYNC"); parent = get_device(dev->parent); kobj = get_device_parent(dev, parent); @@ -1558,6 +1558,11 @@ struct device *device_create_vargs(struct class *class, struct device *parent, goto error; } + if (parent) + dev->power.async_suspend = parent->power.async_suspend; + else + dev->power.async_suspend = true; + dev->devt = devt; dev->class = class; dev->parent = parent; diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 931a7d9..22b5a5a 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -838,6 +838,7 @@ static int scsi_target_add(struct scsi_target *starget) if (starget->state != STARGET_CREATED) return 0; + device_enable_async_suspend(&starget->dev); error = device_add(&starget->dev); if (error) { dev_err(&starget->dev, "target device_add failed, error %d\n", error); @@ -848,7 +849,6 @@ static int scsi_target_add(struct scsi_target *starget) pm_runtime_set_active(&starget->dev); pm_runtime_enable(&starget->dev); - device_enable_async_suspend(&starget->dev); return 0; } diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7992635..3a412ea 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2924,6 +2924,9 @@ static int sd_probe(struct device *dev) sdkp->dev.class = &sd_disk_class; dev_set_name(&sdkp->dev, dev_name(dev)); + if (dev) + sdkp->dev.power.async_suspend = dev->power.async_suspend; + if (device_add(&sdkp->dev)) goto out_free_index; ---------------------------------------------------------------- [PATCH2 - pm_resume_async_non_blocking.patch] Signed-off-by: Todd Brandt <todd.e.brandt@xxxxxxxxx> --- drivers/base/power/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 2b7f77d..280065b 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -713,7 +713,6 @@ void dpm_resume(pm_message_t state) put_device(dev); } mutex_unlock(&dpm_list_mtx); - async_synchronize_full(); dpm_show_time(starttime, state, NULL); } @@ -726,11 +725,14 @@ static void device_complete(struct device *dev, pm_message_t state) { void (*callback)(struct device *) = NULL; char *info = NULL; + bool hascb = false; if (dev->power.syscore) return; - device_lock(dev); + DoComplete: + if (hascb) + device_lock(dev); if (dev->pm_domain) { info = "completing power domain "; @@ -751,13 +753,19 @@ static void device_complete(struct device *dev, pm_message_t state) callback = dev->driver->pm->complete; } + /* if a callback exists, lock the device and call it */ + /* otherwise don't even lock/unlock the device */ if (callback) { + if (!hascb) { + hascb = true; + goto DoComplete; + } + pm_dev_dbg(dev, state, info); callback(dev); + device_unlock(dev); } - device_unlock(dev); - pm_runtime_put_sync(dev); } @@ -1180,6 +1188,8 @@ int dpm_suspend(pm_message_t state) might_sleep(); mutex_lock(&dpm_list_mtx); + /* wait for any processes still resuming */ + async_synchronize_full(); pm_transition = state; async_error = 0; while (!list_empty(&dpm_prepared_list)) { ----------------------------------------------------------------------- Todd Brandt Linux Kernel Developer, Intel OTC, Hillsboro OR -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
