From: Mohamed Mediouni <mohamed@unpredictable.fr>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, Mohamed Mediouni <mohamed@unpredictable.fr>,
Pedro Barbuda <pbarbuda@microsoft.com>,
Peter Maydell <peter.maydell@linaro.org>,
Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>,
"Doug Cook (WINDOWS)" <dcook@microsoft.com>
Subject: [PULL 08/13] target/i386/whpx: handle processor reset
Date: Sun, 8 Nov 2026 02:53:58 -0700 [thread overview]
Message-ID: <20261108095403.70813-9-mohamed@unpredictable.fr> (raw)
In-Reply-To: <20261108095403.70813-1-mohamed@unpredictable.fr>
From: "Doug Cook (WINDOWS)" <dcook@microsoft.com>
WHPX is not properly handling processor reset:
- Does not reset partition, so several registers (e.g. Hypercall,
GuestOsId) carry values forward as "Locked" into the next session.
- Does not clear hypervisor-managed TSC deadline (live-lock).
- Does not re-arm the wait-for-SIPI trigger, so all CPUs start running
immediately after reset.
Some firmware may tolerate this, but OVMF does not. Typical result is
that boot hangs or ends in triple-fault, e.g.
qemu-system-x86_64: WHPX: Unexpected VP exit code 4
After this patch, I am able to boot to Windows desktop, reset, and boot
back to Windows desktop. Tried many times in sequence with no problems.
Used several different reset mechanisms (OS shutdown menu, external
"reset", watchdog reset) with no problems.
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/2402
Signed-off-by: Doug Cook <dcook@microsoft.com>
Reviewed-by: Mohamed Mediouni <mohamed@unpredictable.fr>
---
target/i386/whpx/whpx-all.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 65e56d32fa..12c6c3001e 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -541,6 +541,35 @@ void whpx_set_registers(CPUState *cpu, WHPXStateLevel level)
assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
+ /* Assumes that cpu_synchronize_all_post_reset() runs cpu 0 first. */
+ if (level == WHPX_LEVEL_RESET_STATE && cpu->cpu_index == 0) {
+ hr = whp_dispatch.WHvResetPartition(whpx->partition);
+ if (FAILED(hr)) {
+ error_report("WHPX: Failed to reset partition, hr=%08lx", hr);
+ }
+ }
+
+ /* Reset hypervisor-owned TSC deadline. */
+ if (level == WHPX_LEVEL_RESET_STATE) {
+ WHV_REGISTER_VALUE tsc_deadline = {};
+
+ whpx_set_reg(cpu, WHvX64RegisterTscDeadline, tsc_deadline);
+ }
+
+ /*
+ * Re-arm partition's wait-for-SIPI state.
+ * whpx_vcpu_run() ignores cpu->halted, depends on SIPI for this.
+ * This must follow WHvResetPartition.
+ */
+ if (level == WHPX_LEVEL_RESET_STATE && whpx_irqchip_in_kernel()) {
+ WHV_REGISTER_VALUE activity = {};
+
+ whpx_get_reg(cpu, WHvRegisterInternalActivityState, &activity);
+ activity.InternalActivity.StartupSuspend = !cpu_is_bsp(x86_cpu);
+ activity.InternalActivity.HaltSuspend = 0;
+ whpx_set_reg(cpu, WHvRegisterInternalActivityState, activity);
+ }
+
/*
* Following MSRs have side effects on the guest or are too heavy for
* runtime. Limit them to full state update.
--
2.54.0 (Apple Git-157)
next prev parent reply other threads:[~2026-11-08 9:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-08 9:53 [PULL 00/13] Whpx fix 0 patches Mohamed Mediouni
2026-11-08 9:53 ` [PULL 01/13] target/i386/whpx: fix VMX capability MSR values Mohamed Mediouni
2026-11-08 9:53 ` [PULL 02/13] target/i386/whpx: whpx_get_xsave_state error handling Mohamed Mediouni
2026-11-08 9:53 ` [PULL 03/13] whpx: i386: get APIC state before VM save Mohamed Mediouni
2026-11-08 9:53 ` [PULL 04/13] whpx: i386: fix TPR encodings for local APIC Mohamed Mediouni
2026-11-08 9:53 ` [PULL 05/13] whpx: i386: save/restore xss Mohamed Mediouni
2026-11-08 9:53 ` [PULL 06/13] whpx: i386: make nested virtualisation init failure non-fatal Mohamed Mediouni
2026-11-08 9:53 ` [PULL 07/13] whpx: i386: avoid updating hflags for vmexits Mohamed Mediouni
2026-11-08 9:53 ` Mohamed Mediouni [this message]
2026-11-08 9:53 ` [PULL 09/13] target/arm/whpx: handle processor reset Mohamed Mediouni
2026-11-08 9:54 ` [PULL 10/13] whpx: i386: forward the dynamic EBX of CPUID[0xD] sub-leaves 0 and 1, not 1 and 2 Mohamed Mediouni
2026-11-08 9:54 ` [PULL 11/13] whpx: i386: do not require ProcessorFeaturesBanks on legacy Windows Mohamed Mediouni
2026-11-08 9:54 ` [PULL 12/13] whpx: i386: fall back to xAPIC when the MSR exit bitmap is unavailable Mohamed Mediouni
2026-11-08 9:54 ` [PULL 13/13] whpx: i386: also save debug registers Mohamed Mediouni
2026-11-08 19:01 ` [PULL 00/13] Whpx fix 0 patches Alex Bennée
2026-11-09 0:41 ` Mohamed Mediouni
-- strict thread matches above, loose matches on Subject: below --
2026-11-09 0:40 [PULL 00/13] whpx: QEMU 11.2 pull request Mohamed Mediouni
2026-11-09 0:41 ` [PULL 08/13] target/i386/whpx: handle processor reset Mohamed Mediouni
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=20261108095403.70813-9-mohamed@unpredictable.fr \
--to=mohamed@unpredictable.fr \
--cc=dcook@microsoft.com \
--cc=pbarbuda@microsoft.com \
--cc=peter.maydell@linaro.org \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.