Skip to content

whpx: i386: bug fixes, feature probing and CPUID

Mohamed Mediouni qemu-devel 12 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v12 Latest15 patches 0 repliesNew
  2. v1115 patches 0 repliesSuperseded
  3. v1014 patches 0 repliesSuperseded
Earlier versions · 9
VersionPostedPatchesRepliesStatus
v813 patches2 repliesSuperseded
v913 patches0 repliesSuperseded
v711 patches0 repliesSuperseded
v611 patches1 replySuperseded
v59 patches0 repliesSuperseded
v47 patches0 repliesSuperseded
v37 patches0 repliesSuperseded
v26 patches0 repliesSuperseded
v14 patches0 repliesSuperseded

Changes in v12 from the cover letter

- Fix for the interrupt priority path for the pic=off case.

Patches in v12 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15target/i386: emulate: include name of unhandled instructiontarget/i386/emulate/x86_emu.c+2 -20 replies
2/15whpx: i386: x2apic emulationtarget/i386/whpx/whpx-all.c+133 -10 replies
3/15whpx: i386: wire up feature probinginclude/system/whpx-internal.h target/i386/cpu.c target/i386/whpx/whpx-all.c +1 more+109 -40 replies
4/15whpx: i386: disable TbFlushHypercalls for emulated LAPICtarget/i386/whpx/whpx-all.c+6 -30 replies
5/15whpx: i386: enable x2apic by default for user-mode LAPICtarget/i386/whpx/whpx-all.c+7 -00 replies
6/15whpx: i386: reintroduce enlightenments for Windows 10accel/whpx/whpx-common.c include/system/whpx-internal.h target/arm/whpx/whpx-all.c +1 more+58 -90 replies
7/15whpx: i386: introduce proper cpuid supporttarget/i386/whpx/whpx-all.c+119 -40 replies
8/15whpx: i386: kernel-irqchip=off fixesinclude/system/whpx-common.h target/i386/whpx/whpx-all.c+7 -370 replies
9/15whpx: i386: use WHvX64RegisterCr8 only when kernel-irqchip=offtarget/i386/whpx/whpx-all.c+22 -150 replies
10/15whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabledtarget/i386/whpx/whpx-all.c+39 -300 replies
11/15whpx: i386: IO port fast path cleanuptarget/i386/whpx/whpx-all.c+13 -40 replies
12/15whpx: i386: disable enlightenments and LAPIC for isapctarget/i386/whpx/whpx-all.c+8 -00 replies
13/15whpx: i386: interrupt priority supporttarget/i386/whpx/whpx-all.c+20 -40 replies
14/15hw/intc: apic: disallow APIC reads when disabledhw/intc/apic.c+9 -00 replies
15/15whpx: i386: fix CPUID[1:EDX].APIC reportinginclude/system/whpx-common.h target/i386/whpx/whpx-all.c target/i386/whpx/whpx-apic.c+84 -220 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v12 yet.

Read the v12 thread

Cover letter [PATCH v12 00/15] whpx: i386: bug fixes, feature probing and CPUID

This is a supplemental update that includes
"whpx: i386: x2apic emulation for kernel-irqchip=off, feature probing" v4 unmodified.

This might be too big for QEMU 11.0 at this point though...

"whpx: i386: disable TbFlushHypercalls for emulated LAPIC" is a bugfix, and "target/i386: emulate: include name of unhandled instruction" is a debugging aid.

"whpx: i386: x2apic emulation" makes things slightly better for Windows 10 users. But I strongly recommend *not* relying on it when possible and using kernel-irqchip=on instead. On Windows 10 however that's more murky because PIC interrupt injection is broken (interrupts don't wake the vCPU from HLT) in that case.

"whpx: i386: wire up feature probing" is yet another commit adding a code path not used on Windows 10. It'll tell the user today which CPU features they set are incompatible with the hardware but it does not sync that to the CPUID view that the guest has.

And then another commit to enable x2apic emulation by default even for kernel-irqchip=off + re-introducing provided by QEMU enlightenments in a more functional form to signal that the x2apic can be used. I'm not aware of the actual vmware freq leaf being used though.

"whpx: x2apic emulation for kernel-irqchip=off follow-up" is rolled into this series.

"whpx: i386: reintroduce enlightenments for Windows 10" is a bugfix to make x2APIC work as intended on Windows 10 without emulating an IOMMU. *And* a massive improvement for Windows 10 hosts in performance for Linux guests due to using the right clocksource instead of HPET.

And dependent on this series so included, CPUID intercepts finally... However that's only supported starting from Windows 11/Server 2022.

Also ended up switching over Windows 10 to kernel-irqchip=off by default due to PIC interrupt injection being broken.

Old performance (or lack thereof...) numbers:

On a Ryzen 7 8700GE with a Windows 10 VM running with KVM in nested virt, with kernel-irqchip=off for the virt Alpine Linux x86_64 ISO (3.23.3) with -smp cores=2, boot times as reported through dmesg:

- QEMU 10.2: 83 seconds
- QEMU 10.2 with a single core: 18.1 seconds
- as of v6 of this series, x2apic forced off: 29 seconds
- as of v6 this series, out of the box: 18 seconds
- v6 with kernel-irqchip=on and EDK2: 16.5 seconds
- v6 with kernel-irqchip=off and EDK2: 9.5 seconds
- v6, and with 1 core instead of two: 12.6 seconds

In v7, the Windows 10 numbers are pretty much at parity with Windows 11 now.

And with this series on a Windows 11 VM on the same hardware:
- kernel-irqchip=on: 6.5 seconds
- kernel-irqchip=on, x2apic forced off: 7.6 seconds
- kernel-irqchip=off: 8.3 seconds
- hyperv=off,kernel-irqchip=off: 7.6 seconds... which is faster, so the absence of enlightenment support on Windows 10 doesn't explain things...

With kernel-irqchip=on on Windows 10, when booting with SeaBIOS, it gets stuck in syslinux due to PIC interrupt injection being broken there. That can be counted as an infinite boot time (?).

checkpatch false positives:

ERROR: spaces required around that '*' (ctx:WxV)
+ UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput))

Not a multiplication but a pointer reference.

ERROR: space prohibited after that '&' (ctx:ExW)

+                    & CPUID_7_0_EDX_CET_IBT) {
                     ^

ERROR: space prohibited after that '&' (ctx:ExW)

+                    & CPUID_7_0_ECX_CET_SHSTK) {
                     ^

Because it's multiline.

Changes in v12:

- Fix for the interrupt priority path for the pic=off case.

Changes in v11:
- None, forgot a commit while posting

Changes in v10:
- disallow APIC reads when the APIC is disabled
- fix CPUID[1:EDX].APIC reporting

Changes in v9:

- Oops, "if (irr == -1)" change (and cleanup)
to avoid an abort(). And think that I understand this a bit better now.

Changes in v8:

- Interrupt priority changes are back.
- Some CPUID fixes
- disable enlightenments and LAPIC for isapc

Changes in v7:

- Exposing VMware hypervisor identification when not using Hyper-V enlightenments and when the VMware frequency CPUID leaf isn't explictly disabled.

- Remove the interrupt priority logic as it has issues with PIC interrupts. Can be reintroduced later.

- -cpu max passing through CPUID info from Hyper-V
- fill xsave info

- OSXSAVE CPUID leaf reporting fix.

Changes in v6:

- kernel-irqchip=off fix: re-registering the interrupt window when the existing one has too low of a TPR value.

Folded into "whpx: i386: kernel-irqchip=off fixes".

- I/O port access fast path cleanup commit added at the end

The path relied on a side effect of whpx_get_reg instead of something cleaner.

- Use the CR8 register provided by the hypervisor only when kernel-irqchip=off. Rely on the APIC state synchronisation otherwise.

This fixes some register sync errors that surfaced when setting the TPR values properly.

Changes in v5/v1 with rename:

- kernel-irqchip=off fixes, notably making 64-bit Windows bootable
- switching over Windows 10 to kernel-irqchip=off by default

Changes in v4:

- Ugh for a revision sent quickly, unbreaking the arm64 build...
- and making checkpatch happier to some extent

Changes in v3:

- Fixing CPUID intercepts so that QEMU CPU models work fine now, instead of the partial intercept that was present in QEMU 10.2
- cleanups

Changes in v2:

- GCC warned when a variable name was re-used within a different (but overlapping) scope in the same function. It also warned with a -Werror=maybe-uninitialized for the MSR write case. Address those
- make the in-KVM enlightenments path available on Windows 11 too when -M hyperv=off.

Mohamed Mediouni (15):
target/i386: emulate: include name of unhandled instruction
whpx: i386: x2apic emulation
whpx: i386: wire up feature probing
whpx: i386: disable TbFlushHypercalls for emulated LAPIC
whpx: i386: enable x2apic by default for user-mode LAPIC
whpx: i386: reintroduce enlightenments for Windows 10
whpx: i386: introduce proper cpuid support
whpx: i386: kernel-irqchip=off fixes
whpx: i386: use WHvX64RegisterCr8 only when kernel-irqchip=off
whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabled
whpx: i386: IO port fast path cleanup
whpx: i386: disable enlightenments and LAPIC for isapc
whpx: i386: interrupt priority support
hw/intc: apic: disallow APIC reads when disabled
whpx: i386: fix CPUID[1:EDX].APIC reporting

 accel/whpx/whpx-common.c       |   2 +
 hw/intc/apic.c                 |   9 +
 include/system/whpx-common.h   |   2 +-
 include/system/whpx-internal.h |  10 +
 target/arm/whpx/whpx-all.c     |   1 +
 target/i386/cpu.c              |  25 ++
 target/i386/emulate/x86_emu.c  |   4 +-
 target/i386/whpx/whpx-all.c    | 601 +++++++++++++++++++++++++++------
 target/i386/whpx/whpx-apic.c   |  71 +++-
 target/i386/whpx/whpx-i386.h   |   4 +
 10 files changed, 615 insertions(+), 114 deletions(-)
 create mode 100644 target/i386/whpx/whpx-i386.h
Signature · 1 line
2.50.1 (Apple Git-155)