public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xen/acpi: upload PM state from init-domain to Xen

Browse source 
This was broken in commit cd979883b9 ("xen/acpi-processor:
fix enabling interrupts on syscore_resume"). do_suspend (from
xen/manage.c) and thus xen_resume_notifier never get called on
the initial-domain at resume (it is if running as guest.)

The rationale for the breaking change was that upload_pm_data()
potentially does blocking work in syscore_resume(). This patch
addresses the original issue by scheduling upload_pm_data() to
execute in workqueue context.

Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: stable@vger.kernel.org
Based-on-patch-by: Konrad Wilk <konrad.wilk@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
This commit is contained in:
Ankur Arora 2017-03-21 15:43:38 -07:00 • committed by Boris Ostrovsky
parent 1c2593cc8f
commit 1914f0cd20
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/xen/xen-acpi-processor.c
View file

@ -27,10 +27,10 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/syscore_ops.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#include <xen/xen.h> #include <xen/xen.h>
#include <xen/xen-ops.h>
#include <xen/interface/platform.h> #include <xen/interface/platform.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
@ -466,15 +466,33 @@ static int xen_upload_processor_pm_data(void)
return rc; return rc;
} }
static int xen_acpi_processor_resume(struct notifier_block *nb, static void xen_acpi_processor_resume_worker(struct work_struct *dummy)
unsigned long action, void *data)
{ {
int rc;
bitmap_zero(acpi_ids_done, nr_acpi_bits); bitmap_zero(acpi_ids_done, nr_acpi_bits);
return xen_upload_processor_pm_data();
rc = xen_upload_processor_pm_data();
if (rc != 0)
pr_info("ACPI data upload failed, error = %d\n", rc);
} }
struct notifier_block xen_acpi_processor_resume_nb = { static void xen_acpi_processor_resume(void)
.notifier_call = xen_acpi_processor_resume, {
static DECLARE_WORK(wq, xen_acpi_processor_resume_worker);
/*
* xen_upload_processor_pm_data() calls non-atomic code.
* However, the context for xen_acpi_processor_resume is syscore
* with only the boot CPU online and in an atomic context.
*
* So defer the upload for some point safer.
*/
schedule_work(&wq);
}
static struct syscore_ops xap_syscore_ops = {
.resume = xen_acpi_processor_resume,
}; };
static int __init xen_acpi_processor_init(void) static int __init xen_acpi_processor_init(void)
@ -527,7 +545,7 @@ static int __init xen_acpi_processor_init(void)
if (rc) if (rc)
goto err_unregister; goto err_unregister;
xen_resume_notifier_register(&xen_acpi_processor_resume_nb); register_syscore_ops(&xap_syscore_ops);
return 0; return 0;
err_unregister: err_unregister:
@ -544,7 +562,7 @@ static void __exit xen_acpi_processor_exit(void)
{ {
int i; int i;
xen_resume_notifier_unregister(&xen_acpi_processor_resume_nb); unregister_syscore_ops(&xap_syscore_ops);
kfree(acpi_ids_done); kfree(acpi_ids_done);
kfree(acpi_id_present); kfree(acpi_id_present);
kfree(acpi_id_cst_present); kfree(acpi_id_cst_present);