Hyper-V: kexec fixes for L1VH (mshv)
Subsystems (4)
v3 cover Hyper-V: kexec fixes for L1VH (mshv)
This series fixes kexec support when Linux runs as an L1 Virtual Host (L1VH) under Hyper-V, using the MSHV driver to manage child VMs.
1. A variable shadowing bug in vmbus that hides the cpuhp state used for teardown.
2. Move hv_stimer_global_cleanup() from vmbus's hv_kexec_handler() to hv_machine_shutdown(). This ensures stimer cleanup happens before the vmbus unload.
3. LP/VP re-creation: after kexec, logical processors and virtual processors already exist in the hypervisor. Detect this and skip re-adding them.
4-5. SynIC cleanup: the MSHV driver manages its own SynIC resources
separately from vmbus. Add proper teardown of MSHV-owned SINTs, SIMP, and SIEFP on kexec, scoped to only the resources MSHV owns.
6. Debugfs stats pages: unmap the VP statistics overlay pages before kexec to avoid stale mappings in the new kernel.
Changes since v2:
- Rebased onto linux-next/master to adapt to the upstream SynIC refactor (commit 5a674ef871fe, "mshv: refactor synic init and cleanup").
Changes since v1:
- Patch 4: account for nested root partitions where VMBus is also active (not just L1VH); use a vmbus_active local variable; allocate SIRBP L1VH allocation path for when the hypervisor doesn't pre-provision the page
Jork Loeser (6):
Drivers: hv: vmbus: fix hyperv_cpuhp_online variable shadowing x86/hyperv: move stimer cleanup to hv_machine_shutdown() x86/hyperv: Skip LP/VP creation on kexec
mshv: limit SynIC management to MSHV-owned resources
mshv: clean up SynIC state on kexec for L1VH
mshv: unmap debugfs stats pages on kexec
arch/x86/kernel/cpu/mshyperv.c | 15 +++- drivers/hv/hv_proc.c | 47 +++++++++++ drivers/hv/mshv_debugfs.c | 7 +- drivers/hv/mshv_synic.c | 146 +++++++++++++++++++++------------ drivers/hv/vmbus_drv.c | 2 - include/asm-generic/mshyperv.h | 10 +++ include/hyperv/hvgdk_mini.h | 1 + include/hyperv/hvhdk_mini.h | 12 +++ 8 files changed, 184 insertions(+), 56 deletions(-)
--
2.43.0
PATCH v3 1/6 Drivers: hv: vmbus: fix hyperv_cpuhp_online variable shadowing
vmbus_alloc_synic_and_connect() declares a local 'int hyperv_cpuhp_online' that shadows the file-scope global of the same name. The cpuhp state returned by cpuhp_setup_state() is stored in the local, leaving the global at 0 (CPUHP_OFFLINE). When hv_kexec_handler() or hv_machine_shutdown() later call cpuhp_remove_state(hyperv_cpuhp_online) they pass 0, which hits the BUG_ON in __cpuhp_remove_state_cpuslocked().
Remove the local declaration so the cpuhp state is stored in the file-scope global where hv_kexec_handler() and hv_machine_shutdown() expect it.
--- drivers/hv/vmbus_drv.c | 1 - 1 file changed, 1 deletion(-)
drivers/hv/vmbus_drv.c +0 -1
@@ -1422,7 +1422,6 @@ static int vmbus_alloc_synic_and_connect(void) {int ret, cpu;struct work_struct __percpu *works; -int hyperv_cpuhp_online; ret =hv_synic_alloc ();if (ret <0 )
Signature · 1 line
2.43.0
PATCH v3 2/6 x86/hyperv: move stimer cleanup to hv_machine_shutdown()
In reply to Jork LoeserMove hv_stimer_global_cleanup() from vmbus's hv_kexec_handler() to hv_machine_shutdown() in the platform code. This ensures stimer cleanup happens before the vmbus unload, which is required for root partition kexec to work correctly.
--- arch/x86/kernel/cpu/mshyperv.c | 8 ++++++-- drivers/hv/vmbus_drv.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +6 -2
@@ -237,8 +237,12 @@ void hv_remove_crash_handler(void)#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown (void ) { -if (kexec_in_progress && hv_kexec_handler) -hv_kexec_handler (); +if (kexec_in_progress) { +hv_stimer_global_cleanup (); + +if (hv_kexec_handler) +hv_kexec_handler (); + }/* * Call hv_cpu_die() on all the CPUs, otherwise later the hypervisor
drivers/hv/vmbus_drv.c +0 -1
@@ -2891,7 +2891,6 @@ static struct platform_driver vmbus_platform_driver = {static void hv_kexec_handler (void ) { -hv_stimer_global_cleanup ();vmbus_initiate_unload (false);/* Make sure conn_state is set as hv_synic_cleanup checks for it */ mb ();
Signature · 1 line
2.43.0
RE: [PATCH v3 2/6] x86/hyperv: move stimer cleanup to hv_machine_shutdown()
From: Jork Loeser <[email protected]> Sent: Tuesday, April 7, 2026 6:37 PM
Quoted 5 lines
Move
hv_stimer_global_cleanup()from vmbus'shv_kexec_handler()tohv_machine_shutdown()in the platform code. This ensures stimer cleanup happens before the vmbus unload, which is required for root partition kexec to work correctly.
I know I'm late to the party in commenting on this patch set. But I'll add my $.02 anyway on this patch and a couple others in the set.
I had difficulty understanding this patch's intent. The commit message says the intent is to make sure stimer cleanup happens before VMBus unload. But at first glance, the code in this patch doesn't change the ordering. It appears to be immaterial whether hv_stimer_global_cleanup() is called just before invoking hv_kexec_handler(), or as the first step of hv_kexec_handler().
But then I realized that hv_kexec_handler isn't set unless the VMBus driver is loaded and initialized, and that doesn't happen in the root partition. In the old code, stimer cleanup is dependent on the VMBus driver being loaded, and that's a wrong dependency, as stimer operation is independent of VMBus (almost -- there's the old non-direct mode stimer path that depends on the VMBus interrupt handler, which muddies the conceptual separation). So the patch does the right thing, but the commit message doesn't make the real reasoning clear. My feedback would be to improve the commit message.
Michael
Quoted 15 lines
Co-developed-by Anirudh Rayabharam <[email protected]>Signed-off-by Anirudh Rayabharam <[email protected]>Signed-off-by Jork Loeser <[email protected]>--- arch/x86/kernel/cpu/mshyperv.c | 8 ++++++-- drivers/hv/vmbus_drv.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-)arch/x86/kernel/cpu/mshyperv.c +0
-0@@ -237,8 +237,12 @@ void hv_remove_crash_handler(void)#ifdef CONFIG_KEXEC_CORE
arch/x86/kernel/cpu/mshyperv.c void hv_remove_crash_handler(void) · line 245
Quoted 10 lines
arch/x86/kernel/cpu/mshyperv.c +6
-2static void hv_machine_shutdown (void ) { -if (kexec_in_progress && hv_kexec_handler) -hv_kexec_handler (); +if (kexec_in_progress) { +hv_stimer_global_cleanup (); + +if (hv_kexec_handler) +hv_kexec_handler (); + }
Immediately following your code change is this code:
if (kexec_in_progress)
cpuhp_remove_state(CPUHP_AP_HYPERV_ONLINE);So with this change there are two "if (kexec_in_progress)" statements in a row. It's not wrong, but it looks like the patch wasn't fully integrated into the existing code. The cpuhp_remove_state() and the comment should be moved under the newly added "if (kexec_in_progress)" and the duplicate "if (kexec_in_progress)" can be dropped.
Michael
Quoted 18 lines
arch/x86/kernel/cpu/mshyperv.c +0
-0/* * Call hv_cpu_die() on all the CPUs, otherwise later the hypervisor drivers/hv/vmbus_drv.c +0
-2@@ -2891,7 +2891,6 @@ static struct platform_driver vmbus_platform_driver = {static void hv_kexec_handler (void ) { -hv_stimer_global_cleanup ();vmbus_initiate_unload (false);/* Make sure conn_state is set as hv_synic_cleanup checks for it */ mb (); --2.43.0
PATCH v3 3/6 x86/hyperv: Skip LP/VP creation on kexec
In reply to Jork LoeserAfter a kexec the logical processors and virtual processors already exist in the hypervisor because they were created by the previous kernel. Attempting to add them again causes either a BUG_ON or corrupted VP state leading to MCEs in the new kernel.
Add hv_lp_exists() to probe whether an LP is already present by calling HVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME. When it succeeds the LP exists and we skip the add-LP and create-VP loops entirely.
Also add hv_call_notify_all_processors_started() which informs the hypervisor that all processors are online. This is required after adding LPs (fresh boot) and is a no-op on kexec since we skip that path.
--- arch/x86/kernel/cpu/mshyperv.c | 7 +++++ drivers/hv/hv_proc.c | 47 ++++++++++++++++++++++++++++++++++ include/asm-generic/mshyperv.h | 10 ++++++++ include/hyperv/hvgdk_mini.h | 1 + include/hyperv/hvhdk_mini.h | 12 +++++++++ 5 files changed, 77 insertions(+)
arch/x86/kernel/cpu/mshyperv.c +7 -0
@@ -431,6 +431,10 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) }#ifdef CONFIG_X86_64 +/* If AP LPs exist, we are in a kexec'd kernel and VPs already exist */ +if (num_present_cpus () ==1 ||hv_lp_exists (1 )) +return ; +for_each_present_cpu (i) {if (i ==0 )continue ;
@@ -438,6 +442,9 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus)BUG_ON (ret); } + ret =hv_call_notify_all_processors_started (); +WARN_ON (ret); +for_each_present_cpu (i) {if (i ==0 )continue ;
drivers/hv/hv_proc.c +47 -0
50 lines not on this page · raw message
include/asm-generic/mshyperv.h +10 -0
@@ -347,6 +347,8 @@ bool hv_result_needs_memory(u64 status);int hv_deposit_memory_node (int node,u64 partition_id,u64 status);int hv_call_deposit_pages (int node,u64 partition_id,u32 num_pages);int hv_call_add_logical_proc (int node,u32 lp_index,u32 acpi_id); +int hv_call_notify_all_processors_started (void ); +bool hv_lp_exists (u32 lp_index);int hv_call_create_vp (int node,u64 partition_id,u32 vp_index,u32 flags);#else /* CONFIG_MSHV_ROOT */
@@ -366,6 +368,14 @@ static inline int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id) {return -EOPNOTSUPP ; } +static inline int hv_call_notify_all_processors_started (void ) +{ +return -EOPNOTSUPP ; +} +static inline bool hv_lp_exists (u32 lp_index) +{ +return false; +}static inline int hv_call_create_vp (int node,u64 partition_id,u32 vp_index,u32 flags) {return -EOPNOTSUPP ;
include/hyperv/hvgdk_mini.h +1 -0
@@ -435,6 +435,7 @@ union hv_vp_assist_msr_contents { /* HV_REGISTER_VP_ASSIST_PAGE *//* HV_CALL_CODE */ #define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE 0x0002#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST 0x0003 +#define HVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME 0x0004#define HVCALL_NOTIFY_LONG_SPIN_WAIT 0x0008#define HVCALL_SEND_IPI 0x000b#define HVCALL_ENABLE_VP_VTL 0x000f
include/hyperv/hvhdk_mini.h +12 -0
@@ -362,6 +362,7 @@ union hv_partition_event_input {enum hv_partition_event {HV_PARTITION_EVENT_ROOT_CRASHDUMP =2 , +HV_PARTITION_ALL_LOGICAL_PROCESSORS_STARTED =4 , };struct hv_input_notify_partition_event {
@@ -369,6 +370,17 @@ struct hv_input_notify_partition_event {union hv_partition_event_input input; } __packed; +struct hv_input_get_logical_processor_run_time { +u32 lp_index; +} __packed; + +struct hv_output_get_logical_processor_run_time { +u64 global_time; +u64 local_run_time; +u64 rsvdz0; +u64 hypervisor_time; +} __packed; +struct hv_lp_startup_status {u64 hv_status;u64 substatus1;
Signature · 1 line
2.43.0
RE: [PATCH v3 3/6] x86/hyperv: Skip LP/VP creation on kexec
From: Jork Loeser <[email protected]> Sent: Tuesday, April 7, 2026 6:37 PM
Quoted 6 lines
After a kexec the logical processors and virtual processors already exist in the hypervisor because they were created by the previous kernel. Attempting to add them again causes either a
BUG_ONor corrupted VP state leading to MCEs in the new kernel.
Quoted 8 lines
Add
hv_lp_exists()to probe whether an LP is already present by callingHVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME. When it succeeds the LP exists and we skip the add-LP and create-VP loops entirely.Also add
hv_call_notify_all_processors_started()which informs the hypervisor that all processors are online. This is required after adding LPs (fresh boot) and is a no-op on kexec since we skip that path.
Adding hv_call_notify_all_processors_started() seems like it should be a separate patch. And this paragraph in the commit message leaves me with questions: Is it really "required"? If it is, how does the existing upstream code ever work? Does the change need to be backported to stable kernels? If it isn't *really* required, what are the implications of not doing it?
Quoted 32 lines
Co-developed-by Anirudh Rayabharam <[email protected]>Signed-off-by Anirudh Rayabharam <[email protected]>Co-developed-by Stanislav Kinsburskii <[email protected]>Signed-off-by Stanislav Kinsburskii <[email protected]>Co-developed-by Mukesh Rathor <[email protected]>Signed-off-by Mukesh Rathor <[email protected]>Signed-off-by Jork Loeser <[email protected]>--- arch/x86/kernel/cpu/mshyperv.c | 7 +++++ drivers/hv/hv_proc.c | 47 ++++++++++++++++++++++++++++++++++ include/asm-generic/mshyperv.h | 10 ++++++++ include/hyperv/hvgdk_mini.h | 1 + include/hyperv/hvhdk_mini.h | 12 +++++++++ 5 files changed, 77 insertions(+)arch/x86/kernel/cpu/mshyperv.c +4
-0@@ -431,6 +431,10 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) }#ifdef CONFIG_X86_64 +/* If AP LPs exist, we are in a kexec'd kernel and VPs already exist */ +if (num_present_cpus () ==1 ||hv_lp_exists (1 )) +return ; +for_each_present_cpu (i) {if (i ==0 )continue ;
arch/x86/kernel/cpu/mshyperv.c static void __init hv_smp_prepare_cpus(unsigned int max_cpus) · line 450
Quoted 9 lines
arch/x86/kernel/cpu/mshyperv.c +3
-0@@ -438,6 +442,9 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus)BUG_ON (ret); } + ret =hv_call_notify_all_processors_started (); +WARN_ON (ret); +for_each_present_cpu (i) {if (i ==0 )continue ;
An observation: hv_smp_prepare_cpus() is getting to be a bit of a mess. It handles both the SNP case and the root case, which aren't really related. I could envision having hv_smp_prepare_cpus_for_snp() and hv_smp_prepare_cpus_for_root() in order to separate the two cases cleanly.
Then hv_smp_prepare_cpus_for_root() calls four functions in hv_proc.c, all of which require stubs for the case where MSHV root isn't being built. Better would be to move the root version of prepare CPUs functionality into a new function in hv_proc.c, and only have a stub for that single function. Three of the other four called functions could then become static. The #ifdef CONFIG_X86_64 could also go away since hv_proc.c is only built for x64.
I'll probably submit a separate patch to implement these suggested cleanups, unless someone else wants to do it first.
Michael
Quoted 129 lines
drivers/hv/hv_proc.c +47
-0@@ -239,3 +239,50 @@ int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags)return ret; }EXPORT_SYMBOL_GPL (hv_call_create_vp); + +int hv_call_notify_all_processors_started (void ) +{ +struct hv_input_notify_partition_event *input; +u64 status; +unsigned long irq_flags; +int ret =0 ; + +local_irq_save (irq_flags); + input = *this_cpu_ptr (hyperv_pcpu_input_arg); +memset (input,0 ,sizeof (*input)); + input->event =HV_PARTITION_ALL_LOGICAL_PROCESSORS_STARTED ; + status =hv_do_hypercall (HVCALL_NOTIFY_PARTITION_EVENT , + input,NULL ); +local_irq_restore (irq_flags); + +if (!hv_result_success (status)) { +hv_status_err (status,"\n" ); + ret =hv_result_to_errno (status); + } +return ret; +} + +bool hv_lp_exists (u32 lp_index) +{ +struct hv_input_get_logical_processor_run_time *input; +struct hv_output_get_logical_processor_run_time *output; +unsigned long flags; +u64 status; + +local_irq_save (flags); + input = *this_cpu_ptr (hyperv_pcpu_input_arg); + output = *this_cpu_ptr (hyperv_pcpu_output_arg); + + input->lp_index = lp_index; + status =hv_do_hypercall (HVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME , + input, output); +local_irq_restore (flags); + +if (!hv_result_success (status) && +hv_result (status) !=HV_STATUS_INVALID_LP_INDEX ) { +hv_status_err (status,"\n" ); +BUG (); + } + +return hv_result_success (status); +}include/asm-generic/mshyperv.h +10
-0@@ -347,6 +347,8 @@ bool hv_result_needs_memory(u64 status);int hv_deposit_memory_node (int node,u64 partition_id,u64 status);int hv_call_deposit_pages (int node,u64 partition_id,u32 num_pages);int hv_call_add_logical_proc (int node,u32 lp_index,u32 acpi_id); +int hv_call_notify_all_processors_started (void ); +bool hv_lp_exists (u32 lp_index);int hv_call_create_vp (int node,u64 partition_id,u32 vp_index,u32 flags);#else /* CONFIG_MSHV_ROOT */ @@ -366,6 +368,14 @@ static inline int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id) {return -EOPNOTSUPP ; } +static inline int hv_call_notify_all_processors_started (void ) +{ +return -EOPNOTSUPP ; +} +static inline bool hv_lp_exists (u32 lp_index) +{ +return false; +}static inline int hv_call_create_vp (int node,u64 partition_id,u32 vp_index,u32 flags) {return -EOPNOTSUPP ;include/hyperv/hvgdk_mini.h +0
-0@@ -435,6 +435,7 @@ union hv_vp_assist_msr_contents { /*
HV_REGISTER_VP_ASSIST_PAGE*/
/*HV_CALL_CODE*/
#defineHVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE0x0002
#defineHVCALL_FLUSH_VIRTUAL_ADDRESS_LIST0x0003include/hyperv/hvgdk_mini.h +1
-0+#define HVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME 0x0004#define HVCALL_NOTIFY_LONG_SPIN_WAIT 0x0008#define HVCALL_SEND_IPI 0x000b#define HVCALL_ENABLE_VP_VTL 0x000finclude/hyperv/hvhdk_mini.h +12
-1@@ -362,6 +362,7 @@ union hv_partition_event_input {enum hv_partition_event {HV_PARTITION_EVENT_ROOT_CRASHDUMP =2 , +HV_PARTITION_ALL_LOGICAL_PROCESSORS_STARTED =4 , };struct hv_input_notify_partition_event {@@ -369,6 +370,17 @@ struct hv_input_notify_partition_event {union hv_partition_event_input input; } __packed; +struct hv_input_get_logical_processor_run_time { +u32 lp_index; +} __packed; + +struct hv_output_get_logical_processor_run_time { +u64 global_time; +u64 local_run_time; +u64 rsvdz0; +u64 hypervisor_time; +} __packed; +struct hv_lp_startup_status {u64 hv_status;u64 substatus1; --2.43.0
Wei Liu
maintainerRe: [PATCH v3 3/6] x86/hyperv: Skip LP/VP creation on kexec
Quoted 16 lines · Michael Kelley
From: Jork Loeser <[email protected]> Sent: Tuesday, April 7, 2026 6:37 PM
Quoted 6 lines
After a kexec the logical processors and virtual processors already exist in the hypervisor because they were created by the previous kernel. Attempting to add them again causes either a
BUG_ONor corrupted VP state leading to MCEs in the new kernel.Quoted 8 lines
Add
hv_lp_exists()to probe whether an LP is already present by callingHVCALL_GET_LOGICAL_PROCESSOR_RUN_TIME. When it succeeds the LP exists and we skip the add-LP and create-VP loops entirely.Also add
hv_call_notify_all_processors_started()which informs the hypervisor that all processors are online. This is required after adding LPs (fresh boot) and is a no-op on kexec since we skip that path.
Quoted 6 lines
Adding
hv_call_notify_all_processors_started()seems like it should be a separate patch. And this paragraph in the commit message leaves me with questions: Is it really "required"? If it is, how does the existing upstream code ever work? Does the change need to be backported to stable kernels? If it isn't *really* required, what are the implications of not doing it?
It is complicated. If I remember correctly, we realized this call was absolutely needed if SEV-SNP host side support is enabled. If that support is not enabled, then things continue to work. I think it is the right thing to do to always make this call.
We don't need to backport this yet.
Wei
PATCH v3 4/6 mshv: limit SynIC management to MSHV-owned resources
In reply to Jork LoeserThe SynIC is shared between VMBus and MSHV. VMBus owns the message page (SIMP), event flags page (SIEFP), global enable (SCONTROL), and SINT2. MSHV adds SINT0, SINT5, and the event ring page (SIRBP).
Currently mshv_synic_cpu_init() redundantly enables SIMP, SIEFP, and SCONTROL that VMBus already configured, and mshv_synic_cpu_exit() disables all of them. This is wrong because MSHV can be torn down while VMBus is still active. In particular, a kexec reboot notifier tears down MSHV first. Disabling SCONTROL, SIMP, and SIEFP out from under VMBus causes its later cleanup to write SynIC MSRs while SynIC is disabled, which the hypervisor does not tolerate.
Restrict MSHV to managing only the resources it owns:
- SINT0, SINT5: mask on cleanup, unmask on init
- SIRBP: enable/disable as before
- SIMP, SIEFP, SCONTROL: leave to VMBus when it is active (L1VH and nested root partition); on a non-nested root partition VMBus doesn't run, so MSHV must enable/disable them
--- drivers/hv/mshv_synic.c | 142 ++++++++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 48 deletions(-)
drivers/hv/mshv_synic.c +94 -48
@@ -456,46 +456,72 @@ static int mshv_synic_cpu_init(unsigned int cpu)union hv_synic_siefp siefp;union hv_synic_sirbp sirbp;union hv_synic_sint sint; -union hv_synic_scontrol sctrl;struct hv_synic_pages *spages =this_cpu_ptr (synic_pages);struct hv_message_page **msg_page = &spages->hyp_synic_message_page;struct hv_synic_event_flags_page **event_flags_page = &spages->synic_event_flags_page;struct hv_synic_event_ring_page **event_ring_page = &spages->synic_event_ring_page; +/* VMBus runs on L1VH and nested root; it owns SIMP/SIEFP/SCONTROL */ +bool vmbus_active = !hv_root_partition () || hv_nested; -/* Setup the Synic's message page */ +/* +* Map the SYNIC message page. When VMBus is not active the +* hypervisor pre-provisions the SIMP GPA but may not set +* simp_enabled — enable it here. +*/ simp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIMP ); - simp.simp_enabled = true; +if (!vmbus_active) { + simp.simp_enabled = true; +hv_set_non_nested_msr (HV_MSR_SIMP , simp.as_uint64); + } *msg_page =memremap (simp.base_simp_gpa <<HV_HYP_PAGE_SHIFT ,HV_HYP_PAGE_SIZE ,MEMREMAP_WB );if (!(*msg_page)) -return -EFAULT ; + goto cleanup_simp; -hv_set_non_nested_msr (HV_MSR_SIMP , simp.as_uint64); - -/* Setup the Synic's event flags page */ +/* +* Map the event flags page. Same as SIMP: enable when +* VMBus is not active, already enabled by VMBus otherwise. +*/ siefp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIEFP ); - siefp.siefp_enabled = true; +if (!vmbus_active) { + siefp.siefp_enabled = true; +hv_set_non_nested_msr (HV_MSR_SIEFP , siefp.as_uint64); + } *event_flags_page =memremap (siefp.base_siefp_gpa <<PAGE_SHIFT ,PAGE_SIZE ,MEMREMAP_WB );if (!(*event_flags_page)) - goto cleanup; - -hv_set_non_nested_msr (HV_MSR_SIEFP , siefp.as_uint64); + goto cleanup_siefp;/* Setup the Synic's event ring page */ sirbp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIRBP ); - sirbp.sirbp_enabled = true; - *event_ring_page =memremap (sirbp.base_sirbp_gpa <<PAGE_SHIFT , -PAGE_SIZE ,MEMREMAP_WB ); -if (!(*event_ring_page)) - goto cleanup; +if (hv_root_partition ()) { + *event_ring_page =memremap (sirbp.base_sirbp_gpa <<PAGE_SHIFT , +PAGE_SIZE ,MEMREMAP_WB ); +if (!(*event_ring_page)) + goto cleanup_siefp; + }else { +/* +* On L1VH the hypervisor does not provide a SIRBP page. +* Allocate one and program its GPA into the MSR. +*/ + *event_ring_page = (struct hv_synic_event_ring_page *) +get_zeroed_page (GFP_KERNEL ); + +if (!(*event_ring_page)) + goto cleanup_siefp; + + sirbp.base_sirbp_gpa =virt_to_phys (*event_ring_page) + >>PAGE_SHIFT ; + } + + sirbp.sirbp_enabled = true;hv_set_non_nested_msr (HV_MSR_SIRBP , sirbp.as_uint64);if (mshv_sint_irq !=-1 )
@@ -518,28 +544,30 @@ static int mshv_synic_cpu_init(unsigned int cpu)hv_set_non_nested_msr (HV_MSR_SINT0 +HV_SYNIC_DOORBELL_SINT_INDEX , sint.as_uint64); -/* Enable global synic bit */ - sctrl.as_uint64 =hv_get_non_nested_msr (HV_MSR_SCONTROL ); - sctrl.enable =1 ; -hv_set_non_nested_msr (HV_MSR_SCONTROL , sctrl.as_uint64); +/* When VMBus is active it already enabled SCONTROL. */ +if (!vmbus_active) { +union hv_synic_scontrol sctrl; + + sctrl.as_uint64 =hv_get_non_nested_msr (HV_MSR_SCONTROL ); + sctrl.enable =1 ; +hv_set_non_nested_msr (HV_MSR_SCONTROL , sctrl.as_uint64); + }return 0 ; -cleanup: -if (*event_ring_page) { - sirbp.sirbp_enabled = false; -hv_set_non_nested_msr (HV_MSR_SIRBP , sirbp.as_uint64); -memunmap (*event_ring_page); - } -if (*event_flags_page) { +cleanup_siefp: +if (*event_flags_page) +memunmap (*event_flags_page); +if (!vmbus_active) { siefp.siefp_enabled = false;hv_set_non_nested_msr (HV_MSR_SIEFP , siefp.as_uint64); -memunmap (*event_flags_page); } -if (*msg_page) { +cleanup_simp: +if (*msg_page) +memunmap (*msg_page); +if (!vmbus_active) { simp.simp_enabled = false;hv_set_non_nested_msr (HV_MSR_SIMP , simp.as_uint64); -memunmap (*msg_page); }return -EFAULT ;
@@ -548,16 +576,15 @@ static int mshv_synic_cpu_init(unsigned int cpu)static int mshv_synic_cpu_exit (unsigned int cpu) {union hv_synic_sint sint; -union hv_synic_simp simp; -union hv_synic_siefp siefp;union hv_synic_sirbp sirbp; -union hv_synic_scontrol sctrl;struct hv_synic_pages *spages =this_cpu_ptr (synic_pages);struct hv_message_page **msg_page = &spages->hyp_synic_message_page;struct hv_synic_event_flags_page **event_flags_page = &spages->synic_event_flags_page;struct hv_synic_event_ring_page **event_ring_page = &spages->synic_event_ring_page; +/* VMBus runs on L1VH and nested root; it owns SIMP/SIEFP/SCONTROL */ +bool vmbus_active = !hv_root_partition () || hv_nested;/* Disable the interrupt */ sint.as_uint64 =hv_get_non_nested_msr (HV_MSR_SINT0 +HV_SYNIC_INTERCEPTION_SINT_INDEX );
@@ -574,28 +601,47 @@ static int mshv_synic_cpu_exit(unsigned int cpu)if (mshv_sint_irq !=-1 )disable_percpu_irq (mshv_sint_irq); -/* Disable Synic's event ring page */ +/* Disable SYNIC event ring page owned by MSHV */ sirbp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIRBP ); sirbp.sirbp_enabled = false; -hv_set_non_nested_msr (HV_MSR_SIRBP , sirbp.as_uint64); -memunmap (*event_ring_page); -/* Disable Synic's event flags page */ - siefp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIEFP ); - siefp.siefp_enabled = false; -hv_set_non_nested_msr (HV_MSR_SIEFP , siefp.as_uint64); +if (hv_root_partition ()) { +hv_set_non_nested_msr (HV_MSR_SIRBP , sirbp.as_uint64); +memunmap (*event_ring_page); + }else { + sirbp.base_sirbp_gpa =0 ; +hv_set_non_nested_msr (HV_MSR_SIRBP , sirbp.as_uint64); +free_page ((unsigned long )*event_ring_page); + } + +/* +* Release our mappings of the message and event flags pages. +* When VMBus is not active, we enabled SIMP/SIEFP — disable +* them. Otherwise VMBus owns the MSRs — leave them. +*/ memunmap (*event_flags_page); +if (!vmbus_active) { +union hv_synic_simp simp; +union hv_synic_siefp siefp; -/* Disable Synic's message page */ - simp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIMP ); - simp.simp_enabled = false; -hv_set_non_nested_msr (HV_MSR_SIMP , simp.as_uint64); + siefp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIEFP ); + siefp.siefp_enabled = false; +hv_set_non_nested_msr (HV_MSR_SIEFP , siefp.as_uint64); + + simp.as_uint64 =hv_get_non_nested_msr (HV_MSR_SIMP ); + simp.simp_enabled = false; +hv_set_non_nested_msr (HV_MSR_SIMP , simp.as_uint64); + }memunmap (*msg_page); -/* Disable global synic bit */ - sctrl.as_uint64 =hv_get_non_nested_msr (HV_MSR_SCONTROL ); - sctrl.enable =0 ; -hv_set_non_nested_msr (HV_MSR_SCONTROL , sctrl.as_uint64); +/* When VMBus is active it owns SCONTROL — leave it. */ +if (!vmbus_active) { +union hv_synic_scontrol sctrl; + + sctrl.as_uint64 =hv_get_non_nested_msr (HV_MSR_SCONTROL ); + sctrl.enable =0 ; +hv_set_non_nested_msr (HV_MSR_SCONTROL , sctrl.as_uint64); + }return 0 ; }
Signature · 1 line
2.43.0
PATCH v3 5/6 mshv: clean up SynIC state on kexec for L1VH
In reply to Jork LoeserThe reboot notifier that tears down the SynIC cpuhp state guards the cleanup with hv_root_partition(), so on L1VH (where hv_root_partition() is false) SINT0, SINT5, and SIRBP are never cleaned up before kexec. The kexec'd kernel then inherits stale unmasked SINTs and an enabled SIRBP pointing to freed memory.
Remove the hv_root_partition() guard so the cleanup runs for all parent partitions.
--- drivers/hv/mshv_synic.c | 3 --- 1 file changed, 3 deletions(-)
drivers/hv/mshv_synic.c +0 -3
@@ -719,9 +719,6 @@ mshv_unregister_doorbell(u64 partition_id, int doorbell_portid)static int mshv_synic_reboot_notify (struct notifier_block *nb,unsigned long code,void *unused) { -if (!hv_root_partition ()) -return 0 ; -cpuhp_remove_state (synic_cpuhp_online);return 0 ; }
Signature · 1 line
2.43.0
PATCH v3 6/6 mshv: unmap debugfs stats pages on kexec
In reply to Jork LoeserOn L1VH, debugfs stats pages are overlay pages: the kernel allocates them and registers the GPAs with the hypervisor via HVCALL_MAP_STATS_PAGE2. These overlay mappings persist in the hypervisor across kexec. If the kexec'd kernel reuses those physical pages, the hypervisor's overlay semantics cause a machine check exception.
Fix this by calling mshv_debugfs_exit() from the reboot notifier, which issues HVCALL_UNMAP_STATS_PAGE for each mapped stats page before kexec. This releases the overlay bindings so the physical pages can be safely reused. Guard mshv_debugfs_exit() against being called when init failed.
--- drivers/hv/mshv_debugfs.c | 7 ++++++- drivers/hv/mshv_synic.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/hv/mshv_debugfs.c +6 -1
@@ -674,8 +674,10 @@ int __init mshv_debugfs_init(void) mshv_debugfs =debugfs_create_dir ("mshv" ,NULL );if (IS_ERR (mshv_debugfs)) { + err =PTR_ERR (mshv_debugfs); + mshv_debugfs =NULL ;pr_err ("%s: failed to create debugfs directory\n" , __func__); -return PTR_ERR (mshv_debugfs); +return err; }if (hv_root_partition ()) {
@@ -710,6 +712,9 @@ int __init mshv_debugfs_init(void)void mshv_debugfs_exit (void ) { +if (!mshv_debugfs) +return ; +mshv_debugfs_parent_partition_remove ();if (hv_root_partition ()) {
drivers/hv/mshv_synic.c +1 -0
@@ -719,6 +719,7 @@ mshv_unregister_doorbell(u64 partition_id, int doorbell_portid)static int mshv_synic_reboot_notify (struct notifier_block *nb,unsigned long code,void *unused) { +mshv_debugfs_exit ();cpuhp_remove_state (synic_cpuhp_online);return 0 ; }
Signature · 1 line
2.43.0