From: Anchal Agarwal <anchalag@amazon.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org
Cc: boris.ostrovsky@oracle.com, konrad.wilk@oracle.com,
roger.pau@citrix.com, netdev@vger.kernel.org, jgross@suse.com,
xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org,
kamatam@amazon.com, anchalag@amazon.com, fllinden@amazon.com,
vallish@amazon.com, guruanb@amazon.com, eduval@amazon.com,
rjw@rjwysocki.net, pavel@ucw.cz, len.brown@intel.com,
linux-pm@vger.kernel.org, cyberax@amazon.com
Subject: [RFC PATCH 01/12] xen/manage: keep track of the on-going suspend mode
Date: Tue, 12 Jun 2018 20:56:08 +0000 [thread overview]
Message-ID: <20180612205619.28156-2-anchalag@amazon.com> (raw)
In-Reply-To: <20180612205619.28156-1-anchalag@amazon.com>
From: Munehisa Kamata <kamatam@amazon.com>
To differentiate between Xen suspend, PM suspend and PM hibernation,
keep track of the on-going suspend mode by mainly using a new PM
notifier. Since Xen suspend doesn't have corresponding PM event, its
main logic is modfied to acquire pm_mutex and set the current mode.
Note that we may see deadlock if PM suspend/hibernation is interrupted
by Xen suspend. PM suspend/hibernation depends on xenwatch thread to
process xenbus state transactions, but the thread will sleep to wait
pm_mutex which is already held by PM suspend/hibernation context in the
scenario. Though, acquirng pm_mutex is still right thing to do, and we
would need to modify Xen shutdown code to avoid the issue. This will be
fixed by a separate patch.
Signed-off-by: Munehisa Kamata <kamatam@amazon.com>
Signed-off-by: Anchal Agarwal <anchalag@amazon.com>
Reviewed-by: Sebastian Biemueller <sbiemue@amazon.com>
Reviewed-by: Munehisa Kamata <kamatam@amazon.com>
Reviewed-by: Eduardo Valentin <eduval@amazon.com>
---
drivers/xen/manage.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 8835065..8f9ea87 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -13,6 +13,7 @@
#include <linux/freezer.h>
#include <linux/syscore_ops.h>
#include <linux/export.h>
+#include <linux/suspend.h>
#include <xen/xen.h>
#include <xen/xenbus.h>
@@ -39,6 +40,16 @@ enum shutdown_state {
/* Ignore multiple shutdown requests. */
static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
+enum suspend_modes {
+ NO_SUSPEND = 0,
+ XEN_SUSPEND,
+ PM_SUSPEND,
+ PM_HIBERNATION,
+};
+
+/* Protected by pm_mutex */
+static enum suspend_modes suspend_mode = NO_SUSPEND;
+
struct suspend_info {
int cancelled;
};
@@ -98,6 +109,10 @@ static void do_suspend(void)
int err;
struct suspend_info si;
+ lock_system_sleep();
+
+ suspend_mode = XEN_SUSPEND;
+
shutting_down = SHUTDOWN_SUSPEND;
err = freeze_processes();
@@ -161,6 +176,10 @@ static void do_suspend(void)
thaw_processes();
out:
shutting_down = SHUTDOWN_INVALID;
+
+ suspend_mode = NO_SUSPEND;
+
+ unlock_system_sleep();
}
#endif /* CONFIG_HIBERNATE_CALLBACKS */
@@ -372,3 +391,42 @@ int xen_setup_shutdown_event(void)
EXPORT_SYMBOL_GPL(xen_setup_shutdown_event);
subsys_initcall(xen_setup_shutdown_event);
+
+static int xen_pm_notifier(struct notifier_block *notifier,
+ unsigned long pm_event, void *unused)
+{
+ switch (pm_event) {
+ case PM_SUSPEND_PREPARE:
+ suspend_mode = PM_SUSPEND;
+ break;
+ case PM_HIBERNATION_PREPARE:
+ case PM_RESTORE_PREPARE:
+ suspend_mode = PM_HIBERNATION;
+ break;
+ case PM_POST_SUSPEND:
+ case PM_POST_RESTORE:
+ case PM_POST_HIBERNATION:
+ /* Set back to the default */
+ suspend_mode = NO_SUSPEND;
+ break;
+ default:
+ pr_warn("Receive unknown PM event 0x%lx\n", pm_event);
+ return -EINVAL;
+ }
+
+ return 0;
+};
+
+static struct notifier_block xen_pm_notifier_block = {
+ .notifier_call = xen_pm_notifier
+};
+
+static int xen_setup_pm_notifier(void)
+{
+ if (!xen_hvm_domain())
+ return -ENODEV;
+
+ return register_pm_notifier(&xen_pm_notifier_block);
+}
+
+subsys_initcall(xen_setup_pm_notifier);
--
2.7.4
next prev parent reply other threads:[~2018-06-12 20:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 20:56 [RFC PATCH 00/12] Enable PM hibernation on guest VMs Anchal Agarwal
2018-06-12 20:56 ` Anchal Agarwal [this message]
2018-06-13 16:42 ` [RFC PATCH 01/12] xen/manage: keep track of the on-going suspend mode Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 02/12] xen/manage: introduce helper function to know " Anchal Agarwal
2018-06-13 17:41 ` Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 03/12] xenbus: add freeze/thaw/restore callbacks support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 04/12] x86/xen: Introduce new function to map HYPERVISOR_shared_info on Resume Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 05/12] x86/xen: add system core suspend and resume callbacks Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 06/12] xen-blkfront: add callbacks for PM suspend and hibernation Anchal Agarwal
2018-06-13 8:24 ` Roger Pau Monné
2018-06-13 22:20 ` Anchal Agarwal
2018-06-14 8:43 ` Roger Pau Monné
2018-06-12 20:56 ` [RFC PATCH 07/12] xen-netfront: add callbacks for PM suspend and hibernation support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 08/12] xen-time-introduce-xen_-save-restore-_steal_clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 09/12] x86/xen: save and restore steal clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 10/12] xen/events: add xen_shutdown_pirqs helper function Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 11/12] x86/xen: close event channels for PIRQs in system core suspend callback Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Anchal Agarwal
2018-06-14 19:45 ` Pavel Machek
2018-06-14 19:50 ` Besogonov, Aleksei
2018-06-12 21:09 ` [RFC PATCH 00/12] Enable PM hibernation on guest VMs Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180612205619.28156-2-anchalag@amazon.com \
--to=anchalag@amazon.com \
--cc=boris.ostrovsky@oracle.com \
--cc=cyberax@amazon.com \
--cc=eduval@amazon.com \
--cc=fllinden@amazon.com \
--cc=guruanb@amazon.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=kamatam@amazon.com \
--cc=konrad.wilk@oracle.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=roger.pau@citrix.com \
--cc=tglx@linutronix.de \
--cc=vallish@amazon.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).