To test the code, run this command on the host:
Restart-VM $vm -Type Reboot
Signed-off-by: Dexuan Cui <[email protected]>
---
drivers/hv/hv_util.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
index 766bd8457346..fe3a316380c2 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_1 1
+#define SD_VERSION_3_1 (SD_MAJOR << 16 | SD_MINOR_1)
#define SD_VERSION (SD_MAJOR << 16 | SD_MINOR)
#define SD_MAJOR_1 1
@@ -50,8 +52,9 @@ static int sd_srv_version;
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_1,
SD_VERSION,
SD_VERSION_1
};
@@ -118,11 +121,21 @@ static void perform_shutdown(struct work_struct *dummy)
orderly_poweroff(true);
}
+static void perform_restart(struct work_struct *dummy)
+{
+ orderly_reboot();
+}
+
/*
* Perform the shutdown operation in a thread context.
*/
static DECLARE_WORK(shutdown_work, perform_shutdown);
+/*
+ * Perform the restart operation in a thread context.
+ */
+static DECLARE_WORK(restart_work, perform_restart);
+
static void shutdown_onchannelcallback(void *context)
{
struct vmbus_channel *channel = context;
@@ -166,6 +179,14 @@ static void shutdown_onchannelcallback(void *context)
pr_info("Shutdown request received -"
" graceful shutdown initiated\n");
break;
+ case 2:
+ case 3:
+ pr_info("Restart request received -"
+ " graceful restart initiated\n");
+ icmsghdrp->status = HV_S_OK;
+
+ schedule_work(&restart_work);
+ break;
default:
icmsghdrp->status = HV_E_FAIL;
execute_shutdown = false;
--
2.19.1
From: Dexuan Cui <[email protected]> Sent: Sunday, January 12, 2020 10:31 PM
>
>
> To test the code, run this command on the host:
>
> Restart-VM $vm -Type Reboot
>
Need a better commit message here. How about:
The hv_util driver currently supports a "shutdown" operation initiated from the
Hyper-V host. Newer versions of Hyper-V also support a "restart" operation. So
add support for the updated protocol version that has "restart" support, and
perform a clean reboot when such a message is received from Hyper-V.
To test the restart functionality, run this PowerShell command on the Hyper-V host:
Restart-VM <vmname> -Type Reboot
>
> Signed-off-by: Dexuan Cui <[email protected]>
> ---
> drivers/hv/hv_util.c | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
> index 766bd8457346..fe3a316380c2 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_1 1
> +#define SD_VERSION_3_1 (SD_MAJOR << 16 | SD_MINOR_1)
> #define SD_VERSION (SD_MAJOR << 16 | SD_MINOR)
>
> #define SD_MAJOR_1 1
> @@ -50,8 +52,9 @@ static int sd_srv_version;
> 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_1,
> SD_VERSION,
> SD_VERSION_1
> };
> @@ -118,11 +121,21 @@ static void perform_shutdown(struct work_struct *dummy)
> orderly_poweroff(true);
> }
>
> +static void perform_restart(struct work_struct *dummy)
> +{
> + orderly_reboot();
> +}
> +
> /*
> * Perform the shutdown operation in a thread context.
> */
> static DECLARE_WORK(shutdown_work, perform_shutdown);
>
> +/*
> + * Perform the restart operation in a thread context.
> + */
> +static DECLARE_WORK(restart_work, perform_restart);
> +
> static void shutdown_onchannelcallback(void *context)
> {
> struct vmbus_channel *channel = context;
> @@ -166,6 +179,14 @@ static void shutdown_onchannelcallback(void *context)
> pr_info("Shutdown request received -"
> " graceful shutdown initiated\n");
> break;
> + case 2:
> + case 3:
How are the flags values 0, 1, 2, and 3 interpreted? Perhaps a short comment
would be helpful.
> + pr_info("Restart request received -"
> + " graceful restart initiated\n");
> + icmsghdrp->status = HV_S_OK;
> +
> + schedule_work(&restart_work);
> + break;
For case 0 and 1 (shutdown), the schedule_work() call is performed only
after the response packet has been sent to the host. Is there a reason the
new code for case 2 and 3 (restart) is doing it in the opposite order?
> default:
> icmsghdrp->status = HV_E_FAIL;
> execute_shutdown = false;
> --
> 2.19.1
> From: Michael Kelley <[email protected]>
> Sent: Wednesday, January 22, 2020 9:16 AM
> >
> > To test the code, run this command on the host:
> >
> > Restart-VM $vm -Type Reboot
>
> Need a better commit message here. How about:
>
> The hv_util driver currently supports a "shutdown" operation initiated from the
> Hyper-V host. Newer versions of Hyper-V also support a "restart" operation.
> So add support for the updated protocol version that has "restart" support, and
> perform a clean reboot when such a message is received from Hyper-V.
>
> To test the restart functionality, run this PowerShell command on the Hyper-V
> host:
>
> Restart-VM <vmname> -Type Reboot
Thanks a lot! I'll use this version.
> > @@ -166,6 +179,14 @@ static void shutdown_onchannelcallback(void
> *context)
> > pr_info("Shutdown request received -"
> > " graceful shutdown initiated\n");
> > break;
> > + case 2:
> > + case 3:
>
> How are the flags values 0, 1, 2, and 3 interpreted? Perhaps a short comment
> would be helpful.
If bit 0 is 1, it means a flag of "doing the operation by force". IMO we'd like to
always perform the operation by force, even if the host doesn't set the flag -- this
is what the existing shutdown handling code does.
I'll add a comment.
>
> > + pr_info("Restart request received -"
> > + " graceful restart initiated\n");
> > + icmsghdrp->status = HV_S_OK;
> > +
> > + schedule_work(&restart_work);
> > + break;
>
> For case 0 and 1 (shutdown), the schedule_work() call is performed only
> after the response packet has been sent to the host. Is there a reason the
> new code for case 2 and 3 (restart) is doing it in the opposite order?
The channel callback runs in a tasklet context, and an active tasklet handler can
not be cancelled, so even if the "work" starts to run on another CPU immediately,
I'm sure the channel callback will send the response packet and finish normally.
This way we can save a local bool variable "execute_reboot". :-)
But, let me change the patch to follow the shutdown handling code for
consistency.
Thanks,
-- Dexuan