2011-02-15 09:54:13

by Ian Campbell

Subject: [PATCH] xen: suspend and resume system devices when running PVHVM

Otherwise we fail to properly suspend/resume all of the emulated devices.

Something between 2.6.38-rc2 and rc3 appears to have exposed this
issue, but it's always been wrong not to do this.

Signed-off-by: Ian Campbell <[email protected]>
Acked-by: Stefano Stabellini <[email protected]>
Acked-by: Jeremy Fitzhardinge <[email protected]>
---
drivers/xen/manage.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index db8c4c4..2417727 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -37,11 +37,19 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
#ifdef CONFIG_PM_SLEEP
static int xen_hvm_suspend(void *data)
{
+ int err;
struct sched_shutdown r = { .reason = SHUTDOWN_suspend };
int *cancelled = data;

BUG_ON(!irqs_disabled());

+ err = sysdev_suspend(PMSG_SUSPEND);
+ if (err) {
+ printk(KERN_ERR "xen_hvm_suspend: sysdev_suspend failed: %d\n",
+ err);
+ return err;
+ }
+
*cancelled = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);

xen_hvm_post_suspend(*cancelled);
@@ -53,6 +61,8 @@ static int xen_hvm_suspend(void *data)
xen_timer_resume();
}

+ sysdev_resume();
+
return 0;
}

--
1.5.6.5

2011-02-17 10:41:40

by Ian Campbell

Subject: Re: [PATCH] xen: suspend and resume system devices when running PVHVM

Hi Linus,

I stuck this patch in a git branch since I wanted to base some future
work on it. Please pull instead of taking the patch if you see this in
time.

The following changes since commit 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d:
Linus Torvalds (1):
Linux 2.6.38-rc4

are available in the git repository at:

git://xenbits.xen.org/people/ianc/linux-2.6.git for-linus/bugfixes

Ian Campbell (1):
xen: suspend and resume system devices when running PVHVM

drivers/xen/manage.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)

Ian.

On Tue, 2011-02-15 at 09:54 +0000, Ian Campbell wrote:
> Otherwise we fail to properly suspend/resume all of the emulated devices.
>
> Something between 2.6.38-rc2 and rc3 appears to have exposed this
> issue, but it's always been wrong not to do this.
>
> Signed-off-by: Ian Campbell <[email protected]>
> Acked-by: Stefano Stabellini <[email protected]>
> Acked-by: Jeremy Fitzhardinge <[email protected]>
> ---
> drivers/xen/manage.c | 10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
> index db8c4c4..2417727 100644
> --- a/drivers/xen/manage.c
> +++ b/drivers/xen/manage.c
> @@ -37,11 +37,19 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
> #ifdef CONFIG_PM_SLEEP
> static int xen_hvm_suspend(void *data)
> {
> + int err;
> struct sched_shutdown r = { .reason = SHUTDOWN_suspend };
> int *cancelled = data;
>
> BUG_ON(!irqs_disabled());
>
> + err = sysdev_suspend(PMSG_SUSPEND);
> + if (err) {
> + printk(KERN_ERR "xen_hvm_suspend: sysdev_suspend failed: %d\n",
> + err);
> + return err;
> + }
> +
> *cancelled = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
>
> xen_hvm_post_suspend(*cancelled);
> @@ -53,6 +61,8 @@ static int xen_hvm_suspend(void *data)
> xen_timer_resume();
> }
>
> + sysdev_resume();
> +
> return 0;
> }
>

--
Ian Campbell
Current Noise: Godflesh - Locust Furnace

We can embody the truth, but we cannot know it.
-- Yates