Re: [PATCH] PM: Prevent waiting forever on asynchronous suspend after abort

[Rafael J. Wysocki]

On Wednesday, June 20, 2012, mandeep.baines@xxxxxxxxx wrote:
> From: Mandeep Singh Baines <msb@xxxxxxxxxxxx>
> 
> __device_suspend() must always send a completion. Otherwise, parent
> devices will wait forever.
> 
> Commit 1e2ef05b, "PM: Limit race conditions between runtime PM and
> system sleep (v2)", introduced a regression by short-circuiting the
> complete_all() for certain error cases.
> 
> This patch fixes the bug by always signalling a completion.
> 
> Addresses http://crosbug.com/31972
> 
> Tested by injecting an abort.
> 
> Signed-off-by: Mandeep Singh Baines <msb@xxxxxxxxxxxx>
> Cc: Rafael J. Wysocki <rjw@xxxxxxx>
> Cc: linux-pm@xxxxxxxxxxxxxxx
> Cc: stable@xxxxxxxxxx
> Cc: Pavel Machek <pavel@xxxxxx>
> Cc: Len Brown <len.brown@xxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Kevin Hilman <khilman@xxxxxx>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Cc: Colin Cross <ccross@xxxxxxxxxxx>
> Cc: Sameer Nanda <snanda@xxxxxxxxxxxx>
> Cc: Olof Johansson <olofj@xxxxxxxxxxxx>

Applied to linux-pm/linux-next, will be pushed to Linus in a couple of days.

Thanks,
Rafael


> ---
>  drivers/base/power/main.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
> index e0fb5b0..9cb845e 100644
> --- a/drivers/base/power/main.c
> +++ b/drivers/base/power/main.c
> @@ -1031,7 +1031,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
>  	dpm_wait_for_children(dev, async);
>  
>  	if (async_error)
> -		return 0;
> +		goto Complete;
>  
>  	pm_runtime_get_noresume(dev);
>  	if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
> @@ -1040,7 +1040,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
>  	if (pm_wakeup_pending()) {
>  		pm_runtime_put_sync(dev);
>  		async_error = -EBUSY;
> -		return 0;
> +		goto Complete;
>  	}
>  
>  	device_lock(dev);
> @@ -1097,6 +1097,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
>  	}
>  
>  	device_unlock(dev);
> +
> + Complete:
>  	complete_all(&dev->power.completion);
>  
>  	if (error) {
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/