Skip to contentSkip to conversation

Add support for clean shutdown with MSHV

PATCH Superseded Praveen K Paladugu 4 participants 13 messages Nov 7, 2025 – Nov 17, 2025

Subsystems (3)

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add support for clean shutdown with MSHV

Add support for clean shutdown of the root partition when running on MSHV Hypervisor.

v4:
- Adopted machine_ops to order invoking HV_ENTER_SLEEP_STATE as the last step in shutdown sequence.
- This ensures rest of the cleanups are done before powering off

v3:
- Dropped acpi_sleep handlers as they are not used on mshv
- Applied ordering for hv_reboot_notifier
- Fixed build issues on i386, arm64 architectures

v2:
- Addressed review comments from v1.
- Moved all sleep state handling methods under CONFIG_ACPI stub
- - This fixes build issues on non-x86 architectures.

Praveen K Paladugu (3):
hyperv: Add definitions for MSHV sleep state configuration
hyperv: Use reboot notifier to configure sleep state
hyperv: Cleanly shutdown root partition with MSHV

 arch/x86/hyperv/hv_init.c       |  9 +++
 arch/x86/include/asm/mshyperv.h |  4 ++
 drivers/hv/mshv_common.c        | 99 +++++++++++++++++++++++++++++++++
 include/hyperv/hvgdk_mini.h     |  4 +-
 include/hyperv/hvhdk_mini.h     | 33 +++++++++++
 5 files changed, 148 insertions(+), 1 deletion(-)
Signature · 1 line
2.51.0
#1 lore raw

PATCH v4 1/3 hyperv: Add definitions for MSHV sleep state configuration

Add the definitions required to configure sleep states in mshv hypervsior.

---
 include/hyperv/hvgdk_mini.h |  4 +++-
 include/hyperv/hvhdk_mini.h | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
include/hyperv/hvgdk_mini.h +3 -1
index 7499a679e60a..b43fa1c9ed2c 100644
@@ -465,19 +465,21 @@ union hv_vp_assist_msr_contents {	 /* HV_REGISTER_VP_ASSIST_PAGE */
 #define HVCALL_RESET_DEBUG_SESSION			0x006b
 #define HVCALL_MAP_STATS_PAGE				0x006c
 #define HVCALL_UNMAP_STATS_PAGE				0x006d
+#define HVCALL_SET_SYSTEM_PROPERTY			0x006f
 #define HVCALL_ADD_LOGICAL_PROCESSOR			0x0076
 #define HVCALL_GET_SYSTEM_PROPERTY			0x007b
 #define HVCALL_MAP_DEVICE_INTERRUPT			0x007c
 #define HVCALL_UNMAP_DEVICE_INTERRUPT			0x007d
 #define HVCALL_RETARGET_INTERRUPT			0x007e
 #define HVCALL_NOTIFY_PARTITION_EVENT                   0x0087
+#define HVCALL_ENTER_SLEEP_STATE			0x0084
 #define HVCALL_NOTIFY_PORT_RING_EMPTY			0x008b
 #define HVCALL_REGISTER_INTERCEPT_RESULT		0x0091
 #define HVCALL_ASSERT_VIRTUAL_INTERRUPT			0x0094
 #define HVCALL_CREATE_PORT				0x0095
 #define HVCALL_CONNECT_PORT				0x0096
 #define HVCALL_START_VP					0x0099
-#define HVCALL_GET_VP_INDEX_FROM_APIC_ID			0x009a
+#define HVCALL_GET_VP_INDEX_FROM_APIC_ID		0x009a
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE	0x00af
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST	0x00b0
 #define HVCALL_SIGNAL_EVENT_DIRECT			0x00c0
include/hyperv/hvhdk_mini.h +33 -0
index f2d7b50de7a4..06cf30deb319 100644
@@ -140,6 +140,7 @@ enum hv_snp_status {
 
 enum hv_system_property {
 	/* Add more values when needed */
+	HV_SYSTEM_PROPERTY_SLEEP_STATE = 3,
 	HV_SYSTEM_PROPERTY_SCHEDULER_TYPE = 15,
 	HV_DYNAMIC_PROCESSOR_FEATURE_PROPERTY = 21,
 	HV_SYSTEM_PROPERTY_CRASHDUMPAREA = 47,
@@ -155,6 +156,19 @@ union hv_pfn_range {            /* HV_SPA_PAGE_RANGE */
 	} __packed;
 };
 
+enum hv_sleep_state {
+	HV_SLEEP_STATE_S1 = 1,
+	HV_SLEEP_STATE_S2 = 2,
+	HV_SLEEP_STATE_S3 = 3,
+	HV_SLEEP_STATE_S4 = 4,
+	HV_SLEEP_STATE_S5 = 5,
+	/*
+	 * After hypervisor has received this, any follow up sleep
+	 * state registration requests will be rejected.
+	 */
+	HV_SLEEP_STATE_LOCK = 6
+};
+
 enum hv_dynamic_processor_feature_property {
 	/* Add more values when needed */
 	HV_X64_DYNAMIC_PROCESSOR_FEATURE_MAX_ENCRYPTED_PARTITIONS = 13,
@@ -184,6 +198,25 @@ struct hv_output_get_system_property {
 	};
 } __packed;
 
+struct hv_sleep_state_info {
+	u32 sleep_state; /* enum hv_sleep_state */
+	u8 pm1a_slp_typ;
+	u8 pm1b_slp_typ;
+} __packed;
+
+struct hv_input_set_system_property {
+	u32 property_id; /* enum hv_system_property */
+	u32 reserved;
+	union {
+		/* More fields to be filled in when needed */
+		struct hv_sleep_state_info set_sleep_state_info;
+	};
+} __packed;
+
+struct hv_input_enter_sleep_state {     /* HV_INPUT_ENTER_SLEEP_STATE */
+	u32 sleep_state;        /* enum hv_sleep_state */
+} __packed;
+
 struct hv_input_map_stats_page {
 	u32 type; /* enum hv_stats_object_type */
 	u32 padding;
Signature · 1 line
2.51.0
#2 lore raw

RE: [PATCH v4 1/3] hyperv: Add definitions for MSHV sleep state configuration

From: Praveen K Paladugu <[email protected]> Sent: Friday, November 7, 2025 2:17 PM

Quoted 82 lines

Add the definitions required to configure sleep states in mshv hypervsior.

---
 include/hyperv/hvgdk_mini.h |  4 +++-
 include/hyperv/hvhdk_mini.h | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
include/hyperv/hvgdk_mini.h +0 -0
index 7499a679e60a..b43fa1c9ed2c 100644
@@ -465,19 +465,21 @@ union hv_vp_assist_msr_contents {	 /*

HV_REGISTER_VP_ASSIST_PAGE */
#define HVCALL_RESET_DEBUG_SESSION 0x006b
#define HVCALL_MAP_STATS_PAGE 0x006c
#define HVCALL_UNMAP_STATS_PAGE 0x006d

include/hyperv/hvgdk_mini.h +3 -1
+#define HVCALL_SET_SYSTEM_PROPERTY			0x006f
 #define HVCALL_ADD_LOGICAL_PROCESSOR			0x0076
 #define HVCALL_GET_SYSTEM_PROPERTY			0x007b
 #define HVCALL_MAP_DEVICE_INTERRUPT			0x007c
 #define HVCALL_UNMAP_DEVICE_INTERRUPT			0x007d
 #define HVCALL_RETARGET_INTERRUPT			0x007e
 #define HVCALL_NOTIFY_PARTITION_EVENT                   0x0087
+#define HVCALL_ENTER_SLEEP_STATE			0x0084
 #define HVCALL_NOTIFY_PORT_RING_EMPTY			0x008b
 #define HVCALL_REGISTER_INTERCEPT_RESULT		0x0091
 #define HVCALL_ASSERT_VIRTUAL_INTERRUPT			0x0094
 #define HVCALL_CREATE_PORT				0x0095
 #define HVCALL_CONNECT_PORT				0x0096
 #define HVCALL_START_VP					0x0099
-#define HVCALL_GET_VP_INDEX_FROM_APIC_ID			0x009a
+#define HVCALL_GET_VP_INDEX_FROM_APIC_ID		0x009a
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE	0x00af
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST	0x00b0
 #define HVCALL_SIGNAL_EVENT_DIRECT			0x00c0
include/hyperv/hvhdk_mini.h +14 -0
index f2d7b50de7a4..06cf30deb319 100644
@@ -140,6 +140,7 @@ enum hv_snp_status {
 
 enum hv_system_property {
 	/* Add more values when needed */
+	HV_SYSTEM_PROPERTY_SLEEP_STATE = 3,
 	HV_SYSTEM_PROPERTY_SCHEDULER_TYPE = 15,
 	HV_DYNAMIC_PROCESSOR_FEATURE_PROPERTY = 21,
 	HV_SYSTEM_PROPERTY_CRASHDUMPAREA = 47,
@@ -155,6 +156,19 @@ union hv_pfn_range {            /* HV_SPA_PAGE_RANGE */
 	} __packed;
 };
 
+enum hv_sleep_state {
+	HV_SLEEP_STATE_S1 = 1,
+	HV_SLEEP_STATE_S2 = 2,
+	HV_SLEEP_STATE_S3 = 3,
+	HV_SLEEP_STATE_S4 = 4,
+	HV_SLEEP_STATE_S5 = 5,
+	/*
+	 * After hypervisor has received this, any follow up sleep
+	 * state registration requests will be rejected.
+	 */
+	HV_SLEEP_STATE_LOCK = 6
+};
+
 enum hv_dynamic_processor_feature_property {
 	/* Add more values when needed */
 	HV_X64_DYNAMIC_PROCESSOR_FEATURE_MAX_ENCRYPTED_PARTITIONS =

13,

include/hyperv/hvhdk_mini.h +4 -0
@@ -184,6 +198,25 @@ struct hv_output_get_system_property {
 	};
 } __packed;
 
+struct hv_sleep_state_info {
+	u32 sleep_state; /* enum hv_sleep_state */
+	u8 pm1a_slp_typ;
+	u8 pm1b_slp_typ;

include/hyperv/hvhdk_mini.h struct hv_output_get_system_property { · line 214

Quoted 10 lines
include/hyperv/hvhdk_mini.h +10 -0
+} __packed;
+
+struct hv_input_set_system_property {
+	u32 property_id; /* enum hv_system_property */
+	u32 reserved;
+	union {
+		/* More fields to be filled in when needed */
+		struct hv_sleep_state_info set_sleep_state_info;
+	};
+} __packed;

Because struct hv_sleep_state_info is 6 bytes long, this hypercall input struct ends up being 14 bytes long, which is unusual. Hyper-V almost always makes hypercall input size a multiple of 8 bytes, though in a few cases the last 4 bytes might be ignored, making it a multiple of 4 bytes. So I'm wondering if there should be a 2 byte "reserved" field in struct hv_sleep_state_info so that everything ends up being a multiple of 8 bytes.

Since there aren't any fields after such a putative "reserved" field, there's nothing currently at the wrong offset. But it would affect how much space gets zero'ed in hv_initialize_sleep_states(). Zero'ing those last 2 bytes might prove useful if future versions of the hypervisor were to use those 2 bytes for an additional field or two.

Quoted 10 lines
include/hyperv/hvhdk_mini.h +5 -1
+
+struct hv_input_enter_sleep_state {     /* HV_INPUT_ENTER_SLEEP_STATE */
+	u32 sleep_state;        /* enum hv_sleep_state */
+} __packed;
+
 struct hv_input_map_stats_page {
 	u32 type; /* enum hv_stats_object_type */
 	u32 padding;
--

2.51.0

#3 lore raw

Re: [PATCH v4 1/3] hyperv: Add definitions for MSHV sleep state configuration

Quoted 103 lines · Michael Kelley

From: Praveen K Paladugu <[email protected]> Sent: Friday, November 7, 2025 2:17 PM

Quoted 82 lines

Add the definitions required to configure sleep states in mshv hypervsior.

---
 include/hyperv/hvgdk_mini.h |  4 +++-
 include/hyperv/hvhdk_mini.h | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
include/hyperv/hvgdk_mini.h +0 -0
index 7499a679e60a..b43fa1c9ed2c 100644
@@ -465,19 +465,21 @@ union hv_vp_assist_msr_contents {	 /*

HV_REGISTER_VP_ASSIST_PAGE */
#define HVCALL_RESET_DEBUG_SESSION 0x006b
#define HVCALL_MAP_STATS_PAGE 0x006c
#define HVCALL_UNMAP_STATS_PAGE 0x006d

include/hyperv/hvgdk_mini.h +3 -1
+#define HVCALL_SET_SYSTEM_PROPERTY			0x006f
 #define HVCALL_ADD_LOGICAL_PROCESSOR			0x0076
 #define HVCALL_GET_SYSTEM_PROPERTY			0x007b
 #define HVCALL_MAP_DEVICE_INTERRUPT			0x007c
 #define HVCALL_UNMAP_DEVICE_INTERRUPT			0x007d
 #define HVCALL_RETARGET_INTERRUPT			0x007e
 #define HVCALL_NOTIFY_PARTITION_EVENT                   0x0087
+#define HVCALL_ENTER_SLEEP_STATE			0x0084
 #define HVCALL_NOTIFY_PORT_RING_EMPTY			0x008b
 #define HVCALL_REGISTER_INTERCEPT_RESULT		0x0091
 #define HVCALL_ASSERT_VIRTUAL_INTERRUPT			0x0094
 #define HVCALL_CREATE_PORT				0x0095
 #define HVCALL_CONNECT_PORT				0x0096
 #define HVCALL_START_VP					0x0099
-#define HVCALL_GET_VP_INDEX_FROM_APIC_ID			0x009a
+#define HVCALL_GET_VP_INDEX_FROM_APIC_ID		0x009a
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE	0x00af
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST	0x00b0
 #define HVCALL_SIGNAL_EVENT_DIRECT			0x00c0
include/hyperv/hvhdk_mini.h +14 -0
index f2d7b50de7a4..06cf30deb319 100644
@@ -140,6 +140,7 @@ enum hv_snp_status {
 
 enum hv_system_property {
 	/* Add more values when needed */
+	HV_SYSTEM_PROPERTY_SLEEP_STATE = 3,
 	HV_SYSTEM_PROPERTY_SCHEDULER_TYPE = 15,
 	HV_DYNAMIC_PROCESSOR_FEATURE_PROPERTY = 21,
 	HV_SYSTEM_PROPERTY_CRASHDUMPAREA = 47,
@@ -155,6 +156,19 @@ union hv_pfn_range {            /* HV_SPA_PAGE_RANGE */
 	} __packed;
 };
 
+enum hv_sleep_state {
+	HV_SLEEP_STATE_S1 = 1,
+	HV_SLEEP_STATE_S2 = 2,
+	HV_SLEEP_STATE_S3 = 3,
+	HV_SLEEP_STATE_S4 = 4,
+	HV_SLEEP_STATE_S5 = 5,
+	/*
+	 * After hypervisor has received this, any follow up sleep
+	 * state registration requests will be rejected.
+	 */
+	HV_SLEEP_STATE_LOCK = 6
+};
+
 enum hv_dynamic_processor_feature_property {
 	/* Add more values when needed */
 	HV_X64_DYNAMIC_PROCESSOR_FEATURE_MAX_ENCRYPTED_PARTITIONS =

13,

include/hyperv/hvhdk_mini.h +4 -0
@@ -184,6 +198,25 @@ struct hv_output_get_system_property {
 	};
 } __packed;
 
+struct hv_sleep_state_info {
+	u32 sleep_state; /* enum hv_sleep_state */
+	u8 pm1a_slp_typ;
+	u8 pm1b_slp_typ;

include/hyperv/hvhdk_mini.h struct hv_output_get_system_property { · line 214

Quoted 10 lines
include/hyperv/hvhdk_mini.h +10 -0
+} __packed;
+
+struct hv_input_set_system_property {
+	u32 property_id; /* enum hv_system_property */
+	u32 reserved;
+	union {
+		/* More fields to be filled in when needed */
+		struct hv_sleep_state_info set_sleep_state_info;
+	};
+} __packed;

Because struct hv_sleep_state_info is 6 bytes long, this hypercall input struct ends up being 14 bytes long, which is unusual. Hyper-V almost always makes hypercall input size a multiple of 8 bytes, though in a few cases the last 4 bytes might be ignored, making it a multiple of 4 bytes. So I'm wondering if there should be a 2 byte "reserved" field in struct hv_sleep_state_info so that everything ends up being a multiple of 8 bytes.

Quoted 7 lines

Since there aren't any fields after such a putative "reserved" field, there's nothing currently at the wrong offset. But it would affect how much space gets zero'ed in hv_initialize_sleep_states(). Zero'ing those last 2 bytes might prove useful if future versions of the hypervisor were to use those 2 bytes for an additional field or two.

Nice catch Michael. I added a reserved field to the union to keep the struct fully aligned and future proof.

Quoted 10 lines
Quoted 10 lines
include/hyperv/hvhdk_mini.h +5 -1
+
+struct hv_input_enter_sleep_state {     /* HV_INPUT_ENTER_SLEEP_STATE */
+	u32 sleep_state;        /* enum hv_sleep_state */
+} __packed;
+
 struct hv_input_map_stats_page {
 	u32 type; /* enum hv_stats_object_type */
 	u32 padding;
--

2.51.0

#4 lore raw

PATCH v4 2/3 hyperv: Use reboot notifier to configure sleep state

In reply to Praveen K Paladugu

Configure sleep state information in mshv hypervisor. This sleep state information from ACPI will be used by hypervisor to poweroff the host.

---
 arch/x86/hyperv/hv_init.c       |  7 +++
 arch/x86/include/asm/mshyperv.h |  2 +
 drivers/hv/mshv_common.c        | 80 +++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
arch/x86/hyperv/hv_init.c +7 -0
index e28737ec7054..645b52dd732e 100644
@@ -555,6 +555,13 @@ void __init hyperv_init(void)
 
 		hv_remap_tsc_clocksource();
 		hv_root_crash_init();
+		/*
+		 * The notifier registration might fail at various hops.
+		 * Corresponding error messages will land in dmesg. There is
+		 * otherwise nothing that can be specifically done to handle
+		 * failures here.
+		 */
+		hv_sleep_notifiers_register();
 	} else {
 		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
 		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index 1342d55c2545..fbc1233175ce 100644
@@ -181,8 +181,10 @@ int hyperv_fill_flush_guest_mapping_list(
 void hv_apic_init(void);
 void __init hv_init_spinlocks(void);
 bool hv_vcpu_is_preempted(int vcpu);
+void hv_sleep_notifiers_register(void);
 #else
 static inline void hv_apic_init(void) {}
+static inline void hv_sleep_notifiers_register(void) {};
 #endif
 
 struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +80 -0

89 lines not on this page · raw message

Signature · 1 line
2.51.0
#5 lore raw

Re: [PATCH v4 2/3] hyperv: Use reboot notifier to configure sleep state

Quoted 111 lines · Praveen K Paladugu

Configure sleep state information in mshv hypervisor. This sleep state information from ACPI will be used by hypervisor to poweroff the host.

---
  arch/x86/hyperv/hv_init.c       |  7 +++
  arch/x86/include/asm/mshyperv.h |  2 +
  drivers/hv/mshv_common.c        | 80 +++++++++++++++++++++++++++++++++
  3 files changed, 89 insertions(+)
arch/x86/hyperv/hv_init.c +7 -0
index e28737ec7054..645b52dd732e 100644
@@ -555,6 +555,13 @@ void __init hyperv_init(void)
 
  		hv_remap_tsc_clocksource();
  		hv_root_crash_init();
+		/*
+		 * The notifier registration might fail at various hops.
+		 * Corresponding error messages will land in dmesg. There is
+		 * otherwise nothing that can be specifically done to handle
+		 * failures here.
+		 */
+		hv_sleep_notifiers_register();
  	} else {
  		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
  		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index 1342d55c2545..fbc1233175ce 100644
@@ -181,8 +181,10 @@ int hyperv_fill_flush_guest_mapping_list(
  void hv_apic_init(void);
  void __init hv_init_spinlocks(void);
  bool hv_vcpu_is_preempted(int vcpu);
+void hv_sleep_notifiers_register(void);
  #else
  static inline void hv_apic_init(void) {}
+static inline void hv_sleep_notifiers_register(void) {};
  #endif
 
  struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +51 -0
index aa2be51979fd..d1a1daa52b65 100644
@@ -14,6 +14,9 @@
  #include <asm/mshyperv.h>
  #include <linux/resume_user_mode.h>
  #include <linux/export.h>
+#include <linux/acpi.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
 
  #include "mshv.h"
 
@@ -138,3 +141,80 @@ int hv_call_get_partition_property(u64 partition_id,
  	return 0;
  }
  EXPORT_SYMBOL_GPL(hv_call_get_partition_property);
+
+#if IS_ENABLED(CONFIG_ACPI)
+/*
+ * Corresponding sleep states have to be initialized in order for a subsequent
+ * HVCALL_ENTER_SLEEP_STATE call to succeed. Currently only S5 state as per
+ * ACPI 6.4 chapter 7.4.2 is relevant, while S1, S2 and S3 can be supported.
+ *
+ * In order to pass proper PM values to mshv, ACPI should be initialized and
+ * should support S5 sleep state when this method is invoked.
+ */
+static int hv_initialize_sleep_states(void)
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_set_system_property *in;
+	acpi_status acpi_status;
+	u8 sleep_type_a, sleep_type_b;
+
+	if (!acpi_sleep_state_supported(ACPI_STATE_S5)) {
+		pr_err("%s: S5 sleep state not supported.\n", __func__);
+		return -ENODEV;
+	}
+
+	acpi_status = acpi_get_sleep_type_data(ACPI_STATE_S5, &sleep_type_a,
+					       &sleep_type_b);
+	if (ACPI_FAILURE(acpi_status))
+		return -ENODEV;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	memset(in, 0, sizeof(*in));
+
+	in->property_id = HV_SYSTEM_PROPERTY_SLEEP_STATE;
+	in->set_sleep_state_info.sleep_state = HV_SLEEP_STATE_S5;
+	in->set_sleep_state_info.pm1a_slp_typ = sleep_type_a;
+	in->set_sleep_state_info.pm1b_slp_typ = sleep_type_b;
+
+	status = hv_do_hypercall(HVCALL_SET_SYSTEM_PROPERTY, in, NULL);
+	local_irq_restore(flags);
+
+	if (!hv_result_success(status)) {
+		hv_status_err(status, "\n");
+		return hv_result_to_errno(status);
+	}
+
+	return 0;
+}
+

drivers/hv/mshv_common.c int hv_call_get_partition_property(u64 partition_id, · line 201

Quoted 10 lines
drivers/hv/mshv_common.c +10 -0
+/*
+ * This notifier initializes sleep states in mshv hypervisor which will be
+ * used during power off.
+ */
+static int hv_reboot_notifier_handler(struct notifier_block *this,
+				      unsigned long code, void *another)
+{
+	int ret = 0;
+
+	if (code == SYS_POWER_OFF)

This patchset only addresses poweroff.
Reboot currently works via ACPI. Nothing more is needed there.

kernel_halt needs the use of a different hypercall. Support for Halting will be introduced later.

Quoted 19 lines
drivers/hv/mshv_common.c +19 -0
+		ret = hv_initialize_sleep_states();
+
+	return ret ? NOTIFY_DONE : NOTIFY_OK;
+}
+
+static struct notifier_block hv_reboot_notifier = {
+	.notifier_call = hv_reboot_notifier_handler,
+};
+
+void hv_sleep_notifiers_register(void)
+{
+	int ret;
+
+	ret = register_reboot_notifier(&hv_reboot_notifier);
+	if (ret)
+		pr_err("%s: cannot register reboot notifier %d\n", __func__,
+		       ret);
+}
+#endif
#6 lore raw

RE: [PATCH v4 2/3] hyperv: Use reboot notifier to configure sleep state

From: Praveen K Paladugu <[email protected]> Sent: Friday, November 7, 2025 2:25 PM

Quoted 59 lines · Praveen K Paladugu
Quoted 57 lines

Configure sleep state information in mshv hypervisor. This sleep state information from ACPI will be used by hypervisor to poweroff the host.

---
  arch/x86/hyperv/hv_init.c       |  7 +++
  arch/x86/include/asm/mshyperv.h |  2 +
  drivers/hv/mshv_common.c        | 80 +++++++++++++++++++++++++++++++++
  3 files changed, 89 insertions(+)
arch/x86/hyperv/hv_init.c +7 -0
index e28737ec7054..645b52dd732e 100644
@@ -555,6 +555,13 @@ void __init hyperv_init(void)
 
  		hv_remap_tsc_clocksource();
  		hv_root_crash_init();
+		/*
+		 * The notifier registration might fail at various hops.
+		 * Corresponding error messages will land in dmesg. There is
+		 * otherwise nothing that can be specifically done to handle
+		 * failures here.
+		 */
+		hv_sleep_notifiers_register();
  	} else {
  		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
  		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index 1342d55c2545..fbc1233175ce 100644
@@ -181,8 +181,10 @@ int hyperv_fill_flush_guest_mapping_list(
  void hv_apic_init(void);
  void __init hv_init_spinlocks(void);
  bool hv_vcpu_is_preempted(int vcpu);
+void hv_sleep_notifiers_register(void);
  #else
  static inline void hv_apic_init(void) {}
+static inline void hv_sleep_notifiers_register(void) {};
  #endif
 
  struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +3 -0
index aa2be51979fd..d1a1daa52b65 100644
@@ -14,6 +14,9 @@
  #include <asm/mshyperv.h>
  #include <linux/resume_user_mode.h>
  #include <linux/export.h>
+#include <linux/acpi.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
 
Quoted 8 lines

drivers/hv/mshv_common.c int hv_call_get_partition_property(u64 partition_id, · line 145

Quoted 8 lines
drivers/hv/mshv_common.c +2 -0
  #include "mshv.h"
 
@@ -138,3 +141,80 @@ int hv_call_get_partition_property(u64 partition_id,
  	return 0;
  }
  EXPORT_SYMBOL_GPL(hv_call_get_partition_property);
+
+#if IS_ENABLED(CONFIG_ACPI)

Is gating on CONFIG_ACPI necessary? I thought this might be leftover from earlier versions when you were calling acpi_os_set_prepare_sleep() and acpi_os_set_prepare_extended_sleep(). In my testing, this current version compiles OK if the gating is removed and CONFIG_ACPI=n, as the ACPI functions you are calling have stubs in that case.

Quoted 81 lines
Quoted 46 lines
drivers/hv/mshv_common.c +46 -0
+/*
+ * Corresponding sleep states have to be initialized in order for a subsequent
+ * HVCALL_ENTER_SLEEP_STATE call to succeed. Currently only S5 state as per
+ * ACPI 6.4 chapter 7.4.2 is relevant, while S1, S2 and S3 can be supported.
+ *
+ * In order to pass proper PM values to mshv, ACPI should be initialized and
+ * should support S5 sleep state when this method is invoked.
+ */
+static int hv_initialize_sleep_states(void)
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_set_system_property *in;
+	acpi_status acpi_status;
+	u8 sleep_type_a, sleep_type_b;
+
+	if (!acpi_sleep_state_supported(ACPI_STATE_S5)) {
+		pr_err("%s: S5 sleep state not supported.\n", __func__);
+		return -ENODEV;
+	}
+
+	acpi_status = acpi_get_sleep_type_data(ACPI_STATE_S5, &sleep_type_a,
+					       &sleep_type_b);
+	if (ACPI_FAILURE(acpi_status))
+		return -ENODEV;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	memset(in, 0, sizeof(*in));
+
+	in->property_id = HV_SYSTEM_PROPERTY_SLEEP_STATE;
+	in->set_sleep_state_info.sleep_state = HV_SLEEP_STATE_S5;
+	in->set_sleep_state_info.pm1a_slp_typ = sleep_type_a;
+	in->set_sleep_state_info.pm1b_slp_typ = sleep_type_b;
+
+	status = hv_do_hypercall(HVCALL_SET_SYSTEM_PROPERTY, in, NULL);
+	local_irq_restore(flags);
+
+	if (!hv_result_success(status)) {
+		hv_status_err(status, "\n");
+		return hv_result_to_errno(status);
+	}
+
+	return 0;
+}
+

drivers/hv/mshv_common.c int hv_call_get_partition_property(u64 partition_id, · line 201

Quoted 10 lines
drivers/hv/mshv_common.c +10 -0
+/*
+ * This notifier initializes sleep states in mshv hypervisor which will be
+ * used during power off.
+ */
+static int hv_reboot_notifier_handler(struct notifier_block *this,
+				      unsigned long code, void *another)
+{
+	int ret = 0;
+
+	if (code == SYS_POWER_OFF)

This patchset only addresses poweroff.
Reboot currently works via ACPI. Nothing more is needed there.

kernel_halt needs the use of a different hypercall. Support for Halting will be introduced later.

Quoted 19 lines
drivers/hv/mshv_common.c +19 -0
+		ret = hv_initialize_sleep_states();
+
+	return ret ? NOTIFY_DONE : NOTIFY_OK;
+}
+
+static struct notifier_block hv_reboot_notifier = {
+	.notifier_call = hv_reboot_notifier_handler,
+};
+
+void hv_sleep_notifiers_register(void)
+{
+	int ret;
+
+	ret = register_reboot_notifier(&hv_reboot_notifier);
+	if (ret)
+		pr_err("%s: cannot register reboot notifier %d\n", __func__,
+		       ret);
+}
+#endif
#7 lore raw

Re: [PATCH v4 2/3] hyperv: Use reboot notifier to configure sleep state

Quoted 62 lines · Michael Kelley

From: Praveen K Paladugu <[email protected]> Sent: Friday, November 7, 2025 2:25 PM

Quoted 61 lines · Praveen K Paladugu
Quoted 59 lines

Configure sleep state information in mshv hypervisor. This sleep state information from ACPI will be used by hypervisor to poweroff the host.

---
  arch/x86/hyperv/hv_init.c       |  7 +++
  arch/x86/include/asm/mshyperv.h |  2 +
  drivers/hv/mshv_common.c        | 80 +++++++++++++++++++++++++++++++++
  3 files changed, 89 insertions(+)
arch/x86/hyperv/hv_init.c +7 -0
index e28737ec7054..645b52dd732e 100644
@@ -555,6 +555,13 @@ void __init hyperv_init(void)
 
  		hv_remap_tsc_clocksource();
  		hv_root_crash_init();
+		/*
+		 * The notifier registration might fail at various hops.
+		 * Corresponding error messages will land in dmesg. There is
+		 * otherwise nothing that can be specifically done to handle
+		 * failures here.
+		 */
+		hv_sleep_notifiers_register();
  	} else {
  		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
  		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index 1342d55c2545..fbc1233175ce 100644
@@ -181,8 +181,10 @@ int hyperv_fill_flush_guest_mapping_list(
  void hv_apic_init(void);
  void __init hv_init_spinlocks(void);
  bool hv_vcpu_is_preempted(int vcpu);
+void hv_sleep_notifiers_register(void);
  #else
  static inline void hv_apic_init(void) {}
+static inline void hv_sleep_notifiers_register(void) {};
  #endif
 
  struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +3 -0
index aa2be51979fd..d1a1daa52b65 100644
@@ -14,6 +14,9 @@
  #include <asm/mshyperv.h>
  #include <linux/resume_user_mode.h>
  #include <linux/export.h>
+#include <linux/acpi.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
 
  #include "mshv.h"
 
Quoted 13 lines
Quoted 6 lines

drivers/hv/mshv_common.c int hv_call_get_partition_property(u64 partition_id, · line 145

Quoted 6 lines
drivers/hv/mshv_common.c +2 -0
@@ -138,3 +141,80 @@ int hv_call_get_partition_property(u64 partition_id,
  	return 0;
  }
  EXPORT_SYMBOL_GPL(hv_call_get_partition_property);
+
+#if IS_ENABLED(CONFIG_ACPI)

Is gating on CONFIG_ACPI necessary? I thought this might be leftover from earlier versions when you were calling acpi_os_set_prepare_sleep() and acpi_os_set_prepare_extended_sleep(). In my testing, this current version compiles OK if the gating is removed and CONFIG_ACPI=n, as the ACPI functions you are calling have stubs in that case.

I re-checked and confirmed this gating is no longer necessary. I dropped it in v5.

Quoted 81 lines
Quoted 81 lines
Quoted 46 lines
drivers/hv/mshv_common.c +46 -0
+/*
+ * Corresponding sleep states have to be initialized in order for a subsequent
+ * HVCALL_ENTER_SLEEP_STATE call to succeed. Currently only S5 state as per
+ * ACPI 6.4 chapter 7.4.2 is relevant, while S1, S2 and S3 can be supported.
+ *
+ * In order to pass proper PM values to mshv, ACPI should be initialized and
+ * should support S5 sleep state when this method is invoked.
+ */
+static int hv_initialize_sleep_states(void)
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_set_system_property *in;
+	acpi_status acpi_status;
+	u8 sleep_type_a, sleep_type_b;
+
+	if (!acpi_sleep_state_supported(ACPI_STATE_S5)) {
+		pr_err("%s: S5 sleep state not supported.\n", __func__);
+		return -ENODEV;
+	}
+
+	acpi_status = acpi_get_sleep_type_data(ACPI_STATE_S5, &sleep_type_a,
+					       &sleep_type_b);
+	if (ACPI_FAILURE(acpi_status))
+		return -ENODEV;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	memset(in, 0, sizeof(*in));
+
+	in->property_id = HV_SYSTEM_PROPERTY_SLEEP_STATE;
+	in->set_sleep_state_info.sleep_state = HV_SLEEP_STATE_S5;
+	in->set_sleep_state_info.pm1a_slp_typ = sleep_type_a;
+	in->set_sleep_state_info.pm1b_slp_typ = sleep_type_b;
+
+	status = hv_do_hypercall(HVCALL_SET_SYSTEM_PROPERTY, in, NULL);
+	local_irq_restore(flags);
+
+	if (!hv_result_success(status)) {
+		hv_status_err(status, "\n");
+		return hv_result_to_errno(status);
+	}
+
+	return 0;
+}
+

drivers/hv/mshv_common.c int hv_call_get_partition_property(u64 partition_id, · line 201

Quoted 10 lines
drivers/hv/mshv_common.c +10 -0
+/*
+ * This notifier initializes sleep states in mshv hypervisor which will be
+ * used during power off.
+ */
+static int hv_reboot_notifier_handler(struct notifier_block *this,
+				      unsigned long code, void *another)
+{
+	int ret = 0;
+
+	if (code == SYS_POWER_OFF)

This patchset only addresses poweroff.
Reboot currently works via ACPI. Nothing more is needed there.

kernel_halt needs the use of a different hypercall. Support for Halting will be introduced later.

Quoted 19 lines
drivers/hv/mshv_common.c +19 -0
+		ret = hv_initialize_sleep_states();
+
+	return ret ? NOTIFY_DONE : NOTIFY_OK;
+}
+
+static struct notifier_block hv_reboot_notifier = {
+	.notifier_call = hv_reboot_notifier_handler,
+};
+
+void hv_sleep_notifiers_register(void)
+{
+	int ret;
+
+	ret = register_reboot_notifier(&hv_reboot_notifier);
+	if (ret)
+		pr_err("%s: cannot register reboot notifier %d\n", __func__,
+		       ret);
+}
+#endif
#8 lore raw

PATCH v4 3/3 hyperv: Cleanly shutdown root partition with MSHV

In reply to Praveen K Paladugu

When a root partition running on MSHV is powered off, the default behavior is to write ACPI registers to power-off. However, this ACPI write is intercepted by MSHV and will result in a Machine Check Exception(MCE).

The root partition eventually panics with a trace similar to:

  [   81.306348] reboot: Power down
  [   81.314709] mce: [Hardware Error]: CPU 0: Machine Check Exception: 4 Bank 0: b2000000c0060001
  [   81.314711] mce: [Hardware Error]: TSC 3b8cb60a66 PPIN 11d98332458e4ea9
  [   81.314713] mce: [Hardware Error]: PROCESSOR 0:606a6 TIME 1759339405 SOCKET 0 APIC 0 microcode ffffffff
  [   81.314715] mce: [Hardware Error]: Run the above through 'mcelog --ascii'
  [   81.314716] mce: [Hardware Error]: Machine check: Processor context corrupt
  [   81.314717] Kernel panic - not syncing: Fatal machine check

To correctly shutdown a root partition running on MSHV, sleep state information has be configured within mshv. Later HVCALL_ENTER_SLEEP_STATE should be invoked as the last step in the shutdown sequence.

The previous patch configures the sleep state information and this patch invokes HVCALL_ENTER_SLEEP_STATE to cleanly shutdown the root partition.

---
 arch/x86/hyperv/hv_init.c       |  2 ++
 arch/x86/include/asm/mshyperv.h |  2 ++
 drivers/hv/mshv_common.c        | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)
arch/x86/hyperv/hv_init.c +2 -0
index 645b52dd732e..24824534ff8d 100644
@@ -34,6 +34,7 @@
 #include <clocksource/hyperv_timer.h>
 #include <linux/highmem.h>
 #include <linux/export.h>
+#include <asm/reboot.h>
 
 void *hv_hypercall_pg;
 
@@ -562,6 +563,7 @@ void __init hyperv_init(void)
 		 * failures here.
 		 */
 		hv_sleep_notifiers_register();
+		machine_ops.power_off = hv_machine_power_off;
 	} else {
 		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
 		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index fbc1233175ce..9082d56103ce 100644
@@ -182,9 +182,11 @@ void hv_apic_init(void);
 void __init hv_init_spinlocks(void);
 bool hv_vcpu_is_preempted(int vcpu);
 void hv_sleep_notifiers_register(void);
+void hv_machine_power_off(void);
 #else
 static inline void hv_apic_init(void) {}
 static inline void hv_sleep_notifiers_register(void) {};
+static inline void hv_machine_power_off(void) {};
 #endif
 
 struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +19 -0
index d1a1daa52b65..0588d293a92a 100644
@@ -217,4 +217,23 @@ void hv_sleep_notifiers_register(void)
 		pr_err("%s: cannot register reboot notifier %d\n", __func__,
 		       ret);
 }
+
+/*
+ * Power off the machine by entering S5 sleep state via Hyper-V hypercall.
+ * This call does not return if successful.
+ */
+void hv_machine_power_off(void)
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_enter_sleep_state *in;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	in->sleep_state = HV_SLEEP_STATE_S5;
+
+	status = hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);
+	local_irq_restore(flags);
+
+}
 #endif
Signature · 1 line
2.51.0
#9 lore raw

Re: [PATCH v4 3/3] hyperv: Cleanly shutdown root partition with MSHV

kernel test robot noticed the following build warnings:

Hi Praveen,

kernel test robot noticed the following build warnings:

[auto build test WARNING on next-20251107]
[cannot apply to tip/x86/core linus/master v6.18-rc4 v6.18-rc3 v6.18-rc2 v6.18-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Praveen-K-Paladugu/hyperv-Add-definitions-for-MSHV-sleep-state-configuration/20251108-061825
base:   next-20251107
patch link:    https://lore.kernel.org/r/20251107221700.45957-4-prapal%40linux.microsoft.com
patch subject: [PATCH v4 3/3] hyperv: Cleanly shutdown root partition with MSHV
config: x86_64-randconfig-122-20251108 (https://download.01.org/0day-ci/archive/20251108/[email protected]/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251108/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

>> drivers/hv/mshv_common.c:227:6: warning: variable 'status' set but not used [-Wunused-but-set-variable]
     227 |         u64 status;
         |             ^

1 warning generated.

vim +/status +227 drivers/hv/mshv_common.c

220
221 /*
222 * Power off the machine by entering S5 sleep state via Hyper-V hypercall.
223 * This call does not return if successful.
224 */
225 void hv_machine_power_off(void)
226 {

 > 227		u64 status;

228 unsigned long flags;
229 struct hv_input_enter_sleep_state *in;
230
231 local_irq_save(flags);
232 in = *this_cpu_ptr(hyperv_pcpu_input_arg);
233 in->sleep_state = HV_SLEEP_STATE_S5;
234
235 status = hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);
236 local_irq_restore(flags);
237

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#10 lore raw

RE: [PATCH v4 3/3] hyperv: Cleanly shutdown root partition with MSHV

In reply to Praveen K Paladugu

From: Praveen K Paladugu <[email protected]>

Quoted 16 lines

When a root partition running on MSHV is powered off, the default behavior is to write ACPI registers to power-off. However, this ACPI write is intercepted by MSHV and will result in a Machine Check Exception(MCE).

The root partition eventually panics with a trace similar to:

  [   81.306348] reboot: Power down
  [   81.314709] mce: [Hardware Error]: CPU 0: Machine Check Exception: 4 Bank 0: b2000000c0060001
  [   81.314711] mce: [Hardware Error]: TSC 3b8cb60a66 PPIN 11d98332458e4ea9
  [   81.314713] mce: [Hardware Error]: PROCESSOR 0:606a6 TIME 1759339405 SOCKET 0 APIC 0 microcode ffffffff
  [   81.314715] mce: [Hardware Error]: Run the above through 'mcelog --ascii'
  [   81.314716] mce: [Hardware Error]: Machine check: Processor context corrupt
  [   81.314717] Kernel panic - not syncing: Fatal machine check
Quoted 2 lines

To correctly shutdown a root partition running on MSHV, sleep state information has be configured within mshv. Later HVCALL_ENTER_SLEEP_STATE

s/has be/has to be/ --or-- s/has be/must be/

Nit: Be consistent in capitalizing "MSHV" (or not capitalizing it).

Quoted 64 lines

should be invoked as the last step in the shutdown sequence.

The previous patch configures the sleep state information and this patch invokes HVCALL_ENTER_SLEEP_STATE to cleanly shutdown the root partition.

---
 arch/x86/hyperv/hv_init.c       |  2 ++
 arch/x86/include/asm/mshyperv.h |  2 ++
 drivers/hv/mshv_common.c        | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)
arch/x86/hyperv/hv_init.c +2 -0
index 645b52dd732e..24824534ff8d 100644
@@ -34,6 +34,7 @@
 #include <clocksource/hyperv_timer.h>
 #include <linux/highmem.h>
 #include <linux/export.h>
+#include <asm/reboot.h>
 
 void *hv_hypercall_pg;
 
@@ -562,6 +563,7 @@ void __init hyperv_init(void)
 		 * failures here.
 		 */
 		hv_sleep_notifiers_register();
+		machine_ops.power_off = hv_machine_power_off;
 	} else {
 		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
 		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index fbc1233175ce..9082d56103ce 100644
@@ -182,9 +182,11 @@ void hv_apic_init(void);
 void __init hv_init_spinlocks(void);
 bool hv_vcpu_is_preempted(int vcpu);
 void hv_sleep_notifiers_register(void);
+void hv_machine_power_off(void);
 #else
 static inline void hv_apic_init(void) {}
 static inline void hv_sleep_notifiers_register(void) {};
+static inline void hv_machine_power_off(void) {};
 #endif
 
 struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +6 -0
index d1a1daa52b65..0588d293a92a 100644
@@ -217,4 +217,23 @@ void hv_sleep_notifiers_register(void)
 		pr_err("%s: cannot register reboot notifier %d\n", __func__,
 		       ret);
 }
+
+/*
+ * Power off the machine by entering S5 sleep state via Hyper-V hypercall.
+ * This call does not return if successful.
+ */
+void hv_machine_power_off(void)

drivers/hv/mshv_common.c void hv_sleep_notifiers_register(void) · line 235

Quoted 10 lines
drivers/hv/mshv_common.c +10 -0
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_enter_sleep_state *in;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	in->sleep_state = HV_SLEEP_STATE_S5;
+
+	status = hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);

As flagged by the kernel test robot, this should be

	(void)hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);

so that the intent to ignore the return value is explicit. And the local variable "status" can be removed.

Quoted 6 lines
drivers/hv/mshv_common.c +3 -1
+	local_irq_restore(flags);
+
+}
 #endif
--

2.51.0

#11 lore raw

Re: [PATCH v4 3/3] hyperv: Cleanly shutdown root partition with MSHV

Quoted 101 lines · Michael Kelley

From: Praveen K Paladugu <[email protected]>

Quoted 16 lines

When a root partition running on MSHV is powered off, the default behavior is to write ACPI registers to power-off. However, this ACPI write is intercepted by MSHV and will result in a Machine Check Exception(MCE).

The root partition eventually panics with a trace similar to:

  [   81.306348] reboot: Power down
  [   81.314709] mce: [Hardware Error]: CPU 0: Machine Check Exception: 4 Bank 0: b2000000c0060001
  [   81.314711] mce: [Hardware Error]: TSC 3b8cb60a66 PPIN 11d98332458e4ea9
  [   81.314713] mce: [Hardware Error]: PROCESSOR 0:606a6 TIME 1759339405 SOCKET 0 APIC 0 microcode ffffffff
  [   81.314715] mce: [Hardware Error]: Run the above through 'mcelog --ascii'
  [   81.314716] mce: [Hardware Error]: Machine check: Processor context corrupt
  [   81.314717] Kernel panic - not syncing: Fatal machine check
Quoted 2 lines

To correctly shutdown a root partition running on MSHV, sleep state information has be configured within mshv. Later HVCALL_ENTER_SLEEP_STATE

s/has be/has to be/ --or-- s/has be/must be/

Nit: Be consistent in capitalizing "MSHV" (or not capitalizing it).

Quoted 64 lines

should be invoked as the last step in the shutdown sequence.

The previous patch configures the sleep state information and this patch invokes HVCALL_ENTER_SLEEP_STATE to cleanly shutdown the root partition.

---
 arch/x86/hyperv/hv_init.c       |  2 ++
 arch/x86/include/asm/mshyperv.h |  2 ++
 drivers/hv/mshv_common.c        | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)
arch/x86/hyperv/hv_init.c +2 -0
index 645b52dd732e..24824534ff8d 100644
@@ -34,6 +34,7 @@
 #include <clocksource/hyperv_timer.h>
 #include <linux/highmem.h>
 #include <linux/export.h>
+#include <asm/reboot.h>
 
 void *hv_hypercall_pg;
 
@@ -562,6 +563,7 @@ void __init hyperv_init(void)
 		 * failures here.
 		 */
 		hv_sleep_notifiers_register();
+		machine_ops.power_off = hv_machine_power_off;
 	} else {
 		hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
 		wrmsrq(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
arch/x86/include/asm/mshyperv.h +2 -0
index fbc1233175ce..9082d56103ce 100644
@@ -182,9 +182,11 @@ void hv_apic_init(void);
 void __init hv_init_spinlocks(void);
 bool hv_vcpu_is_preempted(int vcpu);
 void hv_sleep_notifiers_register(void);
+void hv_machine_power_off(void);
 #else
 static inline void hv_apic_init(void) {}
 static inline void hv_sleep_notifiers_register(void) {};
+static inline void hv_machine_power_off(void) {};
 #endif
 
 struct irq_domain *hv_create_pci_msi_domain(void);
drivers/hv/mshv_common.c +6 -0
index d1a1daa52b65..0588d293a92a 100644
@@ -217,4 +217,23 @@ void hv_sleep_notifiers_register(void)
 		pr_err("%s: cannot register reboot notifier %d\n", __func__,
 		       ret);
 }
+
+/*
+ * Power off the machine by entering S5 sleep state via Hyper-V hypercall.
+ * This call does not return if successful.
+ */
+void hv_machine_power_off(void)

drivers/hv/mshv_common.c void hv_sleep_notifiers_register(void) · line 235

Quoted 10 lines
drivers/hv/mshv_common.c +10 -0
+{
+	u64 status;
+	unsigned long flags;
+	struct hv_input_enter_sleep_state *in;
+
+	local_irq_save(flags);
+	in = *this_cpu_ptr(hyperv_pcpu_input_arg);
+	in->sleep_state = HV_SLEEP_STATE_S5;
+
+	status = hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);

As flagged by the kernel test robot, this should be

Quoted 5 lines
	(void)hv_do_hypercall(HVCALL_ENTER_SLEEP_STATE, in, NULL);

so that the intent to ignore the return value is explicit. And the local variable "status" can be removed.

Thanks for the feedback. I addressed it in v5.

Quoted 6 lines
Quoted 6 lines
drivers/hv/mshv_common.c +3 -1
+	local_irq_restore(flags);
+
+}
 #endif
--

2.51.0

Reviewed-by on the v4 series
#12 lore raw
In reply to Praveen K Paladugu
Quoted 23 lines · Praveen K Paladugu

Add support for clean shutdown of the root partition when running on MSHV Hypervisor.

v4:
- Adopted machine_ops to order invoking HV_ENTER_SLEEP_STATE as the last step in shutdown sequence.
- This ensures rest of the cleanups are done before powering off

v3:
- Dropped acpi_sleep handlers as they are not used on mshv
- Applied ordering for hv_reboot_notifier
- Fixed build issues on i386, arm64 architectures

v2:
- Addressed review comments from v1.
- Moved all sleep state handling methods under CONFIG_ACPI stub
- - This fixes build issues on non-x86 architectures.

Praveen K Paladugu (3):
hyperv: Add definitions for MSHV sleep state configuration
hyperv: Use reboot notifier to configure sleep state
hyperv: Cleanly shutdown root partition with MSHV

Quoted 7 lines
 arch/x86/hyperv/hv_init.c       |  9 +++
 arch/x86/include/asm/mshyperv.h |  4 ++
 drivers/hv/mshv_common.c        | 99 +++++++++++++++++++++++++++++++++
 include/hyperv/hvgdk_mini.h     |  4 +-
 include/hyperv/hvhdk_mini.h     | 33 +++++++++++
 5 files changed, 148 insertions(+), 1 deletion(-)

For the series, modulo the lkp complaint about unused status in hv_machine_power_off()