From: Dexuan Cui <decui@microsoft.com>
To: KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
"sashal@kernel.org" <sashal@kernel.org>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Michael Kelley <mikelley@microsoft.com>
Cc: Dexuan Cui <decui@microsoft.com>
Subject: [PATCH 2/3] hv_utils: Support host-initiated hibernation request
Date: Wed, 11 Sep 2019 23:38:59 +0000 [thread overview]
Message-ID: <1568245130-70712-3-git-send-email-decui@microsoft.com> (raw)
In-Reply-To: <1568245130-70712-1-git-send-email-decui@microsoft.com>
Update the Shutdown IC version to 3.2, which is required for the host to
send the hibernation request.
The user is expected to create the program "/sbin/hyperv-hibernate", which
is called on the host-initiated hibernation request.
The program can be a script like
test@localhost:~$ cat /sbin/hyperv-hibernate
#!/bin/bash
echo disk > /sys/power/state
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
drivers/hv/hv_util.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
index 039c752..9e98c5d 100644
--- a/drivers/hv/hv_util.c
+++ b/drivers/hv/hv_util.c
@@ -24,6 +24,8 @@
#define SD_MAJOR 3
#define SD_MINOR 0
+#define SD_MINOR_2 2
+#define SD_VERSION_3_2 (SD_MAJOR << 16 | SD_MINOR_2)
#define SD_VERSION (SD_MAJOR << 16 | SD_MINOR)
#define SD_MAJOR_1 1
@@ -50,8 +52,9 @@
static int ts_srv_version;
static int hb_srv_version;
-#define SD_VER_COUNT 2
+#define SD_VER_COUNT 3
static const int sd_versions[] = {
+ SD_VERSION_3_2,
SD_VERSION,
SD_VERSION_1
};
@@ -75,9 +78,30 @@
UTIL_WS2K8_FW_VERSION
};
+static bool execute_hibernate;
+static int hv_shutdown_init(struct hv_util_service *srv)
+{
+#if 0
+ /*
+ * The patch to implement hv_is_hibernation_supported() is going
+ * through the tip tree. For now, let's hardcode execute_hibernate
+ * to true -- this doesn't break anything since hibernation for
+ * Linux VM on Hyper-V never worked before. We'll remove the
+ * conditional compilation as soon as hv_is_hibernation_supported()
+ * is available in the mainline tree.
+ */
+ execute_hibernate = hv_is_hibernation_supported();
+#else
+ execute_hibernate = true;
+#endif
+
+ return 0;
+}
+
static void shutdown_onchannelcallback(void *context);
static struct hv_util_service util_shutdown = {
.util_cb = shutdown_onchannelcallback,
+ .util_init = hv_shutdown_init,
};
static int hv_timesync_init(struct hv_util_service *srv);
@@ -123,11 +147,38 @@ static void perform_shutdown(struct work_struct *dummy)
orderly_poweroff(true);
}
+static void perform_hibernation(struct work_struct *dummy)
+{
+ /*
+ * The user is expected to create the program, which can be a simple
+ * script containing two lines:
+ * #!/bin/bash
+ * echo disk > /sys/power/state
+ */
+ static char hibernate_cmd[PATH_MAX] = "/sbin/hyperv-hibernate";
+
+ static char *envp[] = {
+ NULL,
+ };
+
+ static char *argv[] = {
+ hibernate_cmd,
+ NULL,
+ };
+
+ call_usermodehelper(hibernate_cmd, argv, envp, UMH_NO_WAIT);
+}
+
/*
* Perform the shutdown operation in a thread context.
*/
static DECLARE_WORK(shutdown_work, perform_shutdown);
+/*
+ * Perform the hibernation operation in a thread context.
+ */
+static DECLARE_WORK(hibernate_work, perform_hibernation);
+
static void shutdown_onchannelcallback(void *context)
{
struct vmbus_channel *channel = context;
@@ -171,6 +222,19 @@ static void shutdown_onchannelcallback(void *context)
pr_info("Shutdown request received -"
" graceful shutdown initiated\n");
break;
+ case 4:
+ case 5:
+ pr_info("Hibernation request received -"
+ " hibernation %sinitiated\n",
+ execute_hibernate ? "" : "not ");
+
+ if (execute_hibernate) {
+ icmsghdrp->status = HV_S_OK;
+ schedule_work(&hibernate_work);
+ } else {
+ icmsghdrp->status = HV_E_FAIL;
+ }
+ break;
default:
icmsghdrp->status = HV_E_FAIL;
execute_shutdown = false;
--
1.8.3.1
next prev parent reply other threads:[~2019-09-11 23:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 23:38 [PATCH 0/3] Enhance hv_utils to support hibernation Dexuan Cui
2019-09-11 23:38 ` [PATCH 1/3] hv_utils: Add the support of hibernation Dexuan Cui
2019-09-12 16:36 ` Vitaly Kuznetsov
2019-09-13 19:15 ` Dexuan Cui
2019-09-16 8:45 ` Vitaly Kuznetsov
2019-09-19 6:34 ` Dexuan Cui
2019-09-19 10:27 ` Vitaly Kuznetsov
2019-09-21 7:26 ` Dexuan Cui
2019-09-11 23:38 ` Dexuan Cui [this message]
2019-09-12 16:26 ` [PATCH 2/3] hv_utils: Support host-initiated hibernation request Vitaly Kuznetsov
2019-09-13 16:42 ` Dexuan Cui
2019-09-11 23:39 ` [PATCH 3/3] hv_utils: Support host-initiated restart request Dexuan Cui
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=1568245130-70712-3-git-send-email-decui@microsoft.com \
--to=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=sashal@kernel.org \
--cc=sthemmin@microsoft.com \
/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).