WHPX support for Arm
v9 cover WHPX support for Arm
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v9)
Missing features:
- PSCI state sync with Hyper-V
- Interrupt controller save-restore
- SVE register sync
Known bugs:
- reboots when multiple cores are enabled are currently broken
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.
Known issues (outside of this patchset)
- Qemu on Windows seems to have regressed at least with the GTK backend in ways that broke virtio-gpu and ramfb, but this also affects TCG...
Note:
"target/arm/kvm: add constants for new PSCI versions" taken from the mailing list.
"accel/system: Introduce hwaccel_enabled() helper" taken from the mailing list, added here as part of this series to make it compilable as a whole.
"hw/arm: virt: add GICv2m for the case when ITS is not available" present in both the HVF vGIC and this series.
And another note:
Seems that unlike HVF there isn't direct correspondence between WHv registers and the actual register layout, so didn't do changes there to a sysreg.inc.
Updates since v8:
- Oopsie due to email provider ratelimiting.
Updates since v7:
- Oops, fixing bug in "hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS". Other commits are unchanged.
Updates since v6:
- Rebasing
- Fixing a bug in the GICv3+GICv2m case for ACPI table generation
- getting rid of the slots infrastructure for memory management
- Place the docs commit right after the "cleanly fail on attempt to run GICv3+GICv2m on an unsupported config" one as that's what switches ITS to a tristate.
- Fixing a build issue when getting rid of the arch-specific arm64 hvf-stub.
Updates since v5:
- Rebasing
- Address review comments
- Rework ITS enablement to a tristate
- On x86: move away from deprecated APIs to get/set APIC state
Updates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register sync
Updates since v3:
- Disabling SVE on WHPX
- Taking into account review comments incl:
- fixing x86 support
- reduce the amount of __x86_64__ checks in common code to the minimum (winhvemulation) which can be reduced even further down the road.
- generalize get_physical_address_range into something common between hvf and whpx
Updates since v2:
- Fixed up a rebase screwup for whpx-internal.h
- Fixed ID_AA64ISAR1_EL1 and ID_AA64ISAR2_EL1 feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variant
Updates since v1:
- Shutdowns and reboots
- MPIDR_EL1 register sync
- Fixing GICD_TYPER_LPIS value
- IPA size clamping
- -cpu host now implemented
Mohamed Mediouni (22):
qtest: hw/arm: virt: skip ACPI test for ITS off
hw/arm: virt: add GICv2m for the case when ITS is not available
tests: data: update AArch64 ACPI tables
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: add WHPX_INTERCEPT_DEBUG_TRAPS define
hw, target, accel: whpx: change apic_in_platform to kernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
docs: arm: update virt machine model description
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
MAINTAINERS: update maintainers for WHPX
whpx: apic: use non-deprecated APIs to control interrupt controller
state
Philippe Mathieu-Daudé (1):
accel/system: Introduce hwaccel_enabled() helper
Sebastian Ott (1):
target/arm/kvm: add constants for new PSCI versions
MAINTAINERS | 11 +-
accel/hvf/hvf-all.c | 7 +-
accel/meson.build | 1 +
accel/whpx/meson.build | 7 +
{target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +-
accel/whpx/whpx-common.c | 548 +++++++++
docs/system/arm/virt.rst | 10 +-
hw/arm/virt-acpi-build.c | 17 +-
hw/arm/virt.c | 70 +-
hw/i386/x86-cpu.c | 4 +-
hw/intc/arm_gicv3_common.c | 3 +
hw/intc/arm_gicv3_whpx.c | 249 ++++
hw/intc/meson.build | 1 +
include/hw/arm/virt.h | 6 +-
include/hw/boards.h | 3 +-
include/hw/intc/arm_gicv3_common.h | 3 +
include/system/hvf_int.h | 2 +
include/system/hw_accel.h | 13 +
.../whpx => include/system}/whpx-accel-ops.h | 4 +-
include/system/whpx-all.h | 20 +
include/system/whpx-common.h | 26 +
.../whpx => include/system}/whpx-internal.h | 23 +-
include/system/whpx.h | 4 +-
meson.build | 20 +-
target/arm/cpu.c | 3 +
target/arm/cpu64.c | 19 +-
target/arm/hvf-stub.c | 20 -
target/arm/hvf/hvf.c | 6 +-
target/arm/hvf_arm.h | 3 -
target/arm/kvm-consts.h | 2 +
target/arm/meson.build | 2 +-
target/arm/whpx/meson.build | 5 +
target/arm/whpx/whpx-all.c | 1018 +++++++++++++++++
target/arm/whpx/whpx-stub.c | 15 +
target/arm/whpx_arm.h | 17 +
target/i386/cpu-apic.c | 2 +-
target/i386/hvf/hvf.c | 11 +
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 569 +--------
target/i386/whpx/whpx-apic.c | 48 +-
tests/data/acpi/aarch64/virt/APIC.its_off | Bin 164 -> 188 bytes
41 files changed, 2146 insertions(+), 653 deletions(-)
create mode 100644 accel/whpx/meson.build
rename {target/i386 => accel}/whpx/whpx-accel-ops.c (96%)
create mode 100644 accel/whpx/whpx-common.c
create mode 100644 hw/intc/arm_gicv3_whpx.c
rename {target/i386/whpx => include/system}/whpx-accel-ops.h (92%)
create mode 100644 include/system/whpx-all.h
create mode 100644 include/system/whpx-common.h
rename {target/i386/whpx => include/system}/whpx-internal.h (89%)
delete mode 100644 target/arm/hvf-stub.c
create mode 100644 target/arm/whpx/meson.build
create mode 100644 target/arm/whpx/whpx-all.c
create mode 100644 target/arm/whpx/whpx-stub.c
create mode 100644 target/arm/whpx_arm.hSignature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 1/24 target/arm/kvm: add constants for new PSCI versions
From: Sebastian Ott <[email protected]>
Add constants for PSCI version 1_2 and 1_3.
--- target/arm/kvm-consts.h | 2 ++ 1 file changed, 2 insertions(+)
target/arm/kvm-consts.h +2 -0
@@ -97,6 +97,8 @@ MISMATCH_CHECK(QEMU_PSCI_1_0_FN_PSCI_FEATURES, PSCI_1_0_FN_PSCI_FEATURES);#define QEMU_PSCI_VERSION_0_2 0x00002#define QEMU_PSCI_VERSION_1_0 0x10000#define QEMU_PSCI_VERSION_1_1 0x10001 +#define QEMU_PSCI_VERSION_1_2 0x10002 +#define QEMU_PSCI_VERSION_1_3 0x10003MISMATCH_CHECK (QEMU_PSCI_0_2_RET_TOS_MIGRATION_NOT_REQUIRED ,PSCI_0_2_TOS_MP );/* We don't bother to check every possible version value */
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 2/24 accel/system: Introduce hwaccel_enabled() helper
In reply to Mohamed MediouniFrom: Philippe Mathieu-Daudé <[email protected]>
hwaccel_enabled() return whether any hardware accelerator is enabled.
--- include/system/hw_accel.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
include/system/hw_accel.h +13 -0
@@ -40,4 +40,17 @@ void cpu_synchronize_pre_loadvm(CPUState *cpu);void cpu_synchronize_post_reset (CPUState *cpu);void cpu_synchronize_post_init (CPUState *cpu); +/** +* hwaccel_enabled: +* +* Returns: %true if a hardware accelerator is enabled, %false otherwise. +*/ +static inline bool hwaccel_enabled (void ) +{ +return hvf_enabled () + ||kvm_enabled () + ||nvmm_enabled () + ||whpx_enabled (); +} +#endif /* QEMU_HW_ACCEL_H */
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 3/24 qtest: hw/arm: virt: skip ACPI test for ITS off
In reply to Mohamed Mediouni--- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
@@ -1 +1,2 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/APIC.its_off",
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 4/24 hw/arm: virt: add GICv2m for the case when ITS is not available
In reply to Mohamed MediouniOn Hypervisor.framework for macOS and WHPX for Windows, the provided environment is a GICv3 without ITS.
As such, support a GICv3 w/ GICv2m for that scenario.
--- hw/arm/virt-acpi-build.c | 4 +++- hw/arm/virt.c | 8 ++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +3 -1
@@ -959,7 +959,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data, memmap[VIRT_GIC_ITS ].base,8 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ } - }else { + } + +if (!(vms->gic_version !=VIRT_GIC_VERSION_2 && vms->its) && !vms->no_gicv3_with_gicv2m) {const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M ] +ARM_SPI_BASE ;/* 5.2.12.16 GIC MSI Frame Structure */
hw/arm/virt.c +8 -0
@@ -956,6 +956,8 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)if (vms->gic_version !=VIRT_GIC_VERSION_2 && vms->its) {create_its (vms); + }else if (vms->gic_version !=VIRT_GIC_VERSION_2 && !vms->no_gicv3_with_gicv2m) { +create_v2m (vms); }else if (vms->gic_version ==VIRT_GIC_VERSION_2 ) {create_v2m (vms); }
@@ -2447,6 +2449,8 @@ static void machvirt_init(MachineState *machine) vms->ns_el2_virt_timer_irq =ns_el2_virt_timer_present () && !vmc->no_ns_el2_virt_timer_irq; + vms->no_gicv3_with_gicv2m = vmc->no_gicv3_with_gicv2m; +fdt_add_timer_nodes (vms);fdt_add_cpu_nodes (vms);
@@ -3484,6 +3488,7 @@ static void virt_instance_init(Object *obj) vms->its = true;/* Allow ITS emulation if the machine version supports it */ vms->tcg_its = !vmc->no_tcg_its; + vms->no_gicv3_with_gicv2m = false;/* Default disallows iommu instantiation */ vms->iommu =VIRT_IOMMU_NONE ;
@@ -3536,9 +3541,12 @@ DEFINE_VIRT_MACHINE_AS_LATEST(10, 2)static void virt_machine_10_1_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_10_2_options (mc); mc->smbios_memory_device_size =2047 * TiB;compat_props_add (mc->compat_props, hw_compat_10_1, hw_compat_10_1_len); + vmc->no_gicv3_with_gicv2m = true; }DEFINE_VIRT_MACHINE (10 ,1 )
include/hw/arm/virt.h +2 -0
@@ -132,6 +132,7 @@ struct VirtMachineClass {bool no_cpu_topology;bool no_tcg_lpa2;bool no_ns_el2_virt_timer_irq; +bool no_gicv3_with_gicv2m;bool no_nested_smmu; };
@@ -180,6 +181,7 @@ struct VirtMachineState {char *oem_id;char *oem_table_id;bool ns_el2_virt_timer_irq; +bool no_gicv3_with_gicv2m;CXLState cxl_devices_state;bool legacy_smmuv3_present; };
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 5/24 tests: data: update AArch64 ACPI tables
In reply to Mohamed MediouniAfter the previous commit introducing GICv3 + GICv2m configurations, update the AArch64 ACPI table for the its=off case.
--- tests/data/acpi/aarch64/virt/APIC.its_off | Bin 164 -> 188 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-)
tests/data/acpi/aarch64/virt/APIC.its_off binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
@@ -1,2 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/APIC.its_off",
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 6/24 whpx: Move around files before introducing AArch64 support
In reply to Mohamed MediouniSwitch to a design where we can share whpx code between x86 and AArch64 when it makes sense to do so.
---
MAINTAINERS | 2 ++
accel/meson.build | 1 +
accel/whpx/meson.build | 6 ++++++
{target/i386 => accel}/whpx/whpx-accel-ops.c | 4 ++--
{target/i386/whpx => include/system}/whpx-accel-ops.h | 4 ++--
{target/i386/whpx => include/system}/whpx-internal.h | 5 +++--
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 4 ++--
target/i386/whpx/whpx-apic.c | 2 +-
9 files changed, 19 insertions(+), 10 deletions(-)
create mode 100644 accel/whpx/meson.build
rename {target/i386 => accel}/whpx/whpx-accel-ops.c (97%)
rename {target/i386/whpx => include/system}/whpx-accel-ops.h (92%)
rename {target/i386/whpx => include/system}/whpx-internal.h (98%)MAINTAINERS +2 -0
@@ -547,9 +547,11 @@ F: include/system/hvf_int.h WHPX CPUs M: Sunil Muthuswamy <[email protected]> S: Supported +F: accel/whpx/ F: target/i386/whpx/ F: accel/stubs/whpx-stub.c F: include/system/whpx.h +F: include/system/whpx-accel-ops.h MSHV M: Magnus Kulke <[email protected]>
accel/meson.build +1 -0
@@ -6,6 +6,7 @@ user_ss.add(files('accel-user.c')) subdir('tcg') if have_system subdir('hvf') + subdir('whpx') subdir('qtest') subdir('kvm') subdir('xen')
accel/whpx/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +whpx_ss = ss.source_set() +whpx_ss.add(files( + 'whpx-accel-ops.c', +)) + +specific_ss.add_all(when: 'CONFIG_WHPX', if_true: whpx_ss)
accel/whpx/whpx-accel-ops.c renamed from target/i386/whpx/whpx-accel-ops.c +2 -2
@@ -16,8 +16,8 @@#include "qemu/guest-random.h" #include "system/whpx.h" -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" static void *whpx_cpu_thread_fn (void *arg) {
include/system/whpx-accel-ops.h renamed from target/i386/whpx/whpx-accel-ops.h +2 -2
@@ -7,8 +7,8 @@* See the COPYING file in the top-level directory. */ -#ifndef TARGET_I386_WHPX_ACCEL_OPS_H -#define TARGET_I386_WHPX_ACCEL_OPS_H +#ifndef SYSTEM_WHPX_ACCEL_OPS_H +#define SYSTEM_WHPX_ACCEL_OPS_H #include "system/cpus.h"
include/system/whpx-internal.h renamed from target/i386/whpx/whpx-internal.h +3 -2
@@ -1,5 +1,6 @@ -#ifndef TARGET_I386_WHPX_INTERNAL_H -#define TARGET_I386_WHPX_INTERNAL_H +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SYSTEM_WHPX_INTERNAL_H +#define SYSTEM_WHPX_INTERNAL_H #include <windows.h> #include <winhvplatform.h>
target/i386/whpx/meson.build +0 -1
@@ -1,5 +1,4 @@ i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', 'whpx-apic.c', - 'whpx-accel-ops.c', ))
target/i386/whpx/whpx-all.c +2 -2
@@ -31,8 +31,8 @@#include "accel/accel-cpu-target.h" #include <winerror.h> -#include "whpx-internal.h" -#include "whpx-accel-ops.h" +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" #include <winhvplatform.h> #include <winhvemulation.h>
target/i386/whpx/whpx-apic.c +1 -1
@@ -18,7 +18,7 @@#include "hw/pci/msi.h" #include "system/hw_accel.h" #include "system/whpx.h" -#include "whpx-internal.h" +#include "system/whpx-internal.h" struct whpx_lapic_state { struct {
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 7/24 whpx: reshuffle common code
In reply to Mohamed MediouniSome code can be shared between x86_64 and arm64 WHPX. Do so as much as reasonable.
--- MAINTAINERS | 2 + accel/whpx/meson.build | 1 + accel/whpx/whpx-common.c | 562 +++++++++++++++++++++++++++++++++++ include/system/whpx-all.h | 20 ++ include/system/whpx-common.h | 21 ++ target/i386/whpx/whpx-all.c | 551 +--------------------------------- 6 files changed, 616 insertions(+), 541 deletions(-) create mode 100644 accel/whpx/whpx-common.c create mode 100644 include/system/whpx-all.h create mode 100644 include/system/whpx-common.h
MAINTAINERS +2 -0
@@ -552,6 +552,8 @@ F: target/i386/whpx/ F: accel/stubs/whpx-stub.c F: include/system/whpx.h F: include/system/whpx-accel-ops.h +F: include/system/whpx-common.h +F: include/system/whpx-internal.h MSHV M: Magnus Kulke <[email protected]>
accel/whpx/meson.build +1 -0
@@ -1,6 +1,7 @@ whpx_ss = ss.source_set() whpx_ss.add(files( 'whpx-accel-ops.c', + 'whpx-common.c' )) specific_ss.add_all(when: 'CONFIG_WHPX', if_true: whpx_ss)
accel/whpx/whpx-common.c new file +562 -0
562 lines not on this page · raw message
include/system/whpx-all.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SYSTEM_WHPX_ALL_H +#define SYSTEM_WHPX_ALL_H + +/* Called by whpx-common */ +int whpx_vcpu_run (CPUState *cpu); +void whpx_get_registers (CPUState *cpu); +void whpx_set_registers (CPUState *cpu,int level); +int whpx_accel_init (AccelState *as,MachineState *ms); +void whpx_cpu_instance_init (CPUState *cs); +HRESULT whpx_set_exception_exit_bitmap (UINT64 exceptions); +void whpx_apply_breakpoints ( +struct whpx_breakpoint_collection *breakpoints, +CPUState *cpu, +bool resuming); +void whpx_translate_cpu_breakpoints ( +struct whpx_breakpoints *breakpoints, +CPUState *cpu, +int cpu_breakpoint_count); +#endif
include/system/whpx-common.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SYSTEM_WHPX_COMMON_H +#define SYSTEM_WHPX_COMMON_H + +struct AccelCPUState { +WHV_EMULATOR_HANDLE emulator; +bool window_registered; +bool interruptable; +bool ready_for_pic_interrupt; +uint64_t tpr; +uint64_t apic_base; +bool interruption_pending; +/* Must be the last field as it may have a tail */ +WHV_RUN_VP_EXIT_CONTEXT exit_ctx; +}; + +int whpx_first_vcpu_starting (CPUState *cpu); +int whpx_last_vcpu_stopping (CPUState *cpu); +void whpx_memory_init (void ); +struct whpx_breakpoint *whpx_lookup_breakpoint_by_addr (uint64_t address); +#endif
target/i386/whpx/whpx-all.c +10 -541
639 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 8/24 whpx: ifdef out winhvemulation on non-x86_64
In reply to Mohamed Mediouniwinhvemulation is x86_64 only.
In the future, we might want to get rid of winhvemulation usage entirely.
--- accel/whpx/whpx-common.c | 14 ++++++++++++-- include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-)
accel/whpx/whpx-common.c +12 -2
@@ -41,7 +41,9 @@bool whpx_allowed;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform; +#ifdef __x86_64__static HMODULE hWinHvEmulation; +#endif struct whpx_state whpx_global;struct WHPDispatch whp_dispatch;
@@ -236,8 +238,10 @@ void whpx_destroy_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); +#ifdef __x86_64__AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); +#endif g_free (cpu->accel); }
@@ -412,8 +416,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else +g_assert_not_reached (); +#endif break ;case WINHV_PLATFORM_FNS_SUPPLEMENTAL :WHP_LOAD_LIB (WINHV_PLATFORM_DLL , hLib)
@@ -539,11 +547,11 @@ bool init_whp_dispatch(void)if (!load_whp_dispatch_fns (&hWinHvPlatform,WINHV_PLATFORM_FNS_DEFAULT )) { goto error; } - +#ifdef __x86_64__if (!load_whp_dispatch_fns (&hWinHvEmulation,WINHV_EMULATION_FNS_DEFAULT )) { goto error; } - +#endif assert (load_whp_dispatch_fns (&hWinHvPlatform,WINHV_PLATFORM_FNS_SUPPLEMENTAL )); whp_dispatch_initialized = true;
@@ -553,9 +561,11 @@ error:if (hWinHvPlatform) {FreeLibrary (hWinHvPlatform); } +#ifdef __x86_64__if (hWinHvEmulation) {FreeLibrary (hWinHvEmulation); } +#endif return false; }
include/system/whpx-common.h +2 -0
@@ -3,7 +3,9 @@#define SYSTEM_WHPX_COMMON_H struct AccelCPUState { +#ifdef __x86_64__WHV_EMULATOR_HANDLE emulator; +#endif bool window_registered;bool interruptable;bool ready_for_pic_interrupt;
include/system/whpx-internal.h +6 -1
@@ -4,8 +4,9 @@#include <windows.h> #include <winhvplatform.h> +#ifdef __x86_64__#include <winhvemulation.h> - +#endif typedef enum WhpxBreakpointState { WHPX_BP_CLEARED = 0, WHPX_BP_SET_PENDING,
@@ -98,12 +99,16 @@ void whpx_apic_get(DeviceState *s);/* Define function typedef */ LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE) +#ifdef __x86_64__ LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE) +#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL (WHP_DEFINE_TYPE) struct WHPDispatch { LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER) +#ifdef __x86_64__ LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER) +#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER) };
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 9/24 whpx: common: add WHPX_INTERCEPT_DEBUG_TRAPS define
In reply to Mohamed MediouniAs of why: WHPX on arm64 doesn't have debug trap support as of today.
Keep the exception bitmap interface for now - despite that being entirely unavailable on arm64 too.
--- accel/whpx/whpx-common.c | 2 +- include/system/whpx-common.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
accel/whpx/whpx-common.c +1 -1
@@ -123,7 +123,7 @@ int whpx_first_vcpu_starting(CPUState *cpu)* have one or more breakpoints enabled. Both require intercepting * the WHvX64ExceptionTypeBreakpointTrap exception. */ - exception_mask =1UL << WHvX64ExceptionTypeDebugTrapOrFault; + exception_mask =1UL <<WHPX_INTERCEPT_DEBUG_TRAPS ; }else {/* Let the guest handle all exceptions. */ exception_mask =0 ;
include/system/whpx-common.h +3 -0
@@ -20,4 +20,7 @@ int whpx_first_vcpu_starting(CPUState *cpu);int whpx_last_vcpu_stopping (CPUState *cpu);void whpx_memory_init (void );struct whpx_breakpoint *whpx_lookup_breakpoint_by_addr (uint64_t address); + +/* On x64: same as WHvX64ExceptionTypeDebugTrapOrFault */ +#define WHPX_INTERCEPT_DEBUG_TRAPS 1#endif
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v9 10/24 hw, target, accel: whpx: change apic_in_platform to kernel_irqchip
In reply to Mohamed MediouniChange terminology to match the KVM one, as APIC is x86-specific.
--- accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 4 ++-- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 2 +- include/system/whpx.h | 4 ++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-)
accel/whpx/whpx-accel-ops.c +1 -1
@@ -78,7 +78,7 @@ static void whpx_kick_vcpu_thread(CPUState *cpu)static bool whpx_vcpu_thread_is_idle (CPUState *cpu) { -return !whpx_apic_in_platform (); +return !whpx_irqchip_in_kernel (); }static void whpx_accel_ops_class_init (ObjectClass *oc,const void *data)
accel/whpx/whpx-common.c +2 -2
@@ -496,9 +496,9 @@ static const TypeInfo whpx_cpu_accel_type = {* Partition support */ -bool whpx_apic_in_platform (void ) +bool whpx_irqchip_in_kernel (void ) { -return whpx_global.apic_in_platform; +return whpx_global.kernel_irqchip; }static void whpx_accel_class_init (ObjectClass *oc,const void *data)
hw/i386/x86-cpu.c +2 -2
@@ -45,7 +45,7 @@ static void pic_irq_request(void *opaque, int irq, int level)trace_x86_pic_interrupt (irq, level);if (cpu_is_apic_enabled (cpu->apic_state) && !kvm_irqchip_in_kernel () && - !whpx_apic_in_platform ()) { + !whpx_irqchip_in_kernel ()) {CPU_FOREACH (cs) { cpu =X86_CPU (cs);if (apic_accept_pic_intr (cpu->apic_state)) {
@@ -71,7 +71,7 @@ int cpu_get_pic_interrupt(CPUX86State *env)X86CPU *cpu =env_archcpu (env);int intno; -if (!kvm_irqchip_in_kernel () && !whpx_apic_in_platform ()) { +if (!kvm_irqchip_in_kernel () && !whpx_irqchip_in_kernel ()) { intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno;
include/system/whpx-internal.h +1 -1
@@ -42,7 +42,7 @@ struct whpx_state {bool kernel_irqchip_allowed;bool kernel_irqchip_required; -bool apic_in_platform; +bool kernel_irqchip; };extern struct whpx_state whpx_global;
include/system/whpx.h +2 -2
@@ -26,10 +26,10 @@#ifdef CONFIG_WHPX_IS_POSSIBLE extern bool whpx_allowed;#define whpx_enabled () (whpx_allowed) -bool whpx_apic_in_platform (void ); +bool whpx_irqchip_in_kernel (void );#else /* !CONFIG_WHPX_IS_POSSIBLE */ #define whpx_enabled () 0 -#define whpx_apic_in_platform () (0) +#define whpx_irqchip_in_kernel () (0)#endif /* !CONFIG_WHPX_IS_POSSIBLE */ #endif /* QEMU_WHPX_H */
target/i386/cpu-apic.c +1 -1
@@ -32,7 +32,7 @@ APICCommonClass *apic_get_class(Error **errp) apic_type ="kvm-apic" ; }else if (xen_enabled ()) { apic_type ="xen-apic" ; - }else if (whpx_apic_in_platform ()) { + }else if (whpx_irqchip_in_kernel ()) { apic_type ="whpx-apic" ; }
target/i386/whpx/whpx-all.c +7 -7
@@ -607,7 +607,7 @@ void whpx_get_registers(CPUState *cpu) hr); } -if (whpx_apic_in_platform ()) { +if (whpx_irqchip_in_kernel ()) {/* * Fetch the TPR value from the emulated APIC. It may get overwritten * below with the value from CR8 returned by
@@ -749,7 +749,7 @@ void whpx_get_registers(CPUState *cpu)assert (idx ==RTL_NUMBER_OF (whpx_register_names)); -if (whpx_apic_in_platform ()) { +if (whpx_irqchip_in_kernel ()) {whpx_apic_get (x86_cpu->apic_state); }
@@ -1379,7 +1379,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) }/* Get pending hard interruption or replay one that was overwritten */ -if (!whpx_apic_in_platform ()) { +if (!whpx_irqchip_in_kernel ()) {if (!vcpu->interruption_pending && vcpu->interruptable && (env->eflags &IF_MASK )) {assert (!new_int.InterruptionPending);
@@ -1552,7 +1552,7 @@ int whpx_vcpu_run(CPUState *cpu)if (exclusive_step_mode ==WHPX_STEP_NONE ) {whpx_vcpu_process_async_events (cpu); -if (cpu->halted && !whpx_apic_in_platform ()) { +if (cpu->halted && !whpx_irqchip_in_kernel ()) { cpu->exception_index =EXCP_HLT ;qatomic_set (&cpu->exit_request, false);return 0 ;
@@ -1641,7 +1641,7 @@ int whpx_vcpu_run(CPUState *cpu)break ;case WHvRunVpExitReasonX64ApicEoi: -assert (whpx_apic_in_platform ()); +assert (whpx_irqchip_in_kernel ());ioapic_eoi_broadcast (vcpu->exit_ctx.ApicEoi.InterruptVector);break ;
@@ -2186,7 +2186,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } }else { - whpx->apic_in_platform = true; + whpx->kernel_irqchip = true; } }
@@ -2195,7 +2195,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) prop.ExtendedVmExits.X64MsrExit =1 ; prop.ExtendedVmExits.X64CpuidExit =1 ; prop.ExtendedVmExits.ExceptionExit =1 ; -if (whpx_apic_in_platform ()) { +if (whpx_irqchip_in_kernel ()) { prop.ExtendedVmExits.X64ApicInitSipiExitTrap =1 ; }
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 8 lines · Mohamed Mediouni
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v9)
Missing features:
- PSCI state sync with Hyper-V
- Interrupt controller save-restore
- SVE register sync
Quoted 8 lines
Known bugs:
- reboots when multiple cores are enabled are currently broken
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.Known issues (outside of this patchset)
- Qemu on Windows seems to have regressed at least with the GTK backend in ways that broke virtio-gpu and ramfb, but this also affects TCG...
FYI, only patches 1 to 10 seem to have made it to the list:
https://lore.kernel.org/qemu-devel/[email protected]/
thanks
-- PMM