WHPX support for Arm
v13 cover WHPX support for Arm
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.
Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.
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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windows x86_64 build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.
Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine model
Updates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PR
Updates since v9:
- Adding partition reset on the reboot side of things...
Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
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
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
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPX
Philippe Mathieu-Daudé (1):
accel/system: Introduce hwaccel_enabled() helper
Sebastian Ott (1):
target/arm/kvm: add constants for new PSCI versions
MAINTAINERS | 6 +
accel/hvf/hvf-all.c | 7 +-
accel/meson.build | 1 +
accel/stubs/whpx-stub.c | 1 +
accel/whpx/meson.build | 7 +
{target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +-
accel/whpx/whpx-common.c | 536 +++++++++
docs/system/arm/virt.rst | 13 +-
hw/arm/virt-acpi-build.c | 16 +-
hw/arm/virt.c | 140 ++-
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 | 8 +-
include/hw/core/boards.h | 3 +-
include/hw/intc/arm_gicv3_common.h | 3 +
include/system/hvf_int.h | 5 +
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 | 25 +-
include/system/whpx.h | 5 +-
meson.build | 20 +-
target/arm/cpu.c | 3 +
target/arm/cpu64.c | 17 +-
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 | 1020 +++++++++++++++++
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
42 files changed, 2215 insertions(+), 648 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 (88%)
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 v13 1/28 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 v13 2/28 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 v13 3/28 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 v13 4/28 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 | 5 ++++- hw/arm/virt.c | 16 +++++++++++++++- include/hw/arm/virt.h | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-)
hw/arm/virt-acpi-build.c +4 -1
@@ -960,7 +960,10 @@ 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 +15 -1
@@ -959,6 +959,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); }
@@ -2444,6 +2446,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);
@@ -3488,6 +3492,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 ;
@@ -3533,10 +3538,19 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_0_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) +static void virt_machine_10_2_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); + + vmc->no_gicv3_with_gicv2m = true; +virt_machine_11_0_options (mc); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 2) +DEFINE_VIRT_MACHINE(10, 2)static void virt_machine_10_1_options (MachineClass *mc) {
include/hw/arm/virt.h +2 -0
@@ -130,6 +130,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; };
@@ -178,6 +179,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 v13 5/28 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 v13 6/28 hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS
In reply to Mohamed MediouniSwitch its to a tristate.
Windows Hypervisor Platform's vGIC doesn't support ITS. Deal with this by reporting to the user and exiting.
Regular configuration: GICv3 + ITS
New default configuration with WHPX: GICv3 with GICv2m
And its=off explicitly for the newest machine version: GICv3 + GICv2m
--- hw/arm/virt-acpi-build.c | 14 ++++++------ hw/arm/virt.c | 46 +++++++++++++++++++++++++++++++--------- include/hw/arm/virt.h | 4 +++- 3 files changed, 46 insertions(+), 18 deletions(-)
hw/arm/virt-acpi-build.c +7 -7
@@ -473,7 +473,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) nb_nodes = num_smmus +1 ;/* RC and SMMUv3 */ rc_mapping_count = rc_smmu_idmaps_len; -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * Knowing the ID ranges from the RC to the SMMU, it's possible to * determine the ID ranges from RC that go directly to ITS.
@@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) rc_mapping_count += rc_its_idmaps->len; } }else { -if (vms->its) { +if (virt_is_its_enabled (vms)) { nb_nodes =2 ;/* RC and ITS */ rc_mapping_count =1 ;/* Direct map to ITS */ }else {
@@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data,IORT_NODE_OFFSET ,4 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* Table 12 ITS Group Format */ build_append_int_noprefix (table_data,0 /* ITS Group */ ,1 );/* Type */ node_size =20 /* fixed header size */ +4 /* 1 GIC ITS Identifier */ ;
@@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)int smmu_mapping_count, offset_to_id_array;int irq = sdev->irq; -if (vms->its) { +if (virt_is_its_enabled (vms)) { smmu_mapping_count =1 ;/* ITS Group node */ offset_to_id_array =SMMU_V3_ENTRY_SIZE ;/* Just after the header */ }else {
@@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS.
@@ -946,7 +946,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length)
@@ -962,7 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (!(vms->gic_version !=VIRT_GIC_VERSION_2 && vms->its) +if (!(vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) && !vms->no_gicv3_with_gicv2m) {const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M ] +ARM_SPI_BASE ;
hw/arm/virt.c +36 -10
90 lines not on this page · raw message
include/hw/arm/virt.h +3 -1
@@ -147,7 +147,7 @@ struct VirtMachineState {bool highmem_ecam;bool highmem_mmio;bool highmem_redists; -bool its; +OnOffAuto its;bool tcg_its;bool virt;bool ras;
@@ -216,4 +216,6 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms) vms->highmem_redists) ? 2 : 1; } +bool virt_is_its_enabled (VirtMachineState *vms); +#endif /* QEMU_ARM_VIRT_H */
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v13 06/28] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS
Quoted 98 lines · Mohamed Mediouni
Switch its to a tristate.
Windows Hypervisor Platform's vGIC doesn't support ITS. Deal with this by reporting to the user and exiting.
Regular configuration: GICv3 + ITS
New default configuration with WHPX: GICv3 with GICv2m
And its=off explicitly for the newest machine version: GICv3 + GICv2mSigned-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- hw/arm/virt-acpi-build.c | 14 ++++++------ hw/arm/virt.c | 46 +++++++++++++++++++++++++++++++--------- include/hw/arm/virt.h | 4 +++- 3 files changed, 46 insertions(+), 18 deletions(-)hw/arm/virt-acpi-build.c +7
-7@@ -473,7 +473,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) nb_nodes = num_smmus +1 ;/* RC and SMMUv3 */ rc_mapping_count = rc_smmu_idmaps_len; -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * Knowing the ID ranges from the RC to the SMMU, it's possible to * determine the ID ranges from RC that go directly to ITS. @@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) rc_mapping_count += rc_its_idmaps->len; } }else { -if (vms->its) { +if (virt_is_its_enabled (vms)) { nb_nodes =2 ;/* RC and ITS */ rc_mapping_count =1 ;/* Direct map to ITS */ }else {@@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data,IORT_NODE_OFFSET ,4 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* Table 12 ITS Group Format */ build_append_int_noprefix (table_data,0 /* ITS Group */ ,1 );/* Type */ node_size =20 /* fixed header size */ +4 /* 1 GIC ITS Identifier */ ;@@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)int smmu_mapping_count, offset_to_id_array;int irq = sdev->irq; -if (vms->its) { +if (virt_is_its_enabled (vms)) { smmu_mapping_count =1 ;/* ITS Group node */ offset_to_id_array =SMMU_V3_ENTRY_SIZE ;/* Just after the header */ }else {@@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS. @@ -946,7 +946,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } -if (vms->its) { +if (virt_is_its_enabled (vms)) {/* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -962,7 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (!(vms->gic_version !=VIRT_GIC_VERSION_2 && vms->its) +if (!(vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) && !vms->no_gicv3_with_gicv2m) {const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M ] +ARM_SPI_BASE ;hw/arm/virt.c +1
-1@@ -737,7 +737,7 @@ static void create_its(VirtMachineState *vms) {DeviceState *dev; -assert (vms->its); +assert (virt_is_its_enabled (vms));if (!kvm_irqchip_in_kernel () && !vms->tcg_its) {/* * Do nothing if ITS is neither supported by the host nor emulated by
hw/arm/virt.c static void create_its(VirtMachineState *vms) · line 754
Quoted 9 lines
hw/arm/virt.c +6
-0@@ -746,6 +746,15 @@ static void create_its(VirtMachineState *vms)return ; } +if (whpx_enabled () && vms->tcg_its) { +/* +* Signal to the user when ITS is neither supported by the host +* nor emulated by the machine. +*/ +info_report ("ITS not supported on WHPX." );
This use of info_report() is unusual. Any other configuration problems are reported with error_report() in this file. Please maintain consistency.
Quoted 97 lines
hw/arm/virt.c +29
-9+exit (1 ); + } + dev =qdev_new (its_class_name ()); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic),@@ -957,7 +966,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)fdt_add_gic_node (vms); -if (vms->gic_version !=VIRT_GIC_VERSION_2 && vms->its) { +if (vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) {create_its (vms); }else if (vms->gic_version !=VIRT_GIC_VERSION_2 && !vms->no_gicv3_with_gicv2m) {create_v2m (vms);@@ -2699,18 +2708,34 @@ static void virt_set_highmem_mmio_size(Object *obj, Visitor *v, extended_memmap[VIRT_HIGH_PCIE_MMIO ].size = size; } -static bool virt_get_its (Object *obj,Error **errp) +bool virt_is_its_enabled (VirtMachineState *vms) +{ +if (vms->its ==ON_OFF_AUTO_OFF ) { +return false; + } +if (vms->its ==ON_OFF_AUTO_AUTO ) { +if (whpx_enabled ()) { +return false; + } + } +return true; +} + +static void virt_get_its (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); +OnOffAuto its = vms->its; -return vms->its; +visit_type_OnOffAuto (v, name, &its, errp); } -static void virt_set_its (Object *obj,bool value,Error **errp) +static void virt_set_its (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); - vms->its = value; +visit_type_OnOffAuto (v, name, &vms->its, errp); }static bool virt_get_dtb_randomness (Object *obj,Error **errp)@@ -3427,8 +3452,9 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)"guest CPU which implements the ARM " "Memory Tagging Extension"); -object_class_property_add_bool (oc,"its" , virt_get_its, - virt_set_its); +object_class_property_add (oc,"its" ,"OnOffAuto" , + virt_get_its, virt_set_its, +NULL ,NULL );object_class_property_set_description (oc,"its" ,"Set on/off to enable/disable " "ITS instantiation" );@@ -3488,8 +3514,8 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; -/* Default allows ITS instantiation */ - vms->its = true; +/* Default allows ITS instantiation if available */ + vms->its =ON_OFF_AUTO_AUTO ;/* Allow ITS emulation if the machine version supports it */ vms->tcg_its = !vmc->no_tcg_its; vms->no_gicv3_with_gicv2m = false;include/hw/arm/virt.h +3
-1@@ -147,7 +147,7 @@ struct VirtMachineState {bool highmem_ecam;bool highmem_mmio;bool highmem_redists; -bool its; +OnOffAuto its;bool tcg_its;bool virt;bool ras;@@ -216,4 +216,6 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms) vms->highmem_redists) ? 2 : 1; } +bool virt_is_its_enabled (VirtMachineState *vms); +#endif /* QEMU_ARM_VIRT_H */
Re: [PATCH v13 06/28] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS
Quoted 95 lines · Akihiko Odaki
Quoted 94 lines · Mohamed Mediouni
Switch its to a tristate.
Windows Hypervisor Platform's vGIC doesn't support ITS. Deal with this by reporting to the user and exiting.
Regular configuration: GICv3 + ITS
New default configuration with WHPX: GICv3 with GICv2m
And its=off explicitly for the newest machine version: GICv3 + GICv2mSigned-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>---
hw/arm/virt-acpi-build.c| 14 ++++++------
hw/arm/virt.c | 46 +++++++++++++++++++++++++++++++--------- include/hw/arm/virt.h | 4 +++-3 files changed, 46 insertions(+), 18 deletions(-)hw/arm/virt-acpi-build.c +0
-0@@ -473,7 +473,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
nb_nodes=num_smmus+ 1; /* RC and SMMUv3 */rc_mapping_count=rc_smmu_idmaps_len;
- if (vms->its) {
+ if (virt_is_its_enabled(vms)) {
/*
* Knowing the ID ranges from the RC to the SMMU, it's possible to
* determine the ID ranges from RC that go directly to ITS.hw/arm/virt-acpi-build.c +1
-1@@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) rc_mapping_count += rc_its_idmaps->len; } } else { - if (vms->its) { + if (virt_is_its_enabled(vms)) {
nb_nodes= 2; /* RC and ITS */rc_mapping_count= 1; /* Direct map to ITS */ } else {hw/arm/virt-acpi-build.c +0
-0@@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_append_int_noprefix(table_data, IORT_NODE_OFFSET, 4);
build_append_int_noprefix(table_data, 0, 4); /* Reserved */
- if (vms->its) {
+ if (virt_is_its_enabled(vms)) {
/* Table 12 ITS Group Format */build_append_int_noprefix(table_data, 0 /* ITS Group */, 1); /* Type */node_size= 20 /* fixed header size */ + 4 /* 1 GIC ITS Identifier */;hw/arm/virt-acpi-build.c +1
-1@@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) int smmu_mapping_count, offset_to_id_array; int irq = sdev->irq; - if (vms->its) { + if (virt_is_its_enabled(vms)) {
smmu_mapping_count= 1; /* ITS Group node */offset_to_id_array=SMMU_V3_ENTRY_SIZE; /* Just after the header */ } else {hw/arm/virt-acpi-build.c +2
-2@@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } - if (vms->its) { + if (virt_is_its_enabled(vms)) { /** Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS. @@ -946,7 +946,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - if (vms->its) { + if (virt_is_its_enabled(vms)) { /** ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length)
hw/arm/virt-acpi-build.c +1
-1@@ -962,7 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } - if (!(vms->gic_version != VIRT_GIC_VERSION_2 && vms->its) + if (!(vms->gic_version != VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) && !vms->no_gicv3_with_gicv2m) { const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE;hw/arm/virt.c +0
-1@@ -737,7 +737,7 @@ static void create_its(VirtMachineState *vms) { DeviceState *dev; - assert(vms->its);
Quoted 8 lines
hw/arm/virt.c static void create_its(VirtMachineState *vms) · line 748
Quoted 8 lines
hw/arm/virt.c +2
-0+ assert(virt_is_its_enabled(vms)); if (!kvm_irqchip_in_kernel() && !vms->tcg_its) { /** Do nothing if ITS is neither supported by the host nor emulated by @@ -746,6 +746,15 @@ static void create_its(VirtMachineState *vms) return; } + if (whpx_enabled() && vms->tcg_its) {
The check of vms->tcg_its is apparently extraneous and should be removed.
tcg_its is a compatibility flag that tells not to emulate ITS when kvm is enabled for old machine versions and has nothing to do with whpx. Having vms->tcg_its in the condition lets the machine create ITS for old machine versions even if whpx is enabled.
ITS should be disabled whenever whpx is enabled since "ITS is neither supported by the host nor emulated by the machine" as the following comment points out.
Quoted 101 lines
hw/arm/virt.c static void create_its(VirtMachineState *vms) · line 754
Quoted 5 lines
hw/arm/virt.c +5
-0+ /* + * Signal to the user when ITS is neither supported by the host + * nor emulated by the machine. + */ + info_report("ITS not supported on WHPX.");This use of
info_report()is unusual. Any other configuration problems are reported witherror_report()in this file. Please maintain consistency.Quoted 92 lines
hw/arm/virt.c +4
-1+ exit(1); + } + dev = qdev_new(its_class_name()); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic),@@ -957,7 +966,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) fdt_add_gic_node(vms); - if (vms->gic_version != VIRT_GIC_VERSION_2 && vms->its) { + if (vms->gic_version != VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) { create_its(vms); } else if (vms->gic_version != VIRT_GIC_VERSION_2 && !vms- >no_gicv3_with_gicv2m) {
create_v2m(vms);hw/arm/virt.c +20
-4@@ -2699,18 +2708,34 @@ static void virt_set_highmem_mmio_size(Object *obj, Visitor *v, extended_memmap[VIRT_HIGH_PCIE_MMIO].size = size; } -static bool virt_get_its (Object *obj,Error **errp) +bool virt_is_its_enabled (VirtMachineState *vms) +{ + if (vms->its == ON_OFF_AUTO_OFF) { + return false; + } + if (vms->its == ON_OFF_AUTO_AUTO) { + if (whpx_enabled()) { + return false; + } + } + return true; +} + +static void virt_get_its (Object *obj,Visitor *v,const char *name, + void *opaque, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); + OnOffAuto its = vms->its; - return vms->its; + visit_type_OnOffAuto(v, name, &its, errp); } -static void virt_set_its (Object *obj,bool value,Error **errp) +static void virt_set_its (Object *obj,Visitor *v,const char *name, + void *opaque, Error **errp) { VirtMachineState *vms = VIRT_MACHINE(obj); - vms->its = value; + visit_type_OnOffAuto(v, name, &vms->its, errp); } static bool virt_get_dtb_randomness(Object *obj, Error **errp)@@ -3427,8 +3452,9 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)"guest CPU which implements the ARM " "Memory Tagging Extension"); - object_class_property_add_bool(oc, "its",
virt_get_its,
-virt_set_its);
+ object_class_property_add(oc, "its", "OnOffAuto",
+virt_get_its,virt_set_its,
+ NULL, NULL);
object_class_property_set_description(oc, "its",
"Set on/off to enable/ disable " "ITS instantiation");hw/arm/virt.c +2
-2@@ -3488,8 +3514,8 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; - /* Default allows ITS instantiation */ - vms->its = true; + /* Default allows ITS instantiation if available */ + vms->its = ON_OFF_AUTO_AUTO; /* Allow ITS emulation if the machine version supports it */ vms->tcg_its = !vmc->no_tcg_its; vms->no_gicv3_with_gicv2m = false;include/hw/arm/virt.h +3
-1@@ -147,7 +147,7 @@ struct VirtMachineState { bool highmem_ecam; bool highmem_mmio; bool highmem_redists; - bool its; + OnOffAuto its; bool tcg_its; bool virt; bool ras;@@ -216,4 +216,6 @@ static inline intvirt_gicv3_redist_region_count (VirtMachineState *vms) vms->highmem_redists) ? 2 : 1; } +bool virt_is_its_enabled (VirtMachineState *vms); + #endif /* QEMU_ARM_VIRT_H */
PATCH v13 7/28 hw: arm: virt: rework MSI-X configuration
In reply to Mohamed MediouniIntroduce a -M msi= argument to be able to control MSI-X support independently from ITS, as part of supporting GICv3 + GICv2m platforms.
Remove vms->its as it's no longer needed after that change.
--- hw/arm/virt-acpi-build.c | 3 +- hw/arm/virt.c | 110 ++++++++++++++++++++++++++++++++------- include/hw/arm/virt.h | 4 +- 3 files changed, 94 insertions(+), 23 deletions(-)
hw/arm/virt-acpi-build.c +1 -2
@@ -962,8 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (!(vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) - && !vms->no_gicv3_with_gicv2m) { +if (virt_is_gicv2m_enabled (vms)) {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 +90 -20
160 lines not on this page · raw message
include/hw/arm/virt.h +3 -1
@@ -101,6 +101,8 @@ typedef enum VirtIOMMUType {typedef enum VirtMSIControllerType {VIRT_MSI_CTRL_NONE , +/* This value is overriden at runtime.*/ +VIRT_MSI_CTRL_AUTO ,VIRT_MSI_CTRL_GICV2M ,VIRT_MSI_CTRL_ITS , }VirtMSIControllerType ;
@@ -147,7 +149,6 @@ struct VirtMachineState {bool highmem_ecam;bool highmem_mmio;bool highmem_redists; -OnOffAuto its;bool tcg_its;bool virt;bool ras;
@@ -217,5 +218,6 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms) }bool virt_is_its_enabled (VirtMachineState *vms); +bool virt_is_gicv2m_enabled (VirtMachineState *vms);#endif /* QEMU_ARM_VIRT_H */
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v13 07/28] hw: arm: virt: rework MSI-X configuration
Quoted 63 lines · Mohamed Mediouni
Introduce a -M msi= argument to be able to control MSI-X support independently from ITS, as part of supporting GICv3 + GICv2m platforms.
Remove
vms->itsas it's no longer needed after that change.Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- hw/arm/virt-acpi-build.c | 3 +- hw/arm/virt.c | 110 ++++++++++++++++++++++++++++++++------- include/hw/arm/virt.h | 4 +- 3 files changed, 94 insertions(+), 23 deletions(-)hw/arm/virt-acpi-build.c +1
-2@@ -962,8 +962,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (!(vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) - && !vms->no_gicv3_with_gicv2m) { +if (virt_is_gicv2m_enabled (vms)) {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 +10
-8@@ -966,12 +966,12 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)fdt_add_gic_node (vms); -if (vms->gic_version !=VIRT_GIC_VERSION_2 &&virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms)) {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 ) { + }else if (virt_is_gicv2m_enabled (vms)) {create_v2m (vms); + }else { + vms->msi_controller =VIRT_MSI_CTRL_NONE ; } }@@ -2710,32 +2710,95 @@ static void virt_set_highmem_mmio_size(Object *obj, Visitor *v,bool virt_is_its_enabled (VirtMachineState *vms) { -if (vms->its ==ON_OFF_AUTO_OFF ) { +switch (vms->msi_controller) { +case VIRT_MSI_CTRL_NONE :return false; - } -if (vms->its ==ON_OFF_AUTO_AUTO ) { -if (whpx_enabled ()) { +case VIRT_MSI_CTRL_ITS : +return true; +case VIRT_MSI_CTRL_GICV2M : +return false;
hw/arm/virt.c static void virt_set_highmem_mmio_size(Object *obj, Visitor *v, · line 2729
Quoted 10 lines
hw/arm/virt.c +8
-0+case VIRT_MSI_CTRL_AUTO : +if (whpx_enabled () &&whpx_irqchip_in_kernel ()) { +return false; + } +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) {return false; } +return true; +default : +return false;
This "default" is better to be removed. Modern compilers can emit warnings when a switch statement is not exhaustive. The default label is not just redundant, but prevents compilers to emit such a warning.
Quoted 24 lines
hw/arm/virt.c +13
-5} -return true; } -static void virt_get_its (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) +bool virt_is_gicv2m_enabled (VirtMachineState *vms) +{ +switch (vms->msi_controller) { +case VIRT_MSI_CTRL_NONE : +return false; +default : +return !virt_is_its_enabled (vms); + } +} + +static char *virt_get_msi (Object *obj,Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); -OnOffAuto its = vms->its; +const char *val; -visit_type_OnOffAuto (v, name, &its, errp); +switch (vms->msi_controller) {
hw/arm/virt.c static void virt_set_highmem_mmio_size(Object *obj, Visitor *v, · line 2758
Quoted 10 lines
hw/arm/virt.c +10
-0+case VIRT_MSI_CTRL_NONE : + val ="off" ; +break ; +case VIRT_MSI_CTRL_ITS : + val ="its" ; +break ; +case VIRT_MSI_CTRL_GICV2M : + val ="gicv2m" ; +break ; +default :
It is better to have "case VIRT_MSI_CTRL_AUTO" instead of "default" for consistency with virt_is_its_enabled() and also to enable the compiler warning I mentioned earlier.
Quoted 117 lines
hw/arm/virt.c +49
-7+ val ="auto" ; +break ; + } +return g_strdup (val); } -static void virt_set_its (Object *obj,Visitor *v,const char *name, -void *opaque,Error **errp) +static void virt_set_msi (Object *obj,const char *value,Error **errp) +{ +ERRP_GUARD (); +VirtMachineState *vms =VIRT_MACHINE (obj); + +if (!strcmp (value,"auto" )) { + vms->msi_controller =VIRT_MSI_CTRL_AUTO ;/* Will be overriden later */ + }else if (!strcmp (value,"its" )) { + vms->msi_controller =VIRT_MSI_CTRL_ITS ; + }else if (!strcmp (value,"gicv2m" )) { + vms->msi_controller =VIRT_MSI_CTRL_GICV2M ; + }else if (!strcmp (value,"none" )) { + vms->msi_controller =VIRT_MSI_CTRL_NONE ; + }else { +error_setg (errp,"Invalid msi value" ); +error_append_hint (errp,"Valid values are auto, gicv2m, its, off\n" ); + } +} + +static bool virt_get_its (Object *obj,Error **errp) {VirtMachineState *vms =VIRT_MACHINE (obj); -visit_type_OnOffAuto (v, name, &vms->its, errp); +return virt_is_its_enabled (vms); +} + +static void virt_set_its (Object *obj,bool value,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +if (value) { + vms->msi_controller =VIRT_MSI_CTRL_ITS ; + }else if (vms->no_gicv3_with_gicv2m) { + vms->msi_controller =VIRT_MSI_CTRL_NONE ; + }else { + vms->msi_controller =VIRT_MSI_CTRL_GICV2M ; + } }static bool virt_get_dtb_randomness (Object *obj,Error **errp)@@ -3062,6 +3125,8 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, db_start = base_memmap[VIRT_GIC_V2M ].base; db_end = db_start + base_memmap[VIRT_GIC_V2M ].size -1 ;break ; +case VIRT_MSI_CTRL_AUTO : +g_assert_not_reached (); } resv_prop_str = g_strdup_printf("0x%"PRIx64":0x%"PRIx64":%u", db_start, db_end,@@ -3452,13 +3517,18 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)"guest CPU which implements the ARM " "Memory Tagging Extension"); -object_class_property_add (oc,"its" ,"OnOffAuto" , - virt_get_its, virt_set_its, -NULL ,NULL ); +object_class_property_add_bool (oc,"its" , virt_get_its, + virt_set_its);object_class_property_set_description (oc,"its" ,"Set on/off to enable/disable " "ITS instantiation" ); +object_class_property_add_str (oc,"msi" , virt_get_msi, + virt_set_msi); +object_class_property_set_description (oc,"msi" , +"Set MSI settings. " +"Valid values are auto/gicv2m/its/off" ); +object_class_property_add_bool (oc,"dtb-randomness" , virt_get_dtb_randomness, virt_set_dtb_randomness);@@ -3515,7 +3585,7 @@ static void virt_instance_init(Object *obj) vms->highmem_redists = true;/* Default allows ITS instantiation if available */ - vms->its =ON_OFF_AUTO_AUTO ; + vms->msi_controller =VIRT_MSI_CTRL_AUTO ;/* Allow ITS emulation if the machine version supports it */ vms->tcg_its = !vmc->no_tcg_its; vms->no_gicv3_with_gicv2m = false;include/hw/arm/virt.h +3
-1@@ -101,6 +101,8 @@ typedef enum VirtIOMMUType {typedef enum VirtMSIControllerType {VIRT_MSI_CTRL_NONE , +/* This value is overriden at runtime.*/ +VIRT_MSI_CTRL_AUTO ,VIRT_MSI_CTRL_GICV2M ,VIRT_MSI_CTRL_ITS , }VirtMSIControllerType ;@@ -147,7 +149,6 @@ struct VirtMachineState {bool highmem_ecam;bool highmem_mmio;bool highmem_redists; -OnOffAuto its;bool tcg_its;bool virt;bool ras;@@ -217,5 +218,6 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms) }bool virt_is_its_enabled (VirtMachineState *vms); +bool virt_is_gicv2m_enabled (VirtMachineState *vms);#endif /* QEMU_ARM_VIRT_H */
PATCH v13 8/28 hw: arm: virt-acpi-build: add temporary hack to match existing behavior
In reply to Mohamed MediouniIn the prior Qemu ACPI table handling, GICv2 configurations had vms->its=1... That's broken.
Match that assumption to match the existing ACPI tables that have been shipping for quite a while.
And see what to do for older releases. Likely don't want this to be carried around indefinitely.
--- hw/arm/virt-acpi-build.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/arm/virt-acpi-build.c +5 -5
@@ -473,7 +473,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) nb_nodes = num_smmus +1 ;/* RC and SMMUv3 */ rc_mapping_count = rc_smmu_idmaps_len; -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) || vms->gic_version ==2 ) {/* * Knowing the ID ranges from the RC to the SMMU, it's possible to * determine the ID ranges from RC that go directly to ITS.
@@ -484,7 +484,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) rc_mapping_count += rc_its_idmaps->len; } }else { -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) || vms->gic_version ==2 ) { nb_nodes =2 ;/* RC and ITS */ rc_mapping_count =1 ;/* Direct map to ITS */ }else {
@@ -499,7 +499,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data,IORT_NODE_OFFSET ,4 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) || vms->gic_version ==2 ) {/* Table 12 ITS Group Format */ build_append_int_noprefix (table_data,0 /* ITS Group */ ,1 );/* Type */ node_size =20 /* fixed header size */ +4 /* 1 GIC ITS Identifier */ ;
@@ -518,7 +518,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)int smmu_mapping_count, offset_to_id_array;int irq = sdev->irq; -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) || vms->gic_version ==2 ) { smmu_mapping_count =1 ;/* ITS Group node */ offset_to_id_array =SMMU_V3_ENTRY_SIZE ;/* Just after the header */ }else {
@@ -611,7 +611,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) || vms->gic_version ==2 ) {/* * Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS.
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 9/28 docs: arm: update virt machine model description
In reply to Mohamed MediouniUpdate the documentation to match current QEMU.
Remove the mention of pre-2.7 machine models as those aren't provided anymore.
--- docs/system/arm/virt.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
docs/system/arm/virt.rst +8 -5
@@ -41,9 +41,10 @@ The virt board supports: - User-creatable SMMUv3 devices (see below for example) - hotpluggable DIMMs - hotpluggable NVDIMMs -- An MSI controller (GICv2M or ITS). GICv2M is selected by default along - with GICv2. ITS is selected by default with GICv3 (>= virt-2.7). Note - that ITS is not modeled in TCG mode. +- An MSI controller (GICv2m or ITS). + - When using a GICv3, ITS is selected by default when available on the platform. + - If using a GICv2 or when ITS is not available or disabled, a GICv2m is provided by default instead. + - Before virt-11.0, when using a GICv3 without the ITS, a GICv2m is not provided. - 32 virtio-mmio transport devices - running guests using the KVM accelerator on aarch64 hardware - large amounts of RAM (at least 255GB, and more if using highmem)
@@ -167,9 +168,11 @@ gic-version with TCG this is currently ``3`` if ``virtualization`` is ``off`` and ``4`` if ``virtualization`` is ``on``, but this may change in future) +msi + Set ``auto``/``gicv2m``/``its``/``none`` to control MSI controller configuration. The default is ``auto``. + its - Set ``on``/``off`` to enable/disable ITS instantiation. The default is ``on`` - for machine types later than ``virt-2.7``. + Set ``on``/``off``/``auto`` to control ITS instantiation. The default is ``auto``. iommu Set the IOMMU type to create for the guest. Valid values are:
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 10/28 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 | 6 ++++--
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 4 ++--
target/i386/whpx/whpx-apic.c | 2 +-
9 files changed, 20 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 (97%)MAINTAINERS +2 -0
@@ -550,9 +550,11 @@ WHPX CPUs M: Pedro Barbuda <[email protected]> M: Mohamed Mediouni <[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 +4 -2
@@ -1,11 +1,13 @@ -#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> #include <winhvemulation.h> #include "hw/i386/apic.h" +#include "exec/vaddr.h" typedef enum WhpxBreakpointState { WHPX_BP_CLEARED = 0,
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 v13 11/28 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 | 558 +++++++++++++++++++++++++++++++++++ include/system/whpx-all.h | 20 ++ include/system/whpx-common.h | 21 ++ target/i386/whpx/whpx-all.c | 551 +--------------------------------- 6 files changed, 612 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
@@ -555,6 +555,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 +558 -0
558 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 v13 12/28 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
@@ -37,7 +37,9 @@bool whpx_allowed;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform; +#ifdef HOST_X86_64 static HMODULE hWinHvEmulation; +#endif struct whpx_state whpx_global;struct WHPDispatch whp_dispatch;
@@ -232,8 +234,10 @@ void whpx_destroy_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); +#ifdef HOST_X86_64 AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); +#endif g_free (cpu->accel); }
@@ -408,8 +412,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef HOST_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)
@@ -535,11 +543,11 @@ bool init_whp_dispatch(void)if (!load_whp_dispatch_fns (&hWinHvPlatform,WINHV_PLATFORM_FNS_DEFAULT )) { goto error; } - +#ifdef HOST_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;
@@ -549,9 +557,11 @@ error:if (hWinHvPlatform) {FreeLibrary (hWinHvPlatform); } +#ifdef HOST_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 HOST_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 HOST_X86_64 #include <winhvemulation.h> - +#endif #include "hw/i386/apic.h" #include "exec/vaddr.h"
@@ -101,12 +102,16 @@ void whpx_apic_get(APICCommonState *s);/* Define function typedef */ LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE) +#ifdef HOST_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 HOST_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 v13 13/28 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
@@ -119,7 +119,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 v13 14/28 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.
And move out whpx_irqchip_in_kernel() to make it usable from common code even when not compiling with WHPX support.
--- accel/stubs/whpx-stub.c | 1 + accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 10 +--------- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 1 - include/system/whpx.h | 5 +++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 8 files changed, 16 insertions(+), 23 deletions(-)
accel/stubs/whpx-stub.c +1 -0
@@ -10,3 +10,4 @@#include "system/whpx.h" bool whpx_allowed; +bool whpx_irqchip_in_kernel;
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 +1 -9
@@ -35,6 +35,7 @@#include <winhvplatformdefs.h> bool whpx_allowed; +bool whpx_irqchip_in_kernel;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform;#ifdef HOST_X86_64
@@ -488,15 +489,6 @@ static const TypeInfo whpx_cpu_accel_type = { .abstract = true, }; -/* -* Partition support -*/ - -bool whpx_apic_in_platform (void ) -{ -return whpx_global.apic_in_platform; -} -static void whpx_accel_class_init (ObjectClass *oc,const void *data) {AccelClass *ac =ACCEL_CLASS (oc);
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 +0 -1
@@ -45,7 +45,6 @@ struct whpx_state {bool kernel_irqchip_allowed;bool kernel_irqchip_required; -bool apic_in_platform; };extern struct whpx_state whpx_global;
include/system/whpx.h +3 -2
@@ -25,11 +25,12 @@#ifdef CONFIG_WHPX_IS_POSSIBLE extern bool whpx_allowed; +extern bool whpx_irqchip_in_kernel;#define whpx_enabled () (whpx_allowed) -bool whpx_apic_in_platform (void ); +#define whpx_irqchip_in_kernel () (whpx_irqchip_in_kernel)#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);
@@ -1553,7 +1553,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 ;
@@ -1642,7 +1642,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 ;
@@ -2187,7 +2187,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } }else { - whpx->apic_in_platform = true; + whpx_irqchip_in_kernel = true; } }
@@ -2196,7 +2196,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)
PATCH v13 15/28 whpx: interrupt controller support
In reply to Mohamed Mediouni--- hw/arm/virt.c | 3 + hw/intc/arm_gicv3_common.c | 3 + hw/intc/arm_gicv3_whpx.c | 239 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 249 insertions(+) create mode 100644 hw/intc/arm_gicv3_whpx.c
hw/arm/virt.c +3 -0
@@ -49,6 +49,7 @@#include "system/tcg.h" #include "system/kvm.h" #include "system/hvf.h" +#include "system/whpx.h" #include "system/qtest.h" #include "system/system.h" #include "hw/core/loader.h"
@@ -2117,6 +2118,8 @@ static void finalize_gic_version(VirtMachineState *vms)/* KVM w/o kernel irqchip can only deal with GICv2 */ gics_supported |=VIRT_GIC_VERSION_2_MASK ; accel_name ="KVM with kernel-irqchip=off" ; + }else if (whpx_enabled ()) { + gics_supported |=VIRT_GIC_VERSION_3_MASK ; }else if (tcg_enabled () ||hvf_enabled () ||qtest_enabled ()) { gics_supported |=VIRT_GIC_VERSION_2_MASK ;if (module_object_class_by_name ("arm-gicv3" )) {
hw/intc/arm_gicv3_common.c +3 -0
@@ -32,6 +32,7 @@#include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" #include "system/kvm.h" +#include "system/whpx.h" static void gicv3_gicd_no_migration_shift_bug_post_load (GICv3State *cs)
@@ -663,6 +664,8 @@ const char *gicv3_class_name(void) {if (kvm_irqchip_in_kernel ()) {return "kvm-arm-gicv3" ; + }else if (whpx_enabled ()) { +return TYPE_WHPX_GICV3 ; }else {if (kvm_enabled ()) {error_report ("Userspace GICv3 is not supported with KVM" );
hw/intc/arm_gicv3_whpx.c new file +239 -0
239 lines not on this page · raw message
hw/intc/meson.build +1 -0
@@ -41,6 +41,7 @@ specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) +specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
include/hw/intc/arm_gicv3_common.h +3 -0
@@ -313,6 +313,9 @@ typedef struct ARMGICv3CommonClass ARMGICv3CommonClass;DECLARE_OBJ_CHECKERS (GICv3State, ARMGICv3CommonClass,ARM_GICV3_COMMON ,TYPE_ARM_GICV3_COMMON ) +/* Types for GICv3 kernel-irqchip */ +#define TYPE_WHPX_GICV3 "whpx-arm-gicv3" +struct ARMGICv3CommonClass {/*< private >*/ SysBusDeviceClass parent_class;
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v13 15/28] whpx: interrupt controller support
Quoted 113 lines · Mohamed Mediouni
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- hw/arm/virt.c | 3 + hw/intc/arm_gicv3_common.c | 3 + hw/intc/arm_gicv3_whpx.c | 239 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 249 insertions(+)create mode 100644
hw/intc/arm_gicv3_whpx.chw/arm/virt.c +3
-0@@ -49,6 +49,7 @@#include "system/tcg.h" #include "system/kvm.h" #include "system/hvf.h" +#include "system/whpx.h" #include "system/qtest.h" #include "system/system.h" #include "hw/core/loader.h" @@ -2117,6 +2118,8 @@ static void finalize_gic_version(VirtMachineState *vms)/* KVM w/o kernel irqchip can only deal with GICv2 */ gics_supported |=VIRT_GIC_VERSION_2_MASK ; accel_name ="KVM with kernel-irqchip=off" ; + }else if (whpx_enabled ()) { + gics_supported |=VIRT_GIC_VERSION_3_MASK ; }else if (tcg_enabled () ||hvf_enabled () ||qtest_enabled ()) { gics_supported |=VIRT_GIC_VERSION_2_MASK ;if (module_object_class_by_name ("arm-gicv3" )) {hw/intc/arm_gicv3_common.c +3
-0@@ -32,6 +32,7 @@#include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" #include "system/kvm.h" +#include "system/whpx.h" static void gicv3_gicd_no_migration_shift_bug_post_load (GICv3State *cs)@@ -663,6 +664,8 @@ const char *gicv3_class_name(void) {if (kvm_irqchip_in_kernel ()) {return "kvm-arm-gicv3" ; + }else if (whpx_enabled ()) { +return TYPE_WHPX_GICV3 ; }else {if (kvm_enabled ()) {error_report ("Userspace GICv3 is not supported with KVM" );hw/intc/arm_gicv3_whpx.c new file +53
-0@@ -0,0 +1,239 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* ARM Generic Interrupt Controller using HVF platform support +* +* Copyright (c) 2025 Mohamed Mediouni +* Based on vGICv3 KVM code by Pavel Fedin +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/intc/arm_gicv3_common.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "system/runstate.h" +#include "system/whpx.h" +#include "system/whpx-internal.h" +#include "gicv3_internal.h" +#include "vgic_common.h" +#include "qom/object.h" +#include "target/arm/cpregs.h" + +#include "hw/arm/bsa.h" +#include <winhvplatform.h> +#include <winhvplatformdefs.h> +#include <winnt.h> + +struct WHPXARMGICv3Class { +ARMGICv3CommonClass parent_class; +DeviceRealize parent_realize; +ResettablePhases parent_phases; +}; + +OBJECT_DECLARE_TYPE (GICv3State, WHPXARMGICv3Class,WHPX_GICV3 ) + +/* TODO: Implement GIC state save-restore */ +static void whpx_gicv3_check (GICv3State *s) +{ +} + +static void whpx_gicv3_put (GICv3State *s) +{ +whpx_gicv3_check (s); +} + +static void whpx_gicv3_get (GICv3State *s) +{ +} + +static void whpx_gicv3_set_irq (void *opaque,int irq,int level) +{ +struct whpx_state *whpx = &whpx_global; +
hw/intc/arm_gicv3_whpx.c line 63
Quoted 10 lines
hw/intc/arm_gicv3_whpx.c new file +10
-0+GICv3State *s = opaque; +if (irq > s->num_irq) { +return ; + } +WHV_INTERRUPT_TYPE interrupt_type = WHvArm64InterruptTypeFixed; +WHV_INTERRUPT_CONTROL interrupt_control = { + interrupt_type = WHvArm64InterruptTypeFixed, + .RequestedVector =GIC_INTERNAL + irq, + .InterruptControl.Asserted = level + };
You probably missed one of my comments for a previous version:
Quoted 7 lines
I think this should be:
WHV_INTERRUPT_CONTROLinterrupt_control= {
.Type = WHvArm64InterruptTypeFixed,
.RequestedVector =GIC_INTERNAL+ irq,
.InterruptControl.Asserted = level
};
All my other previous comments are addressed, but I still have new comments below...
hw/intc/arm_gicv3_whpx.c line 74
Quoted 11 lines
hw/intc/arm_gicv3_whpx.c new file +11
-0+ + whp_dispatch.WHvRequestInterrupt (whpx->partition, &interrupt_control, +sizeof (interrupt_control)); +} + +static void whpx_gicv3_icc_reset (CPUARMState *env,const ARMCPRegInfo *ri) +{ +GICv3State *s; +GICv3CPUState *c; + + c = (GICv3CPUState *)env->gicv3state;
This explicit cast should be gone, just like the one which used to be in whpx_gicv3_set_irq().
Quoted 83 lines
hw/intc/arm_gicv3_whpx.c new file +83
-0+ s = c->gic; + + c->icc_pmr_el1 =0 ; +/* +* Architecturally the reset value of the ICC_BPR registers +* is UNKNOWN. We set them all to 0 here; when the kernel +* uses these values to program the ICH_VMCR_EL2 fields that +* determine the guest-visible ICC_BPR register values, the +* hardware's "writing a value less than the minimum sets +* the field to the minimum value" behaviour will result in +* them effectively resetting to the correct minimum value +* for the host GIC. +*/ + c->icc_bpr[GICV3_G0 ] =0 ; + c->icc_bpr[GICV3_G1 ] =0 ; + c->icc_bpr[GICV3_G1NS ] =0 ; + + c->icc_sre_el1 =0x7 ; +memset (c->icc_apr,0 ,sizeof (c->icc_apr)); +memset (c->icc_igrpen,0 ,sizeof (c->icc_igrpen)); + +if (s->migration_blocker) { +return ; + } + + c->icc_ctlr_el1[GICV3_S ] = c->icc_ctlr_el1[GICV3_NS ]; +} + +static void whpx_gicv3_reset_hold (Object *obj,ResetType type) +{ +GICv3State *s =ARM_GICV3_COMMON (obj); +WHPXARMGICv3Class *kgc =WHPX_GICV3_GET_CLASS (s); + +if (kgc->parent_phases.hold) { + kgc->parent_phases.hold (obj, type); + } + +whpx_gicv3_put (s); +} + + +/* +* CPU interface registers of GIC needs to be reset on CPU reset. +* For the calling arm_gicv3_icc_reset() on CPU reset, we register +* below ARMCPRegInfo. As we reset the whole cpu interface under single +* register reset, we define only one register of CPU interface instead +* of defining all the registers. +*/ +static const ARMCPRegInfo gicv3_cpuif_reginfo[] = { + { .name ="ICC_CTLR_EL1" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =0 , .crn =12 , .crm =12 , .opc2 =4 , +/* +* If ARM_CP_NOP is used, resetfn is not called, +* So ARM_CP_NO_RAW is appropriate type. +*/ + .type =ARM_CP_NO_RAW , + .access =PL1_RW , + .readfn = arm_cp_read_zero, + .writefn = arm_cp_write_ignore, +/* +* We hang the whole cpu interface reset routine off here +* rather than parcelling it out into one little function +* per register +*/ + .resetfn = whpx_gicv3_icc_reset, + }, +}; + +static void whpx_set_reg (CPUState *cpu,WHV_REGISTER_NAME reg,WHV_REGISTER_VALUE val) +{ +struct whpx_state *whpx = &whpx_global; +HRESULT hr; + + hr = whp_dispatch.WHvSetVirtualProcessorRegisters (whpx->partition, cpu->cpu_index, + ®,1 , &val); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to set register %08x, hr=%08lx" , reg, hr); + } +} + +static void whpx_gicv3_realize (DeviceState *dev,Error **errp) +{
hw/intc/arm_gicv3_whpx.c line 167
Quoted 10 lines
hw/intc/arm_gicv3_whpx.c new file +10
-0+ERRP_GUARD (); +GICv3State *s =WHPX_GICV3 (dev); +WHPXARMGICv3Class *kgc =WHPX_GICV3_GET_CLASS (s); +Error *local_err =NULL ; +int i; + + kgc->parent_realize (dev, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ;
With ERRP_GUARD(), this should be:
kgc->parent_realize(dev, errp);
if (*errp) {
return;
}
include/qapi/error.h has an explanation for this.
hw/intc/arm_gicv3_whpx.c line 172
Quoted 5 lines
hw/intc/arm_gicv3_whpx.c new file +5
-0+ } + +if (s->revision !=3 ) { +error_setg (errp,"unsupported GIC revision %d for platform GIC" , + s->revision);
"return;" is missing here.
Quoted 93 lines
hw/intc/arm_gicv3_whpx.c new file +67
-0+ } + +if (s->security_extn) { +error_setg (errp,"the platform vGICv3 does not implement the " +"security extensions" ); +return ; + } + +if (s->nmi_support) { +error_setg (errp,"NMI is not supported with the platform GIC" ); +return ; + } + +if (s->nb_redist_regions >1 ) { +error_setg (errp,"Multiple VGICv3 redistributor regions are not " +"supported by WHPX" ); +error_append_hint (errp,"A maximum of %d VCPUs can be used" , + s->redist_region_count[0 ]); +return ; + } + +gicv3_init_irqs_and_mmio (s, whpx_gicv3_set_irq,NULL ); + +for (i =0 ; i < s->num_cpu; i++) { +CPUState *cpu_state =qemu_get_cpu (i); +ARMCPU *cpu =ARM_CPU (cpu_state); +WHV_REGISTER_VALUE val = {.Reg64 =0x080A0000 + (GICV3_REDIST_SIZE * i)}; +whpx_set_reg (cpu_state, WHvArm64RegisterGicrBaseGpa, val); +define_arm_cp_regs (cpu, gicv3_cpuif_reginfo); + } + +if (s->maint_irq) { +error_setg (errp,"Nested virtualisation not currently supported by WHPX." ); +return ; + } +} + +static void whpx_gicv3_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass); +ARMGICv3CommonClass *agcc =ARM_GICV3_COMMON_CLASS (klass); +WHPXARMGICv3Class *kgc =WHPX_GICV3_CLASS (klass); + + agcc->pre_save = whpx_gicv3_get; + agcc->post_load = whpx_gicv3_put; + +device_class_set_parent_realize (dc, whpx_gicv3_realize, + &kgc->parent_realize); +resettable_class_set_parent_phases (rc,NULL , whpx_gicv3_reset_hold,NULL , + &kgc->parent_phases); +} + +static const TypeInfo whpx_arm_gicv3_info = { + .name =TYPE_WHPX_GICV3 , + .parent =TYPE_ARM_GICV3_COMMON , + .instance_size =sizeof (GICv3State), + .class_init = whpx_gicv3_class_init, + .class_size =sizeof (WHPXARMGICv3Class), +}; + +static void whpx_gicv3_register_types (void ) +{ +type_register_static (&whpx_arm_gicv3_info); +} + +type_init (whpx_gicv3_register_types)hw/intc/meson.build +1
-0@@ -41,6 +41,7 @@ specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) +specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))include/hw/intc/arm_gicv3_common.h +3
-0@@ -313,6 +313,9 @@ typedef struct ARMGICv3CommonClass ARMGICv3CommonClass;DECLARE_OBJ_CHECKERS (GICv3State, ARMGICv3CommonClass,ARM_GICV3_COMMON ,TYPE_ARM_GICV3_COMMON ) +/* Types for GICv3 kernel-irqchip */ +#define TYPE_WHPX_GICV3 "whpx-arm-gicv3" +struct ARMGICv3CommonClass {/*< private >*/ SysBusDeviceClass parent_class;
PATCH v13 16/28 whpx: add arm64 support
In reply to Mohamed Mediouni--- accel/whpx/whpx-common.c | 1 + target/arm/meson.build | 1 + target/arm/whpx/meson.build | 3 + target/arm/whpx/whpx-all.c | 845 ++++++++++++++++++++++++++++++++++++ 4 files changed, 850 insertions(+) create mode 100644 target/arm/whpx/meson.build create mode 100644 target/arm/whpx/whpx-all.c
accel/whpx/whpx-common.c +1 -0
@@ -12,6 +12,7 @@#include "gdbstub/helpers.h" #include "qemu/accel.h" #include "accel/accel-ops.h" +#include "system/memory.h" #include "system/whpx.h" #include "system/cpus.h" #include "system/runstate.h"
target/arm/meson.build +1 -0
@@ -59,6 +59,7 @@ arm_common_system_ss.add(files( )) subdir('hvf') +subdir('whpx') if 'CONFIG_TCG' in config_all_accel subdir('tcg')
target/arm/whpx/meson.build new file +3 -0
@@ -0,0 +1,3 @@ +arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( + 'whpx-all.c', +))
target/arm/whpx/whpx-all.c new file +845 -0
845 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v13 16/28] whpx: add arm64 support
Quoted 88 lines · Mohamed Mediouni
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- accel/whpx/whpx-common.c | 1 + target/arm/meson.build | 1 + target/arm/whpx/meson.build | 3 + target/arm/whpx/whpx-all.c | 845 ++++++++++++++++++++++++++++++++++++ 4 files changed, 850 insertions(+)create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.caccel/whpx/whpx-common.c +1
-0@@ -12,6 +12,7 @@#include "gdbstub/helpers.h" #include "qemu/accel.h" #include "accel/accel-ops.h" +#include "system/memory.h" #include "system/whpx.h" #include "system/cpus.h" #include "system/runstate.h" target/arm/meson.build +1
-0@@ -59,6 +59,7 @@ arm_common_system_ss.add(files( )) subdir('hvf') +subdir('whpx') if 'CONFIG_TCG' in config_all_accel subdir('tcg')target/arm/whpx/meson.build new file +3
-0@@ -0,0 +1,3 @@ +arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( + 'whpx-all.c', +))target/arm/whpx/whpx-all.c new file +37
-0@@ -0,0 +1,845 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU Windows Hypervisor Platform accelerator (WHPX) +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "system/address-spaces.h" +#include "system/ioport.h" +#include "gdbstub/helpers.h" +#include "qemu/accel.h" +#include "accel/accel-ops.h" +#include "system/whpx.h" +#include "system/cpus.h" +#include "system/runstate.h" +#include "qemu/main-loop.h" +#include "hw/core/boards.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "qapi/qapi-types-common.h" +#include "qapi/qapi-visit-common.h" +#include "migration/blocker.h" +#include "accel/accel-cpu-target.h" +#include <winerror.h> + +#include "syndrome.h" +#include "cpu.h" +#include "target/arm/cpregs.h" +#include "internals.h" + +#include "system/whpx-internal.h" +#include "system/whpx-accel-ops.h" +#include "system/whpx-all.h" +#include "system/whpx-common.h"
target/arm/whpx/whpx-all.c line 47
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+#include "hw/arm/bsa.h" +#include "arm-powerctl.h" + +#include <winhvplatform.h> +#include <winhvplatformdefs.h> + +struct whpx_reg_match { +WHV_REGISTER_NAME reg; +uint64_t offset; +};
As per docs/devel/style.rst, this should be:
typedef struct WHPXRegMatch {
WHV_REGISTER_NAME reg;
uint64_t offset;
} WHPXRegMatch;Quoted 222 lines
target/arm/whpx/whpx-all.c new file +222
-0+ +static const struct whpx_reg_match whpx_reg_match[] = { + { WHvArm64RegisterX0, offsetof(CPUARMState, xregs[0]) }, + { WHvArm64RegisterX1, offsetof(CPUARMState, xregs[1]) }, + { WHvArm64RegisterX2, offsetof(CPUARMState, xregs[2]) }, + { WHvArm64RegisterX3, offsetof(CPUARMState, xregs[3]) }, + { WHvArm64RegisterX4, offsetof(CPUARMState, xregs[4]) }, + { WHvArm64RegisterX5, offsetof(CPUARMState, xregs[5]) }, + { WHvArm64RegisterX6, offsetof(CPUARMState, xregs[6]) }, + { WHvArm64RegisterX7, offsetof(CPUARMState, xregs[7]) }, + { WHvArm64RegisterX8, offsetof(CPUARMState, xregs[8]) }, + { WHvArm64RegisterX9, offsetof(CPUARMState, xregs[9]) }, + { WHvArm64RegisterX10, offsetof(CPUARMState, xregs[10]) }, + { WHvArm64RegisterX11, offsetof(CPUARMState, xregs[11]) }, + { WHvArm64RegisterX12, offsetof(CPUARMState, xregs[12]) }, + { WHvArm64RegisterX13, offsetof(CPUARMState, xregs[13]) }, + { WHvArm64RegisterX14, offsetof(CPUARMState, xregs[14]) }, + { WHvArm64RegisterX15, offsetof(CPUARMState, xregs[15]) }, + { WHvArm64RegisterX16, offsetof(CPUARMState, xregs[16]) }, + { WHvArm64RegisterX17, offsetof(CPUARMState, xregs[17]) }, + { WHvArm64RegisterX18, offsetof(CPUARMState, xregs[18]) }, + { WHvArm64RegisterX19, offsetof(CPUARMState, xregs[19]) }, + { WHvArm64RegisterX20, offsetof(CPUARMState, xregs[20]) }, + { WHvArm64RegisterX21, offsetof(CPUARMState, xregs[21]) }, + { WHvArm64RegisterX22, offsetof(CPUARMState, xregs[22]) }, + { WHvArm64RegisterX23, offsetof(CPUARMState, xregs[23]) }, + { WHvArm64RegisterX24, offsetof(CPUARMState, xregs[24]) }, + { WHvArm64RegisterX25, offsetof(CPUARMState, xregs[25]) }, + { WHvArm64RegisterX26, offsetof(CPUARMState, xregs[26]) }, + { WHvArm64RegisterX27, offsetof(CPUARMState, xregs[27]) }, + { WHvArm64RegisterX28, offsetof(CPUARMState, xregs[28]) }, + { WHvArm64RegisterFp, offsetof(CPUARMState, xregs[29]) }, + { WHvArm64RegisterLr, offsetof(CPUARMState, xregs[30]) }, + { WHvArm64RegisterPc, offsetof(CPUARMState , pc) }, +}; + +static const struct whpx_reg_match whpx_fpreg_match[] = { + { WHvArm64RegisterQ0, offsetof(CPUARMState, vfp.zregs[0]) }, + { WHvArm64RegisterQ1, offsetof(CPUARMState, vfp.zregs[1]) }, + { WHvArm64RegisterQ2, offsetof(CPUARMState, vfp.zregs[2]) }, + { WHvArm64RegisterQ3, offsetof(CPUARMState, vfp.zregs[3]) }, + { WHvArm64RegisterQ4, offsetof(CPUARMState, vfp.zregs[4]) }, + { WHvArm64RegisterQ5, offsetof(CPUARMState, vfp.zregs[5]) }, + { WHvArm64RegisterQ6, offsetof(CPUARMState, vfp.zregs[6]) }, + { WHvArm64RegisterQ7, offsetof(CPUARMState, vfp.zregs[7]) }, + { WHvArm64RegisterQ8, offsetof(CPUARMState, vfp.zregs[8]) }, + { WHvArm64RegisterQ9, offsetof(CPUARMState, vfp.zregs[9]) }, + { WHvArm64RegisterQ10, offsetof(CPUARMState, vfp.zregs[10]) }, + { WHvArm64RegisterQ11, offsetof(CPUARMState, vfp.zregs[11]) }, + { WHvArm64RegisterQ12, offsetof(CPUARMState, vfp.zregs[12]) }, + { WHvArm64RegisterQ13, offsetof(CPUARMState, vfp.zregs[13]) }, + { WHvArm64RegisterQ14, offsetof(CPUARMState, vfp.zregs[14]) }, + { WHvArm64RegisterQ15, offsetof(CPUARMState, vfp.zregs[15]) }, + { WHvArm64RegisterQ16, offsetof(CPUARMState, vfp.zregs[16]) }, + { WHvArm64RegisterQ17, offsetof(CPUARMState, vfp.zregs[17]) }, + { WHvArm64RegisterQ18, offsetof(CPUARMState, vfp.zregs[18]) }, + { WHvArm64RegisterQ19, offsetof(CPUARMState, vfp.zregs[19]) }, + { WHvArm64RegisterQ20, offsetof(CPUARMState, vfp.zregs[20]) }, + { WHvArm64RegisterQ21, offsetof(CPUARMState, vfp.zregs[21]) }, + { WHvArm64RegisterQ22, offsetof(CPUARMState, vfp.zregs[22]) }, + { WHvArm64RegisterQ23, offsetof(CPUARMState, vfp.zregs[23]) }, + { WHvArm64RegisterQ24, offsetof(CPUARMState, vfp.zregs[24]) }, + { WHvArm64RegisterQ25, offsetof(CPUARMState, vfp.zregs[25]) }, + { WHvArm64RegisterQ26, offsetof(CPUARMState, vfp.zregs[26]) }, + { WHvArm64RegisterQ27, offsetof(CPUARMState, vfp.zregs[27]) }, + { WHvArm64RegisterQ28, offsetof(CPUARMState, vfp.zregs[28]) }, + { WHvArm64RegisterQ29, offsetof(CPUARMState, vfp.zregs[29]) }, + { WHvArm64RegisterQ30, offsetof(CPUARMState, vfp.zregs[30]) }, + { WHvArm64RegisterQ31, offsetof(CPUARMState, vfp.zregs[31]) }, +}; + +struct whpx_sreg_match { +WHV_REGISTER_NAME reg; +uint32_t key; +bool global; +uint32_t cp_idx; +}; + +static struct whpx_sreg_match whpx_sreg_match[] = { + { WHvArm64RegisterDbgbvr0El1,ENCODE_AA64_CP_REG (0 ,0 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr0El1,ENCODE_AA64_CP_REG (0 ,0 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr0El1,ENCODE_AA64_CP_REG (0 ,0 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr0El1,ENCODE_AA64_CP_REG (0 ,0 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr0El1,ENCODE_AA64_CP_REG (0 ,1 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr0El1,ENCODE_AA64_CP_REG (0 ,1 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr0El1,ENCODE_AA64_CP_REG (0 ,1 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr0El1,ENCODE_AA64_CP_REG (0 ,1 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr2El1,ENCODE_AA64_CP_REG (0 ,2 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr2El1,ENCODE_AA64_CP_REG (0 ,2 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr2El1,ENCODE_AA64_CP_REG (0 ,2 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr2El1,ENCODE_AA64_CP_REG (0 ,2 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr3El1,ENCODE_AA64_CP_REG (0 ,3 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr3El1,ENCODE_AA64_CP_REG (0 ,3 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr3El1,ENCODE_AA64_CP_REG (0 ,3 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr3El1,ENCODE_AA64_CP_REG (0 ,3 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr4El1,ENCODE_AA64_CP_REG (0 ,4 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr4El1,ENCODE_AA64_CP_REG (0 ,4 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr4El1,ENCODE_AA64_CP_REG (0 ,4 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr4El1,ENCODE_AA64_CP_REG (0 ,4 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr5El1,ENCODE_AA64_CP_REG (0 ,5 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr5El1,ENCODE_AA64_CP_REG (0 ,5 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr5El1,ENCODE_AA64_CP_REG (0 ,5 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr5El1,ENCODE_AA64_CP_REG (0 ,5 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr6El1,ENCODE_AA64_CP_REG (0 ,6 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr6El1,ENCODE_AA64_CP_REG (0 ,6 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr6El1,ENCODE_AA64_CP_REG (0 ,6 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr6El1,ENCODE_AA64_CP_REG (0 ,6 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr7El1,ENCODE_AA64_CP_REG (0 ,7 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr7El1,ENCODE_AA64_CP_REG (0 ,7 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr7El1,ENCODE_AA64_CP_REG (0 ,7 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr7El1,ENCODE_AA64_CP_REG (0 ,7 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr8El1,ENCODE_AA64_CP_REG (0 ,8 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr8El1,ENCODE_AA64_CP_REG (0 ,8 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr8El1,ENCODE_AA64_CP_REG (0 ,8 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr8El1,ENCODE_AA64_CP_REG (0 ,8 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr9El1,ENCODE_AA64_CP_REG (0 ,9 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr9El1,ENCODE_AA64_CP_REG (0 ,9 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr9El1,ENCODE_AA64_CP_REG (0 ,9 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr9El1,ENCODE_AA64_CP_REG (0 ,9 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr10El1,ENCODE_AA64_CP_REG (0 ,10 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr10El1,ENCODE_AA64_CP_REG (0 ,10 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr10El1,ENCODE_AA64_CP_REG (0 ,10 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr10El1,ENCODE_AA64_CP_REG (0 ,10 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr11El1,ENCODE_AA64_CP_REG (0 ,11 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr11El1,ENCODE_AA64_CP_REG (0 ,11 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr11El1,ENCODE_AA64_CP_REG (0 ,11 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr11El1,ENCODE_AA64_CP_REG (0 ,11 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr12El1,ENCODE_AA64_CP_REG (0 ,12 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr12El1,ENCODE_AA64_CP_REG (0 ,12 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr12El1,ENCODE_AA64_CP_REG (0 ,12 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr12El1,ENCODE_AA64_CP_REG (0 ,12 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr13El1,ENCODE_AA64_CP_REG (0 ,13 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr13El1,ENCODE_AA64_CP_REG (0 ,13 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr13El1,ENCODE_AA64_CP_REG (0 ,13 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr13El1,ENCODE_AA64_CP_REG (0 ,13 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr14El1,ENCODE_AA64_CP_REG (0 ,14 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr14El1,ENCODE_AA64_CP_REG (0 ,14 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr14El1,ENCODE_AA64_CP_REG (0 ,14 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr14El1,ENCODE_AA64_CP_REG (0 ,14 ,2 ,0 ,7 ) }, + + { WHvArm64RegisterDbgbvr15El1,ENCODE_AA64_CP_REG (0 ,15 ,2 ,0 ,4 ) }, + { WHvArm64RegisterDbgbcr15El1,ENCODE_AA64_CP_REG (0 ,15 ,2 ,0 ,5 ) }, + { WHvArm64RegisterDbgwvr15El1,ENCODE_AA64_CP_REG (0 ,15 ,2 ,0 ,6 ) }, + { WHvArm64RegisterDbgwcr15El1,ENCODE_AA64_CP_REG (0 ,15 ,2 ,0 ,7 ) }, +#ifdef SYNC_NO_RAW_REGS +/* +* The registers below are manually synced on init because they are +* marked as NO_RAW. We still list them to make number space sync easier. +*/ + { WHvArm64RegisterMidrEl1,ENCODE_AA64_CP_REG (0 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterMpidrEl1,ENCODE_AA64_CP_REG (0 ,0 ,3 ,0 ,5 ) }, + { WHvArm64RegisterIdPfr0El1,ENCODE_AA64_CP_REG (0 ,4 ,3 ,0 ,0 ) }, +#endif + { WHvArm64RegisterIdAa64Pfr1El1,ENCODE_AA64_CP_REG (0 ,4 ,3 ,0 ,1 ), true }, + { WHvArm64RegisterIdAa64Dfr0El1,ENCODE_AA64_CP_REG (0 ,5 ,3 ,0 ,0 ), true }, + { WHvArm64RegisterIdAa64Dfr1El1,ENCODE_AA64_CP_REG (0 ,5 ,3 ,0 ,1 ), true }, + { WHvArm64RegisterIdAa64Isar0El1,ENCODE_AA64_CP_REG (0 ,6 ,3 ,0 ,0 ), true }, + { WHvArm64RegisterIdAa64Isar1El1,ENCODE_AA64_CP_REG (0 ,6 ,3 ,0 ,1 ), true }, +#ifdef SYNC_NO_MMFR0 +/* We keep the hardware MMFR0 around. HW limits are there anyway */ + { WHvArm64RegisterIdAa64Mmfr0El1,ENCODE_AA64_CP_REG (0 ,7 ,3 ,0 ,0 ) }, +#endif + { WHvArm64RegisterIdAa64Mmfr1El1,ENCODE_AA64_CP_REG (0 ,7 ,3 ,0 ,1 ), true }, + { WHvArm64RegisterIdAa64Mmfr2El1,ENCODE_AA64_CP_REG (0 ,7 ,3 ,0 ,2 ), true }, + { WHvArm64RegisterIdAa64Mmfr3El1,ENCODE_AA64_CP_REG (0 ,7 ,3 ,0 ,3 ), true }, + + { WHvArm64RegisterMdscrEl1,ENCODE_AA64_CP_REG (0 ,2 ,2 ,0 ,2 ) }, + { WHvArm64RegisterSctlrEl1,ENCODE_AA64_CP_REG (1 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterCpacrEl1,ENCODE_AA64_CP_REG (1 ,0 ,3 ,0 ,2 ) }, + { WHvArm64RegisterTtbr0El1,ENCODE_AA64_CP_REG (2 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterTtbr1El1,ENCODE_AA64_CP_REG (2 ,0 ,3 ,0 ,1 ) }, + { WHvArm64RegisterTcrEl1,ENCODE_AA64_CP_REG (2 ,0 ,3 ,0 ,2 ) }, + + { WHvArm64RegisterApiAKeyLoEl1,ENCODE_AA64_CP_REG (2 ,1 ,3 ,0 ,0 ) }, + { WHvArm64RegisterApiAKeyHiEl1,ENCODE_AA64_CP_REG (2 ,1 ,3 ,0 ,1 ) }, + { WHvArm64RegisterApiBKeyLoEl1,ENCODE_AA64_CP_REG (2 ,1 ,3 ,0 ,2 ) }, + { WHvArm64RegisterApiBKeyHiEl1,ENCODE_AA64_CP_REG (2 ,1 ,3 ,0 ,3 ) }, + { WHvArm64RegisterApdAKeyLoEl1,ENCODE_AA64_CP_REG (2 ,2 ,3 ,0 ,0 ) }, + { WHvArm64RegisterApdAKeyHiEl1,ENCODE_AA64_CP_REG (2 ,2 ,3 ,0 ,1 ) }, + { WHvArm64RegisterApdBKeyLoEl1,ENCODE_AA64_CP_REG (2 ,2 ,3 ,0 ,2 ) }, + { WHvArm64RegisterApdBKeyHiEl1,ENCODE_AA64_CP_REG (2 ,2 ,3 ,0 ,3 ) }, + { WHvArm64RegisterApgAKeyLoEl1,ENCODE_AA64_CP_REG (2 ,3 ,3 ,0 ,0 ) }, + { WHvArm64RegisterApgAKeyHiEl1,ENCODE_AA64_CP_REG (2 ,3 ,3 ,0 ,1 ) }, + + { WHvArm64RegisterSpsrEl1,ENCODE_AA64_CP_REG (4 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterElrEl1,ENCODE_AA64_CP_REG (4 ,0 ,3 ,0 ,1 ) }, + { WHvArm64RegisterSpEl1,ENCODE_AA64_CP_REG (4 ,1 ,3 ,0 ,0 ) }, + { WHvArm64RegisterEsrEl1,ENCODE_AA64_CP_REG (5 ,2 ,3 ,0 ,0 ) }, + { WHvArm64RegisterFarEl1,ENCODE_AA64_CP_REG (6 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterParEl1,ENCODE_AA64_CP_REG (7 ,4 ,3 ,0 ,0 ) }, + { WHvArm64RegisterMairEl1,ENCODE_AA64_CP_REG (10 ,2 ,3 ,0 ,0 ) }, + { WHvArm64RegisterVbarEl1,ENCODE_AA64_CP_REG (12 ,0 ,3 ,0 ,0 ) }, + { WHvArm64RegisterContextidrEl1,ENCODE_AA64_CP_REG (13 ,0 ,3 ,0 ,1 ) }, + { WHvArm64RegisterTpidrEl1,ENCODE_AA64_CP_REG (13 ,0 ,3 ,0 ,4 ) }, + { WHvArm64RegisterCntkctlEl1,ENCODE_AA64_CP_REG (14 ,1 ,3 ,0 ,0 ) }, + { WHvArm64RegisterCsselrEl1,ENCODE_AA64_CP_REG (0 ,0 ,3 ,2 ,0 ) }, + { WHvArm64RegisterTpidrEl0,ENCODE_AA64_CP_REG (13 ,0 ,3 ,3 ,2 ) }, + { WHvArm64RegisterTpidrroEl0,ENCODE_AA64_CP_REG (13 ,0 ,3 ,3 ,3 ) }, + { WHvArm64RegisterCntvCtlEl0,ENCODE_AA64_CP_REG (14 ,3 ,3 ,3 ,1 ) }, + { WHvArm64RegisterCntvCvalEl0,ENCODE_AA64_CP_REG (14 ,3 ,3 ,3 ,2 ) }, + { WHvArm64RegisterSpEl1,ENCODE_AA64_CP_REG (4 ,1 ,3 ,4 ,0 ) }, +}; + +static void flush_cpu_state (CPUState *cpu) +{ +if (cpu->vcpu_dirty) { +whpx_set_registers (cpu,WHPX_SET_RUNTIME_STATE ); + cpu->vcpu_dirty = false;
target/arm/whpx/whpx-all.c line 279
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ } +} + +HRESULT whpx_set_exception_exit_bitmap (UINT64 exceptions) +{ +if (exceptions !=0 ) { +return E_NOTIMPL ; + } +return ERROR_SUCCESS ; +}
Nitpick: let's have a blank line here just like other functions.
target/arm/whpx/whpx-all.c line 285
Quoted 6 lines
target/arm/whpx/whpx-all.c new file +6
-0+void whpx_apply_breakpoints ( +struct whpx_breakpoint_collection *breakpoints, +CPUState *cpu, +bool resuming) +{ +
Another nitpick: whpx_cpu_update_state(), another empty function does not have a blank line. Let's keep them consistent; in my opinion not having a blank line is better.
Quoted 59 lines
target/arm/whpx/whpx-all.c new file +59
-0+} +void whpx_translate_cpu_breakpoints ( +struct whpx_breakpoints *breakpoints, +CPUState *cpu, +int cpu_breakpoint_count) +{ + +} + +static void whpx_get_reg (CPUState *cpu,WHV_REGISTER_NAME reg,WHV_REGISTER_VALUE * val) +{ +struct whpx_state *whpx = &whpx_global; +HRESULT hr; + +flush_cpu_state (cpu); + + hr = whp_dispatch.WHvGetVirtualProcessorRegisters (whpx->partition, cpu->cpu_index, + ®,1 , val); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to get register %08x, hr=%08lx" , reg, hr); + } +} + +static void whpx_set_reg (CPUState *cpu,WHV_REGISTER_NAME reg,WHV_REGISTER_VALUE val) +{ +struct whpx_state *whpx = &whpx_global; +HRESULT hr; + hr = whp_dispatch.WHvSetVirtualProcessorRegisters (whpx->partition, cpu->cpu_index, + ®,1 , &val); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to set register %08x, hr=%08lx" , reg, hr); + } +} + +static void whpx_get_global_reg (WHV_REGISTER_NAME reg,WHV_REGISTER_VALUE *val) +{ +struct whpx_state *whpx = &whpx_global; +HRESULT hr; + + hr = whp_dispatch.WHvGetVirtualProcessorRegisters (whpx->partition,WHV_ANY_VP , + ®,1 , val); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to get register %08x, hr=%08lx" , reg, hr); + } +} + +static void whpx_set_global_reg (WHV_REGISTER_NAME reg,WHV_REGISTER_VALUE val) +{ +struct whpx_state *whpx = &whpx_global; +HRESULT hr; + hr = whp_dispatch.WHvSetVirtualProcessorRegisters (whpx->partition,WHV_ANY_VP , + ®,1 , &val); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to set register %08x, hr=%08lx" , reg, hr); + }
target/arm/whpx/whpx-all.c line 354
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+} + +static uint64_t whpx_get_gp_reg (CPUState *cpu,int rt) +{ +assert (rt <=31 ); +if (rt ==31 ) { +return 0 ; + } +WHV_REGISTER_NAME reg = WHvArm64RegisterX0 + rt; +WHV_REGISTER_VALUE val;
This is mixed declarations that are not allowed as per:docs/devel/style.rst
Quoted 181 lines
target/arm/whpx/whpx-all.c new file +181
-0+whpx_get_reg (cpu, reg, &val); + +return val.Reg64; +} + +static void whpx_set_gp_reg (CPUState *cpu,int rt,uint64_t val) +{ +assert (rt <31 ); +WHV_REGISTER_NAME reg = WHvArm64RegisterX0 + rt; +WHV_REGISTER_VALUE reg_val = {.Reg64 = val}; + +whpx_set_reg (cpu, reg, reg_val); +} + +static int whpx_handle_mmio (CPUState *cpu,WHV_MEMORY_ACCESS_CONTEXT *ctx) +{ +uint64_t syndrome = ctx->Syndrome; + +bool isv = syndrome &ARM_EL_ISV ; +bool iswrite = (syndrome >>6 ) &1 ; +bool sse = (syndrome >>21 ) &1 ; +uint32_t sas = (syndrome >>22 ) &3 ; +uint32_t len =1 << sas; +uint32_t srt = (syndrome >>16 ) &0x1f ; +uint32_t cm = (syndrome >>8 ) &0x1 ; +uint64_t val =0 ; + +assert (!cm); +assert (isv); + +if (iswrite) { + val =whpx_get_gp_reg (cpu, srt); +address_space_write (&address_space_memory, + ctx->Gpa, +MEMTXATTRS_UNSPECIFIED , &val, len); + }else { +address_space_read (&address_space_memory, + ctx->Gpa, +MEMTXATTRS_UNSPECIFIED , &val, len); +if (sse) { + val =sextract64 (val,0 , len *8 ); + } +whpx_set_gp_reg (cpu, srt, val); + } + +return 0 ; +} + +static void whpx_psci_cpu_off (ARMCPU *arm_cpu) +{ +int32_t ret =arm_set_cpu_off (arm_cpu_mp_affinity (arm_cpu)); +assert (ret ==QEMU_ARM_POWERCTL_RET_SUCCESS ); +} + +int whpx_vcpu_run (CPUState *cpu) +{ +HRESULT hr; +struct whpx_state *whpx = &whpx_global; +ARMCPU *arm_cpu =ARM_CPU (cpu); +AccelCPUState *vcpu = cpu->accel; +int ret; + + +g_assert (bql_locked ()); + +if (whpx->running_cpus++ ==0 ) { + ret =whpx_first_vcpu_starting (cpu); +if (ret !=0 ) { +return ret; + } + } + +bql_unlock (); + + +cpu_exec_start (cpu); +do { +bool advance_pc = false; +if (cpu->vcpu_dirty) { +whpx_set_registers (cpu,WHPX_SET_RUNTIME_STATE ); + cpu->vcpu_dirty = false; + } + +if (qatomic_read (&cpu->exit_request)) { +whpx_vcpu_kick (cpu); + } + + hr = whp_dispatch.WHvRunVirtualProcessor ( + whpx->partition, cpu->cpu_index, + &vcpu->exit_ctx,sizeof (vcpu->exit_ctx)); + +if (FAILED (hr)) { +error_report ("WHPX: Failed to exec a virtual processor," +" hr=%08lx" , hr); + ret =-1 ; +break ; + } + +switch (vcpu->exit_ctx.ExitReason) { +case WHvRunVpExitReasonGpaIntercept: +case WHvRunVpExitReasonUnmappedGpa: + advance_pc = true; + +if (vcpu->exit_ctx.MemoryAccess.Syndrome &BIT (8 )) { +error_report ("WHPX: cached access to unmapped memory" +"Pc = 0x%llx Gva = 0x%llx Gpa = 0x%llx" , + vcpu->exit_ctx.MemoryAccess.Header.Pc, + vcpu->exit_ctx.MemoryAccess.Gpa, + vcpu->exit_ctx.MemoryAccess.Gva); +break ; + } + + ret =whpx_handle_mmio (cpu, &vcpu->exit_ctx.MemoryAccess); +break ; +case WHvRunVpExitReasonCanceled: + cpu->exception_index =EXCP_INTERRUPT ; + ret =1 ; +break ; +case WHvRunVpExitReasonArm64Reset: +switch (vcpu->exit_ctx.Arm64Reset.ResetType) { +case WHvArm64ResetTypePowerOff: +qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); +break ; +case WHvArm64ResetTypeReboot: +qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET ); +break ; +default : +g_assert_not_reached (); + } +bql_lock (); +if (arm_cpu->power_state !=PSCI_OFF ) { +whpx_psci_cpu_off (arm_cpu); + } +bql_unlock (); +break ; +case WHvRunVpExitReasonNone: +case WHvRunVpExitReasonUnrecoverableException: +case WHvRunVpExitReasonInvalidVpRegisterValue: +case WHvRunVpExitReasonUnsupportedFeature: +default : +error_report ("WHPX: Unexpected VP exit code 0x%08x" , + vcpu->exit_ctx.ExitReason); +whpx_get_registers (cpu); +bql_lock (); +qemu_system_guest_panicked (cpu_get_crash_info (cpu)); +bql_unlock (); +break ; + } +if (advance_pc) { +WHV_REGISTER_VALUE pc; + +flush_cpu_state (cpu); + pc.Reg64 = vcpu->exit_ctx.MemoryAccess.Header.Pc +4 ; +whpx_set_reg (cpu, WHvArm64RegisterPc, pc); + } + }while (!ret); + +cpu_exec_end (cpu); + +bql_lock (); + current_cpu = cpu; + +if (--whpx->running_cpus ==0 ) { +whpx_last_vcpu_stopping (cpu); + } + +qatomic_set (&cpu->exit_request, false); + +return ret <0 ; +} + +static void clean_whv_register_value (WHV_REGISTER_VALUE *val) +{ +memset (val,0 ,sizeof (WHV_REGISTER_VALUE )); +} + +void whpx_get_registers (CPUState *cpu) +{ +ARMCPU *arm_cpu =ARM_CPU (cpu); +CPUARMState *env = &arm_cpu->env; +WHV_REGISTER_VALUE val;
target/arm/whpx/whpx-all.c line 545
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+int i; + +for (i =0 ; i <ARRAY_SIZE (whpx_reg_match); i++) { +whpx_get_reg (cpu, whpx_reg_match[i].reg, &val); + *(uint64_t *)((char *)env + whpx_reg_match[i].offset) = val.Reg64; + } + +for (i =0 ; i <ARRAY_SIZE (whpx_fpreg_match); i++) { +whpx_get_reg (cpu, whpx_reg_match[i].reg, &val); +memcpy ((void *)env + whpx_fpreg_match[i].offset, &val,sizeof (val.Reg128));
This is better to have (char *) instead of (void *) just like the 64-bit variant.
Quoted 22 lines
target/arm/whpx/whpx-all.c new file +22
-0+ } + +whpx_get_reg (cpu, WHvArm64RegisterPc, &val); + env->pc = val.Reg64; + +whpx_get_reg (cpu, WHvArm64RegisterFpcr, &val); +vfp_set_fpcr (env, val.Reg32); + +whpx_get_reg (cpu, WHvArm64RegisterFpsr, &val); +vfp_set_fpsr (env, val.Reg32); + +whpx_get_reg (cpu, WHvArm64RegisterPstate, &val); +pstate_write (env, val.Reg32); + +for (i =0 ; i <ARRAY_SIZE (whpx_sreg_match); i++) { +if (whpx_sreg_match[i].global) { +continue ; + } +if (whpx_sreg_match[i].cp_idx ==-1 ) { +continue ; + } +
target/arm/whpx/whpx-all.c line 577
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+whpx_get_reg (cpu, whpx_sreg_match[i].reg, &val); + + arm_cpu->cpreg_values[whpx_sreg_match[i].cp_idx] = val.Reg64; + } + +/* WHP disallows us from reading global regs as a vCPU */ +for (i =0 ; i <ARRAY_SIZE (whpx_sreg_match); i++) { +if (whpx_sreg_match[i].global == false) { +continue ; + }
This can be:
if (!whpx_sreg_match[i].global) {
continue;
}...just like the local variant. But looking at this code again, this can be even simpler as follows:
for (i = 0; i < ARRAY_SIZE(whpx_sreg_match); i++) {
if (whpx_sreg_match[i].cp_idx == -1) {
continue;
}
if (whpx_sreg_match[i].global) {
/* WHP disallows us from reading global regs as a vCPU */
whpx_get_global_reg(whpx_sreg_match[i].reg, &val);
} else {
whpx_get_reg(cpu, whpx_sreg_match[i].reg, &val);
}Quoted 15 lines
target/arm/whpx/whpx-all.c new file +15
-0+if (whpx_sreg_match[i].cp_idx ==-1 ) { +continue ; + } + +whpx_get_global_reg (whpx_sreg_match[i].reg, &val); + + arm_cpu->cpreg_values[whpx_sreg_match[i].cp_idx] = val.Reg64; + } +assert (write_list_to_cpustate (arm_cpu)); + +aarch64_restore_sp (env,arm_current_el (env)); +} + +void whpx_set_registers (CPUState *cpu,int level) +{
target/arm/whpx/whpx-all.c line 602
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ARMCPU *arm_cpu =ARM_CPU (cpu); +CPUARMState *env = &arm_cpu->env; +WHV_REGISTER_VALUE val; +clean_whv_register_value (&val); +int i; + +assert (cpu_is_stopped (cpu) ||qemu_cpu_is_self (cpu)); + +for (i =0 ; i <ARRAY_SIZE (whpx_reg_match); i++) { + val.Reg64 = *(uint64_t *)((void *)env + whpx_reg_match[i].offset);
The comments I have made for whpx_get_registers() also apply to this function. Please make corresponding changes here too.
Quoted 77 lines
target/arm/whpx/whpx-all.c new file +77
-0+whpx_set_reg (cpu, whpx_reg_match[i].reg, val); + } + +for (i =0 ; i <ARRAY_SIZE (whpx_fpreg_match); i++) { +memcpy (&val.Reg128, (void *)env + whpx_fpreg_match[i].offset,sizeof (val.Reg128)); +whpx_set_reg (cpu, whpx_reg_match[i].reg, val); + } + +clean_whv_register_value (&val); + val.Reg64 = env->pc; +whpx_set_reg (cpu, WHvArm64RegisterPc, val); + +clean_whv_register_value (&val); + val.Reg32 =vfp_get_fpcr (env); +whpx_set_reg (cpu, WHvArm64RegisterFpcr, val); + val.Reg32 =vfp_get_fpsr (env); +whpx_set_reg (cpu, WHvArm64RegisterFpsr, val); + val.Reg32 =pstate_read (env); +whpx_set_reg (cpu, WHvArm64RegisterPstate, val); + +aarch64_save_sp (env,arm_current_el (env)); + +assert (write_cpustate_to_list (arm_cpu, false)); +for (i =0 ; i <ARRAY_SIZE (whpx_sreg_match); i++) { +if (whpx_sreg_match[i].global == true) { +continue ; + } + +if (whpx_sreg_match[i].cp_idx ==-1 ) { +continue ; + } +clean_whv_register_value (&val); + val.Reg64 = arm_cpu->cpreg_values[whpx_sreg_match[i].cp_idx]; +whpx_set_reg (cpu, whpx_sreg_match[i].reg, val); + } + +/* Currently set global regs every time. */ +for (i =0 ; i <ARRAY_SIZE (whpx_sreg_match); i++) { +if (whpx_sreg_match[i].global == false) { +continue ; + } + +if (whpx_sreg_match[i].cp_idx ==-1 ) { +continue ; + } +clean_whv_register_value (&val); + val.Reg64 = arm_cpu->cpreg_values[whpx_sreg_match[i].cp_idx]; +whpx_set_global_reg (whpx_sreg_match[i].reg, val); + } +} + +static uint32_t max_vcpu_index; + +static void whpx_cpu_update_state (void *opaque,bool running,RunState state) +{ +} + +int whpx_init_vcpu (CPUState *cpu) +{ +HRESULT hr; +struct whpx_state *whpx = &whpx_global; +AccelCPUState *vcpu =NULL ; +ARMCPU *arm_cpu =ARM_CPU (cpu); +CPUARMState *env = &arm_cpu->env; +int ret; + +uint32_t sregs_match_len =ARRAY_SIZE (whpx_sreg_match); +uint32_t sregs_cnt =0 ; +WHV_REGISTER_VALUE val; +int i; + + vcpu =g_new0 (AccelCPUState,1 ); + + hr = whp_dispatch.WHvCreateVirtualProcessor ( + whpx->partition, cpu->cpu_index,0 ); +if (FAILED (hr)) { + error_report("WHPX: Failed to create a virtual processor,"
target/arm/whpx/whpx-all.c line 689
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ " hr=%08lx", hr); + ret = -EINVAL ; + goto error; + } + +/* Assumption that CNTFRQ_EL0 is the same between the VMM and the partition. */ + asmvolatile ("mrs %0, cntfrq_el0" :"=r" (arm_cpu->gt_cntfrq_hz)); + + cpu->vcpu_dirty = true; + cpu->accel = vcpu;
Simpler: cpu->accel = g_new0(AccelCPUState, 1);
Quoted 45 lines
target/arm/whpx/whpx-all.c new file +45
-0+ max_vcpu_index =MAX (max_vcpu_index, cpu->cpu_index); +qemu_add_vm_change_state_handler (whpx_cpu_update_state, env); + + env->aarch64 = true; + +/* Allocate enough space for our sysreg sync */ + arm_cpu->cpreg_indexes =g_renew (uint64_t, arm_cpu->cpreg_indexes, + sregs_match_len); + arm_cpu->cpreg_values =g_renew (uint64_t, arm_cpu->cpreg_values, + sregs_match_len); + arm_cpu->cpreg_vmstate_indexes =g_renew (uint64_t, + arm_cpu->cpreg_vmstate_indexes, + sregs_match_len); + arm_cpu->cpreg_vmstate_values =g_renew (uint64_t, + arm_cpu->cpreg_vmstate_values, + sregs_match_len); + +memset (arm_cpu->cpreg_values,0 , sregs_match_len *sizeof (uint64_t )); + +/* Populate cp list for all known sysregs */ +for (i =0 ; i < sregs_match_len; i++) { +const ARMCPRegInfo *ri; +uint32_t key = whpx_sreg_match[i].key; + + ri =get_arm_cp_reginfo (arm_cpu->cp_regs, key); +if (ri) { +assert (!(ri->type &ARM_CP_NO_RAW )); + whpx_sreg_match[i].cp_idx = sregs_cnt; + arm_cpu->cpreg_indexes[sregs_cnt++] =cpreg_to_kvm_id (key); + }else { + whpx_sreg_match[i].cp_idx =-1 ; + } + } + arm_cpu->cpreg_array_len = sregs_cnt; + arm_cpu->cpreg_vmstate_array_len = sregs_cnt; + +assert (write_cpustate_to_list (arm_cpu, false)); + +/* Set CP_NO_RAW system registers on init */ + val.Reg64 = arm_cpu->midr; +whpx_set_reg (cpu, WHvArm64RegisterMidrEl1, + val); + +clean_whv_register_value (&val); +
target/arm/whpx/whpx-all.c line 744
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ val.Reg64 =deposit64 (arm_cpu->mp_affinity,31 ,1 ,1 /* RES1 */ ); +whpx_set_reg (cpu, WHvArm64RegisterMpidrEl1, val); + +return 0 ; + +error: +g_free (vcpu); + +return ret; +
A blank line at the end of function is rare in other places.
Quoted 50 lines
target/arm/whpx/whpx-all.c new file +50
-0+} + +void whpx_cpu_instance_init (CPUState *cs) +{ +} + +int whpx_accel_init (AccelState *as,MachineState *ms) +{ +struct whpx_state *whpx; +int ret; +HRESULT hr; +WHV_CAPABILITY whpx_cap; +UINT32 whpx_cap_size; +WHV_PARTITION_PROPERTY prop; +WHV_CAPABILITY_FEATURES features = {0 }; + + whpx = &whpx_global; +/* on arm64 Windows Hypervisor Platform, vGICv3 always used */ + whpx_irqchip_in_kernel = true; + +if (!init_whp_dispatch ()) { + ret = -ENOSYS ; + goto error; + } + + whpx->mem_quota = ms->ram_size; + + hr = whp_dispatch.WHvGetCapability ( + WHvCapabilityCodeHypervisorPresent, &whpx_cap, +sizeof (whpx_cap), &whpx_cap_size); +if (FAILED (hr) || !whpx_cap.HypervisorPresent) { +error_report ("WHPX: No accelerator found, hr=%08lx" , hr); + ret = -ENOSPC ; + goto error; + } + + hr = whp_dispatch.WHvGetCapability ( + WHvCapabilityCodeFeatures, &features,sizeof (features),NULL ); +if (FAILED (hr)) { +error_report ("WHPX: Failed to query capabilities, hr=%08lx" , hr); + ret = -EINVAL ; + goto error; + } + +if (!features.Arm64Support) { +error_report ("WHPX: host OS exposing pre-release WHPX implementation. " +"Please update your operating system to at least build 26100.3915" ); + ret = -EINVAL ; + goto error; + }
target/arm/whpx/whpx-all.c line 804
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ + hr = whp_dispatch.WHvCreatePartition (&whpx->partition); +if (FAILED (hr)) { +error_report ("WHPX: Failed to create partition, hr=%08lx" , hr); + ret = -EINVAL ; + goto error; + } + +memset (&prop,0 ,sizeof (WHV_PARTITION_PROPERTY )); + prop.ProcessorCount = ms->smp.cpus;
Here is a minor inconsistency: "features" is initialized with = {0} but this has memset() and an assignment. I prefer to have {} (i.e., = { .ProcessorCount = ms->smp.cpus }), but please keep them consistent whatever you choose.
target/arm/whpx/whpx-all.c line 809
Quoted 5 lines
target/arm/whpx/whpx-all.c new file +5
-0+ hr = whp_dispatch.WHvSetPartitionProperty ( + whpx->partition, + WHvPartitionPropertyCodeProcessorCount, + &prop, +sizeof (WHV_PARTITION_PROPERTY ));
Shorter: sizeof(prop)
Quoted 19 lines
target/arm/whpx/whpx-all.c new file +19
-0+ +if (FAILED (hr)) { +error_report ("WHPX: Failed to set partition processor count to %u," +" hr=%08lx" , prop.ProcessorCount, hr); + ret = -EINVAL ; + goto error; + } + +if (!whpx->kernel_irqchip_allowed) { +error_report ("WHPX: on Arm, only kernel-irqchip=on is currently supported" ); + ret = -EINVAL ; + goto error; + } + +memset (&prop,0 ,sizeof (WHV_PARTITION_PROPERTY )); + + hr = whp_dispatch.WHvSetupPartition (whpx->partition); +if (FAILED (hr)) { +error_report ("WHPX: Failed to setup partition, hr=%08lx" , hr);
target/arm/whpx/whpx-all.c line 838
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ ret = -EINVAL ; + goto error; + } + +whpx_memory_init (); + +return 0 ; + +error: +
Another nitpick: a blank line after a label.
These blank lines are trivial and do not prevent the patches to be merged, but I suppose this patch will have another version to address a crash with "whpx: apic: use non-deprecated APIs to control interrupt controller", so it is nice to have them tidied then.
Quoted 7 lines
target/arm/whpx/whpx-all.c new file +7
-0+if (whpx->partition !=NULL ) { + whp_dispatch.WHvDeletePartition (whpx->partition); + whpx->partition =NULL ; + } + +return ret; +}
PATCH v13 17/28 whpx: change memory management logic
In reply to Mohamed MediouniThis allows edk2 to work on Arm, although u-boot is still not functional.
--- accel/whpx/whpx-common.c | 97 +++++++++++++++------------------------- 1 file changed, 36 insertions(+), 61 deletions(-)
accel/whpx/whpx-common.c +36 -61
@@ -255,89 +255,64 @@ void whpx_vcpu_kick(CPUState *cpu)* Memory support. */ -static void whpx_update_mapping (hwaddr start_pa,ram_addr_t size, -void *host_va,int add,int rom, -const char *name) +static void whpx_set_phys_mem (MemoryRegionSection *section,bool add) {struct whpx_state *whpx = &whpx_global; +MemoryRegion *area = section->mr; +bool writable = !area->readonly && !area->rom_device; +WHV_MAP_GPA_RANGE_FLAGS flags; +uint64_t page_size =qemu_real_host_page_size (); +uint64_t gva = section->offset_within_address_space; +uint64_t size =int128_get64 (section->size);HRESULT hr; +void *mem; -/* -if (add) { -printf("WHPX: ADD PA:%p Size:%p, Host:%p, %s, '%s'\n", -(void*)start_pa, (void*)size, host_va, -(rom ? "ROM" : "RAM"), name); -} else { -printf("WHPX: DEL PA:%p Size:%p, Host:%p, '%s'\n", -(void*)start_pa, (void*)size, host_va, name); -} -*/ - -if (add) { - hr = whp_dispatch.WHvMapGpaRange (whpx->partition, - host_va, - start_pa, - size, - (WHvMapGpaRangeFlagRead | - WHvMapGpaRangeFlagExecute | - (rom ?0 : WHvMapGpaRangeFlagWrite))); - }else { - hr = whp_dispatch.WHvUnmapGpaRange (whpx->partition, - start_pa, - size); - } - -if (FAILED (hr)) { -error_report ("WHPX: Failed to %s GPA range '%s' PA:%p, Size:%p bytes," -" Host:%p, hr=%08lx" , - (add ?"MAP" :"UNMAP" ), name, - (void *)(uintptr_t )start_pa, (void *)size, host_va, hr); +if (!memory_region_is_ram (area)) { +if (writable) { +return ; + }else if (!memory_region_is_romd (area)) { + add = false; + } } -} - -static void whpx_process_section (MemoryRegionSection *section,int add) -{ -MemoryRegion *mr = section->mr; -hwaddr start_pa = section->offset_within_address_space; -ram_addr_t size =int128_get64 (section->size); -unsigned int delta; -uint64_t host_va; -if (!memory_region_is_ram (mr)) { -return ; +if (!QEMU_IS_ALIGNED (size, page_size) || + !QEMU_IS_ALIGNED (gva, page_size)) { +/* Not page aligned, so we can not map as RAM */ + add = false; } - delta =qemu_real_host_page_size () - (start_pa & ~qemu_real_host_page_mask ()); - delta &= ~qemu_real_host_page_mask (); -if (delta > size) { -return ; - } - start_pa += delta; - size -= delta; - size &=qemu_real_host_page_mask (); -if (!size || (start_pa & ~qemu_real_host_page_mask ())) { +if (!add) { + hr = whp_dispatch.WHvUnmapGpaRange (whpx->partition, + gva, size); +if (FAILED (hr)) { +error_report ("WHPX: failed to unmap GPA range" ); +abort (); + }return ; } - host_va = (uintptr_t )memory_region_get_ram_ptr (mr) - + section->offset_within_region + delta; + flags = WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagExecute + | (writable ? WHvMapGpaRangeFlagWrite :0 ); + mem =memory_region_get_ram_ptr (area) + section->offset_within_region; -whpx_update_mapping (start_pa, size, (void *)(uintptr_t )host_va, add, -memory_region_is_rom (mr), mr->name); + hr = whp_dispatch.WHvMapGpaRange (whpx->partition, + mem, gva, size, flags); +if (FAILED (hr)) { +error_report ("WHPX: failed to map GPA range" ); +abort (); + } }static void whpx_region_add (MemoryListener *listener,MemoryRegionSection *section) { -memory_region_ref (section->mr); -whpx_process_section (section,1 ); +whpx_set_phys_mem (section, true); }static void whpx_region_del (MemoryListener *listener,MemoryRegionSection *section) { -whpx_process_section (section,0 ); -memory_region_unref (section->mr); +whpx_set_phys_mem (section, false); }static void whpx_transaction_begin (MemoryListener *listener)
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 18/28 target/arm: cpu: mark WHPX as supporting PSCI 1.3
In reply to Mohamed MediouniHyper-V supports PSCI 1.3, and that implementation is exposed through WHPX.
--- target/arm/cpu.c | 3 +++ 1 file changed, 3 insertions(+)
target/arm/cpu.c +3 -0
@@ -23,6 +23,7 @@#include "qemu/timer.h" #include "qemu/log.h" #include "exec/page-vary.h" +#include "system/whpx.h" #include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h"
@@ -1143,6 +1144,8 @@ static void arm_cpu_initfn(Object *obj)if (tcg_enabled () ||hvf_enabled ()) {/* TCG and HVF implement PSCI 1.1 */ cpu->psci_version =QEMU_PSCI_VERSION_1_1 ; + }else if (whpx_enabled ()) { + cpu->psci_version =QEMU_PSCI_VERSION_1_3 ; } }
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 19/28 whpx: arm64: clamp down IPA size
In reply to Mohamed MediouniCode taken from HVF and adapted for WHPX use. Note that WHPX doesn't have a default vs maximum IPA distinction.
--- hw/arm/virt.c | 32 ++++++++++++++++++++++++++ include/hw/core/boards.h | 1 + target/arm/whpx/meson.build | 2 ++ target/arm/whpx/whpx-all.c | 45 +++++++++++++++++++++++++++++++++++++ target/arm/whpx/whpx-stub.c | 15 +++++++++++++ target/arm/whpx_arm.h | 16 +++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 target/arm/whpx/whpx-stub.c create mode 100644 target/arm/whpx_arm.h
hw/arm/virt.c +32 -0
@@ -72,6 +72,7 @@#include "hw/core/irq.h" #include "kvm_arm.h" #include "hvf_arm.h" +#include "whpx_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.h" #include "qapi/qapi-visit-common.h"
@@ -3315,6 +3316,36 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)return fixed_ipa ?0 : requested_pa_size; } +static int virt_whpx_get_physical_address_range (MachineState *ms) +{ +VirtMachineState *vms =VIRT_MACHINE (ms); + +int max_ipa_size =whpx_arm_get_ipa_bit_size (); + +/* We freeze the memory map to compute the highest gpa */ +virt_set_memmap (vms, max_ipa_size); + +int requested_ipa_size =64 -clz64 (vms->highest_gpa); + +/* +* If we're <= the default IPA size just use the default. +* If we're above the default but below the maximum, round up to +* the maximum. hvf_arm_get_max_ipa_bit_size() conveniently only +* returns values that are valid ARM PARange values. +*/ +if (requested_ipa_size <= max_ipa_size) { + requested_ipa_size = max_ipa_size; + }else { +error_report ("-m and ,maxmem option values " +"require an IPA range (%d bits) larger than " +"the one supported by the host (%d bits)" , + requested_ipa_size, max_ipa_size); +return -1 ; + } + +return requested_ipa_size; +} +static int virt_hvf_get_physical_address_range (MachineState *ms) {VirtMachineState *vms =VIRT_MACHINE (ms);
@@ -3414,6 +3445,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->hvf_get_physical_address_range = virt_hvf_get_physical_address_range; + mc->whpx_get_physical_address_range = virt_whpx_get_physical_address_range;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; hc->pre_plug = virt_machine_device_pre_plug_cb;
include/hw/core/boards.h +1 -0
@@ -278,6 +278,7 @@ struct MachineClass {void (*wakeup)(MachineState *state);int (*kvm_type)(MachineState *machine,const char *arg);int (*hvf_get_physical_address_range)(MachineState *machine); +int (*whpx_get_physical_address_range)(MachineState *machine);BlockInterfaceType block_default_type;int units_per_default_bus;
target/arm/whpx/meson.build +2 -0
@@ -1,3 +1,5 @@ arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', )) + +arm_common_system_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))
target/arm/whpx/whpx-all.c +45 -0
75 lines not on this page · raw message
target/arm/whpx/whpx-stub.c new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX stubs for ARM +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#include "qemu/osdep.h" +#include "whpx_arm.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ) +{ +g_assert_not_reached (); +}
target/arm/whpx_arm.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX support -- ARM specifics +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#ifndef QEMU_WHPX_ARM_H +#define QEMU_WHPX_ARM_H + +#include "target/arm/cpu-qom.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ); + +#endif
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v13 19/28] whpx: arm64: clamp down IPA size
Quoted 5 lines · Mohamed Mediouni
Code taken from HVF and adapted for WHPX use. Note that WHPX doesn't have a default vs maximum IPA distinction.
Signed-off-by Mohamed Mediouni <[email protected]>
Quoted 8 lines
Reviewed-by Pierrick Bouvier <[email protected]>--- hw/arm/virt.c | 32 ++++++++++++++++++++++++++ include/hw/core/boards.h | 1 + target/arm/whpx/meson.build | 2 ++ target/arm/whpx/whpx-all.c | 45 +++++++++++++++++++++++++++++++++++++ target/arm/whpx/whpx-stub.c | 15 +++++++++++++ target/arm/whpx_arm.h | 16 +++++++++++++
Better named as "whpx-arm.h" for consistency.
Quoted 25 lines
6 files changed, 111 insertions(+)create mode 100644
target/arm/whpx/whpx-stub.c
create mode 100644target/arm/whpx_arm.hhw/arm/virt.c +6
-0@@ -72,6 +72,7 @@#include "hw/core/irq.h" #include "kvm_arm.h" #include "hvf_arm.h" +#include "whpx_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.h" #include "qapi/qapi-visit-common.h" @@ -3315,6 +3316,36 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)return fixed_ipa ?0 : requested_pa_size; } +static int virt_whpx_get_physical_address_range (MachineState *ms) +{ +VirtMachineState *vms =VIRT_MACHINE (ms); + +int max_ipa_size =whpx_arm_get_ipa_bit_size ();
hw/arm/virt.c static int virt_kvm_type(MachineState *ms, const char *type_str) · line 3333
Quoted 10 lines
hw/arm/virt.c +10
-0+ +/* We freeze the memory map to compute the highest gpa */ +virt_set_memmap (vms, max_ipa_size); + +int requested_ipa_size =64 -clz64 (vms->highest_gpa); + +/* +* If we're <= the default IPA size just use the default. +* If we're above the default but below the maximum, round up to +* the maximum. hvf_arm_get_max_ipa_bit_size() conveniently only
This comment still mentions "hvf" though this is imported to whpx now.
Quoted 119 lines
hw/arm/virt.c +16
-0+* returns values that are valid ARM PARange values. +*/ +if (requested_ipa_size <= max_ipa_size) { + requested_ipa_size = max_ipa_size; + }else { +error_report ("-m and ,maxmem option values " +"require an IPA range (%d bits) larger than " +"the one supported by the host (%d bits)" , + requested_ipa_size, max_ipa_size); +return -1 ; + } + +return requested_ipa_size; +} +static int virt_hvf_get_physical_address_range (MachineState *ms) {VirtMachineState *vms =VIRT_MACHINE (ms);@@ -3414,6 +3445,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->hvf_get_physical_address_range = virt_hvf_get_physical_address_range; + mc->whpx_get_physical_address_range = virt_whpx_get_physical_address_range;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; hc->pre_plug = virt_machine_device_pre_plug_cb;include/hw/core/boards.h +1
-0@@ -278,6 +278,7 @@ struct MachineClass {void (*wakeup)(MachineState *state);int (*kvm_type)(MachineState *machine,const char *arg);int (*hvf_get_physical_address_range)(MachineState *machine); +int (*whpx_get_physical_address_range)(MachineState *machine);BlockInterfaceType block_default_type;int units_per_default_bus;target/arm/whpx/meson.build +2
-0@@ -1,3 +1,5 @@ arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', )) + +arm_common_system_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))target/arm/whpx/whpx-all.c +38
-0@@ -35,6 +35,7 @@#include "system/whpx-accel-ops.h" #include "system/whpx-all.h" #include "system/whpx-common.h" +#include "whpx_arm.h" #include "hw/arm/bsa.h" #include "arm-powerctl.h" @@ -657,6 +658,40 @@ static void whpx_cpu_update_state(void *opaque, bool running, RunState state) { } +uint32_t whpx_arm_get_ipa_bit_size (void ) +{ +WHV_CAPABILITY whpx_cap; +UINT32 whpx_cap_size; +HRESULT hr; + hr = whp_dispatch.WHvGetCapability ( + WHvCapabilityCodePhysicalAddressWidth, &whpx_cap, +sizeof (whpx_cap), &whpx_cap_size); +if (FAILED (hr)) { +error_report ("WHPX: failed to get supported" +"physical address width, hr=%08lx" , hr); + } + +/* +* We clamp any IPA size we want to back the VM with to a valid PARange +* value so the guest doesn't try and map memory outside of the valid range. +* This logic just clamps the passed in IPA bit size to the first valid +* PARange value <= to it. +*/ +return round_down_to_parange_bit_size (whpx_cap.PhysicalAddressWidth); +} + +static void clamp_id_aa64mmfr0_parange_to_ipa_size (ARMISARegisters *isar) +{ +uint32_t ipa_size =whpx_arm_get_ipa_bit_size (); +uint64_t id_aa64mmfr0; + +/* Clamp down the PARange to the IPA size the kernel supports. */ +uint8_t index =round_down_to_parange_index (ipa_size); + id_aa64mmfr0 =GET_IDREG (isar,ID_AA64MMFR0 ); + id_aa64mmfr0 = (id_aa64mmfr0 & ~R_ID_AA64MMFR0_PARANGE_MASK ) | index; +SET_IDREG (isar,ID_AA64MMFR0 , id_aa64mmfr0); +} +int whpx_init_vcpu (CPUState *cpu) {HRESULT hr;@@ -735,6 +770,7 @@ int whpx_init_vcpu(CPUState *cpu) val.Reg64 =deposit64 (arm_cpu->mp_affinity,31 ,1 ,1 /* RES1 */ );whpx_set_reg (cpu, WHvArm64RegisterMpidrEl1, val); +clamp_id_aa64mmfr0_parange_to_ipa_size (&arm_cpu->isar);return 0 ; error:@@ -757,6 +793,8 @@ int whpx_accel_init(AccelState *as, MachineState *ms)UINT32 whpx_cap_size;WHV_PARTITION_PROPERTY prop;WHV_CAPABILITY_FEATURES features = {0 }; +MachineClass *mc =MACHINE_GET_CLASS (ms); +int pa_range =0 ; whpx = &whpx_global;/* on arm64 Windows Hypervisor Platform, vGICv3 always used */
target/arm/whpx/whpx-all.c int whpx_accel_init(AccelState *as, MachineState *ms) · line 811
Quoted 7 lines
target/arm/whpx/whpx-all.c +4
-0@@ -767,6 +805,13 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } +if (mc->whpx_get_physical_address_range) { + pa_range = mc->whpx_get_physical_address_range (ms); +if (pa_range <0 ) { +return -EINVAL ;
This should: goto error;
Quoted 49 lines
target/arm/whpx/whpx-all.c +3
-0+ } + } + whpx->mem_quota = ms->ram_size; hr = whp_dispatch.WHvGetCapability(target/arm/whpx/whpx-stub.c new file +15
-0@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX stubs for ARM +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#include "qemu/osdep.h" +#include "whpx_arm.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ) +{ +g_assert_not_reached (); +}target/arm/whpx_arm.h new file +16
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX support -- ARM specifics +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#ifndef QEMU_WHPX_ARM_H +#define QEMU_WHPX_ARM_H + +#include "target/arm/cpu-qom.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ); + +#endif
PATCH v13 20/28 hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVF
In reply to Mohamed Mediouni--- accel/hvf/hvf-all.c | 7 +++++-- hw/arm/virt.c | 41 ++++---------------------------------- include/hw/core/boards.h | 4 ++-- include/system/hvf_int.h | 5 +++++ target/arm/hvf-stub.c | 20 ------------------- target/arm/hvf/hvf.c | 6 +++--- target/arm/hvf_arm.h | 3 --- target/arm/meson.build | 1 - target/arm/whpx/whpx-all.c | 5 +++-- target/i386/hvf/hvf.c | 11 ++++++++++ 10 files changed, 33 insertions(+), 70 deletions(-) delete mode 100644 target/arm/hvf-stub.c
accel/hvf/hvf-all.c +5 -2
@@ -17,6 +17,7 @@#include "system/hvf_int.h" #include "hw/core/cpu.h" #include "hw/core/boards.h" +#include "target/arm/hvf_arm.h" #include "trace.h" bool hvf_allowed;
@@ -256,8 +257,10 @@ static int hvf_accel_init(AccelState *as, MachineState *ms)int pa_range =36 ;MachineClass *mc =MACHINE_GET_CLASS (ms); -if (mc->hvf_get_physical_address_range) { - pa_range = mc->hvf_get_physical_address_range (ms); + +if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range (ms, +hvf_arch_get_default_ipa_bit_size (),hvf_arch_get_max_ipa_bit_size ());if (pa_range <0 ) {return -EINVAL ; }
hw/arm/virt.c +4 -37
62 lines not on this page · raw message
include/hw/core/boards.h +2 -2
@@ -277,8 +277,8 @@ struct MachineClass {void (*reset)(MachineState *state,ResetType type);void (*wakeup)(MachineState *state);int (*kvm_type)(MachineState *machine,const char *arg); -int (*hvf_get_physical_address_range)(MachineState *machine); -int (*whpx_get_physical_address_range)(MachineState *machine); +int (*get_physical_address_range)(MachineState *machine, +int default_ipa_size,int max_ipa_size);BlockInterfaceType block_default_type;int units_per_default_bus;
include/system/hvf_int.h +5 -0
@@ -73,6 +73,8 @@ void assert_hvf_ok_impl(hv_return_t ret, const char *file, unsigned int line,const char *hvf_return_string (hv_return_t ret);int hvf_arch_init (void );hv_return_t hvf_arch_vm_create (MachineState *ms,uint32_t pa_range); +uint32_t hvf_arch_get_default_ipa_bit_size (void ); +uint32_t hvf_arch_get_max_ipa_bit_size (void );hvf_slot *hvf_find_overlap_slot (uint64_t ,uint64_t );void hvf_kick_vcpu_thread (CPUState *cpu);
@@ -120,4 +122,7 @@ int hvf_update_guest_debug(CPUState *cpu);*/ bool hvf_arch_supports_guest_debug (void ); +uint32_t hvf_arch_get_default_ipa_bit_size (void ); +uint32_t hvf_arch_get_max_ipa_bit_size (void ); +#endif
target/arm/hvf-stub.c deleted +0 -20
@@ -1,20 +0,0 @@ -/* -* QEMU Hypervisor.framework (HVF) stubs for ARM -* -* Copyright (c) Linaro -* -* SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#include "qemu/osdep.h" -#include "hvf_arm.h" - -uint32_t hvf_arm_get_default_ipa_bit_size (void ) -{ -g_assert_not_reached (); -} - -uint32_t hvf_arm_get_max_ipa_bit_size (void ) -{ -g_assert_not_reached (); -}
target/arm/hvf/hvf.c +3 -3
@@ -731,7 +731,7 @@ static uint64_t hvf_get_reg(CPUState *cpu, int rt)static void clamp_id_aa64mmfr0_parange_to_ipa_size (ARMISARegisters *isar) {uint32_t ipa_size = chosen_ipa_bit_size ? - chosen_ipa_bit_size :hvf_arm_get_max_ipa_bit_size (); + chosen_ipa_bit_size :hvf_arch_get_max_ipa_bit_size ();uint64_t id_aa64mmfr0;/* Clamp down the PARange to the IPA size the kernel supports. */
@@ -827,7 +827,7 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)return r ==HV_SUCCESS ; } -uint32_t hvf_arm_get_default_ipa_bit_size (void ) +uint32_t hvf_arch_get_default_ipa_bit_size (void ) {uint32_t default_ipa_size;hv_return_t ret =hv_vm_config_get_default_ipa_size (&default_ipa_size);
@@ -836,7 +836,7 @@ uint32_t hvf_arm_get_default_ipa_bit_size(void)return default_ipa_size; } -uint32_t hvf_arm_get_max_ipa_bit_size (void ) +uint32_t hvf_arch_get_max_ipa_bit_size (void ) {uint32_t max_ipa_size;hv_return_t ret =hv_vm_config_get_max_ipa_size (&max_ipa_size);
target/arm/hvf_arm.h +0 -3
@@ -22,7 +22,4 @@ void hvf_arm_init_debug(void);void hvf_arm_set_cpu_features_from_host (ARMCPU *cpu); -uint32_t hvf_arm_get_default_ipa_bit_size (void ); -uint32_t hvf_arm_get_max_ipa_bit_size (void ); -#endif
target/arm/meson.build +0 -1
@@ -41,7 +41,6 @@ arm_common_system_ss.add(files('cpu.c')) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -arm_common_system_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('common-semi-target.c')) arm_common_system_ss.add(files(
target/arm/whpx/whpx-all.c +3 -2
@@ -805,8 +805,9 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } -if (mc->whpx_get_physical_address_range) { - pa_range = mc->whpx_get_physical_address_range (ms); +if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range (ms, +whpx_arm_get_ipa_bit_size (),whpx_arm_get_ipa_bit_size ());if (pa_range <0 ) {return -EINVAL ; }
target/i386/hvf/hvf.c +11 -0
@@ -225,6 +225,17 @@ int hvf_arch_init(void)return 0 ; } +/* 48-bit on all Intel Macs. Function currently unused. */ +uint32_t hvf_arch_get_default_ipa_bit_size (void ) +{ +g_assert_not_reached (); +} + +uint32_t hvf_arch_get_max_ipa_bit_size (void ) +{ +g_assert_not_reached (); +} +hv_return_t hvf_arch_vm_create (MachineState *ms,uint32_t pa_range) {return hv_vm_create (HV_VM_DEFAULT );
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 21/28 whpx: arm64: implement -cpu host
In reply to Mohamed MediouniLogic to fetch MIDR_EL1 for cpu 0 adapted from:
https://github.com/FEX-Emu/FEX/blob/e6de17e72ef03aa88ba14fa0ec13163061608c74/Source/Windows/Common/CPUFeatures.cpp#L62
--- target/arm/cpu64.c | 17 +++--- target/arm/whpx/whpx-all.c | 104 +++++++++++++++++++++++++++++++++++++ target/arm/whpx_arm.h | 1 + 3 files changed, 116 insertions(+), 6 deletions(-)
target/arm/cpu64.c +11 -6
@@ -26,10 +26,13 @@#include "qemu/units.h" #include "system/kvm.h" #include "system/hvf.h" +#include "system/whpx.h" +#include "system/hw_accel.h" #include "system/qtest.h" #include "system/tcg.h" #include "kvm_arm.h" #include "hvf_arm.h" +#include "whpx_arm.h" #include "qapi/visitor.h" #include "hw/core/qdev-properties.h" #include "internals.h"
@@ -521,7 +524,7 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) isar2 =FIELD_DP64 (isar2,ID_AA64ISAR2 ,APA3 ,0 ); isar2 =FIELD_DP64 (isar2,ID_AA64ISAR2 ,GPA3 ,0 ); -if (kvm_enabled () ||hvf_enabled ()) { +if (hwaccel_enabled ()) {/* * Exit early if PAuth is enabled and fall through to disable it. * The algorithm selection properties are not present.
@@ -598,10 +601,10 @@ void aarch64_add_pauth_properties(Object *obj)/* Default to PAUTH on, with the architected algorithm on TCG. */ qdev_property_add_static (DEVICE (obj), &arm_cpu_pauth_property); -if (kvm_enabled () ||hvf_enabled ()) { +if (hwaccel_enabled ()) {/* * Mirror PAuth support from the probed sysregs back into the -* property for KVM or hvf. Is it just a bit backward? Yes it is! +* property for HW accel. Is it just a bit backward? Yes it is! * Note that prop_pauth is true whether the host CPU supports the * architected QARMA5 algorithm or the IMPDEF one. We don't * provide the separate pauth-impdef property for KVM or hvf,
@@ -769,6 +772,8 @@ static void aarch64_host_initfn(Object *obj) }#elif defined(CONFIG_HVF)hvf_arm_set_cpu_features_from_host (cpu); +#elif defined(CONFIG_WHPX) +whpx_arm_set_cpu_features_from_host (cpu);#else g_assert_not_reached ();#endif
@@ -779,8 +784,8 @@ static void aarch64_host_initfn(Object *obj)static void aarch64_max_initfn (Object *obj) { -if (kvm_enabled () ||hvf_enabled ()) { -/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */ +if (hwaccel_enabled ()) { +/* When hardware acceleration enabled, '-cpu max' is identical to '-cpu host' */ aarch64_host_initfn (obj);return ; }
@@ -799,7 +804,7 @@ static const ARMCPUInfo aarch64_cpus[] = { { .name = "cortex-a57", .initfn = aarch64_a57_initfn }, { .name = "cortex-a53", .initfn = aarch64_a53_initfn }, { .name = "max", .initfn = aarch64_max_initfn }, -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) || defined(CONFIG_WHPX) { .name = "host", .initfn = aarch64_host_initfn }, #endif };
target/arm/whpx/whpx-all.c +104 -0
116 lines not on this page · raw message
target/arm/whpx_arm.h +1 -0
@@ -12,5 +12,6 @@#include "target/arm/cpu-qom.h" uint32_t whpx_arm_get_ipa_bit_size (void ); +void whpx_arm_set_cpu_features_from_host (ARMCPU *cpu);#endif
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 22/28 target/arm: whpx: instantiate GIC early
In reply to Mohamed MediouniWhile figuring out a better spot for it, put it in whpx_accel_init.
Needs to be done before WHvSetupPartition.
--- target/arm/whpx/whpx-all.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
target/arm/whpx/whpx-all.c +23 -0
@@ -973,6 +973,29 @@ int whpx_accel_init(AccelState *as, MachineState *ms)memset (&prop,0 ,sizeof (WHV_PARTITION_PROPERTY )); +WHV_ARM64_IC_PARAMETERS ic_params = { + .EmulationMode = WHvArm64IcEmulationModeGicV3, + .GicV3Parameters = { + .GicdBaseAddress =0x08000000 , + .GitsTranslaterBaseAddress =0x08080000 , + .GicLpiIntIdBits =0 , + .GicPpiPerformanceMonitorsInterrupt =VIRTUAL_PMU_IRQ , + .GicPpiOverflowInterruptFromCntv =ARCH_TIMER_VIRT_IRQ + } + }; + prop.Arm64IcParameters = ic_params; + + hr = whp_dispatch.WHvSetPartitionProperty ( + whpx->partition, + WHvPartitionPropertyCodeArm64IcParameters, + &prop, +sizeof (WHV_PARTITION_PROPERTY )); +if (FAILED (hr)) { +error_report ("WHPX: Failed to enable GICv3 interrupt controller, hr=%08lx" , hr); + ret = -EINVAL ; + goto error; + } + hr = whp_dispatch.WHvSetupPartition (whpx->partition);if (FAILED (hr)) {error_report ("WHPX: Failed to setup partition, hr=%08lx" , hr);
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 23/28 whpx: arm64: gicv3: add migration blocker
In reply to Mohamed MediouniGICv3 state save-restore is currently not implemented yet.
--- hw/intc/arm_gicv3_whpx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/intc/arm_gicv3_whpx.c +10 -0
@@ -17,6 +17,7 @@#include "system/whpx-internal.h" #include "gicv3_internal.h" #include "vgic_common.h" +#include "migration/blocker.h" #include "qom/object.h" #include "target/arm/cpregs.h"
@@ -205,6 +206,15 @@ static void whpx_gicv3_realize(DeviceState *dev, Error **errp)error_setg (errp,"Nested virtualisation not currently supported by WHPX." );return ; } + +Error *whpx_migration_blocker =NULL ; + +error_setg (&whpx_migration_blocker, +"Live migration disabled because GIC state save/restore not supported on WHPX" ); +if (migrate_add_blocker (&whpx_migration_blocker, errp)) { +error_free (whpx_migration_blocker); +return ; + } }static void whpx_gicv3_class_init (ObjectClass *klass,const void *data)
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 24/28 whpx: enable arm64 builds
In reply to Mohamed Mediouni--- meson.build | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
meson.build +13 -7
@@ -317,7 +317,8 @@ accelerator_targets += { 'CONFIG_XEN': xen_targets } if cpu == 'aarch64' accelerator_targets += { - 'CONFIG_HVF': ['aarch64-softmmu'] + 'CONFIG_HVF': ['aarch64-softmmu'], + 'CONFIG_WHPX': ['aarch64-softmmu'] } elif cpu == 'x86_64' accelerator_targets += {
@@ -883,13 +884,18 @@ if get_option('mshv').allowed() and host_os == 'linux' endif if get_option('whpx').allowed() and host_os == 'windows' - if get_option('whpx').enabled() and host_machine.cpu() != 'x86_64' - error('WHPX requires 64-bit host') - elif cc.has_header('winhvplatform.h', required: get_option('whpx')) and \ - cc.has_header('winhvemulation.h', required: get_option('whpx')) - accelerators += 'CONFIG_WHPX' + if cpu == 'i386' + if get_option('whpx').enabled() + error('WHPX requires 64-bit host') + endif + # Leave CONFIG_WHPX disabled + else + if cc.has_header('winhvplatform.h', required: get_option('whpx')) and \ + cc.has_header('winhvemulation.h', required: get_option('whpx')) + accelerators += 'CONFIG_WHPX' + endif endif -endif + endif hvf = not_found if get_option('hvf').allowed()
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 25/28 whpx: apic: use non-deprecated APIs to control interrupt controller state
In reply to Mohamed MediouniWHvGetVirtualProcessorInterruptControllerState2 and WHvSetVirtualProcessorInterruptControllerState2 are deprecated since Windows 10 version 2004.
Use the non-deprecated WHvGetVirtualProcessorState and WHvSetVirtualProcessorState when available.
--- include/system/whpx-internal.h | 9 +++++++ target/i386/whpx/whpx-apic.c | 46 +++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 12 deletions(-)
include/system/whpx-internal.h +9 -0
@@ -86,6 +86,15 @@ void whpx_apic_get(APICCommonState *s);X (HRESULT , WHvSetVirtualProcessorInterruptControllerState2, \ (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, PVOID State, \ UINT32 StateSize)) \ +X (HRESULT , WHvGetVirtualProcessorState, \ + (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, \ + WHV_VIRTUAL_PROCESSOR_STATE_TYPE StateType, PVOID Buffer, \ + UINT32 BufferSizeInBytes, UINT32 *BytesWritten)) \ +X (HRESULT , WHvSetVirtualProcessorState, \ + (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, \ + WHV_VIRTUAL_PROCESSOR_STATE_TYPE StateType, PVOID Buffer, \ + UINT32 BufferSizeInBytes)) \ +#define LIST_WINHVEMULATION_FUNCTIONS (X ) \ X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS* Callbacks, WHV_EMULATOR_HANDLE* Emulator)) \
target/i386/whpx/whpx-apic.c +34 -12
61 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 26/28 whpx: arm64: check for physical address width after WHPX availability
In reply to Mohamed MediouniIn the case where WHPX isn't supported on the platform, makes the intended error appear instead of failing at getting the IPA width.
--- target/arm/whpx/whpx-all.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
target/arm/whpx/whpx-all.c +9 -9
@@ -678,7 +678,7 @@ uint32_t whpx_arm_get_ipa_bit_size(void) WHvCapabilityCodePhysicalAddressWidth, &whpx_cap, sizeof(whpx_cap), &whpx_cap_size);if (FAILED (hr)) { -error_report ("WHPX: failed to get supported" +error_report ("WHPX: failed to get supported " "physical address width, hr=%08lx" , hr); }
@@ -909,14 +909,6 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } -if (mc->get_physical_address_range) { - pa_range = mc->get_physical_address_range (ms, -whpx_arm_get_ipa_bit_size (),whpx_arm_get_ipa_bit_size ()); -if (pa_range <0 ) { -return -EINVAL ; - } - } - whpx->mem_quota = ms->ram_size; hr = whp_dispatch.WHvGetCapability(
@@ -943,6 +935,14 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } +if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range (ms, +whpx_arm_get_ipa_bit_size (),whpx_arm_get_ipa_bit_size ()); +if (pa_range <0 ) { +return -EINVAL ; + } + } + hr = whp_dispatch.WHvCreatePartition (&whpx->partition);if (FAILED (hr)) {error_report ("WHPX: Failed to create partition, hr=%08lx" , hr);
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 27/28 whpx: arm64: add partition-wide reset on the reboot path
In reply to Mohamed MediouniThis resets non-architectural state to allow for reboots to succeed.
--- include/system/whpx-internal.h | 2 ++ target/arm/whpx/whpx-all.c | 2 ++ 2 files changed, 4 insertions(+)
include/system/whpx-internal.h +2 -0
@@ -94,6 +94,8 @@ void whpx_apic_get(APICCommonState *s); (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, \ WHV_VIRTUAL_PROCESSOR_STATE_TYPE StateType, PVOID Buffer, \ UINT32 BufferSizeInBytes)) \ + X(HRESULT, WHvResetPartition, \ + (WHV_PARTITION_HANDLE Partition)) \#define LIST_WINHVEMULATION_FUNCTIONS (X ) \
target/arm/whpx/whpx-all.c +2 -0
@@ -497,6 +497,8 @@ int whpx_vcpu_run(CPUState *cpu)if (arm_cpu->power_state !=PSCI_OFF ) {whpx_psci_cpu_off (arm_cpu); } +/* Partition-wide reset, to reset state for reboots to succeed. */ + whp_dispatch.WHvResetPartition (whpx->partition);bql_unlock ();break ;case WHvRunVpExitReasonNone:
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v13 28/28 MAINTAINERS: update the list of maintained files for WHPX
In reply to Mohamed MediouniAdd arm64-specific files.
--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -552,6 +552,8 @@ M: Mohamed Mediouni <[email protected]> S: Supported F: accel/whpx/ F: target/i386/whpx/ +F: target/arm/whpx/ +F: hw/intc/arm_gicv3_whpx.c F: accel/stubs/whpx-stub.c F: include/system/whpx.h F: include/system/whpx-accel-ops.h
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 176 lines · Mohamed Mediouni
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windowsx86_64build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine modelUpdates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PRUpdates since v9:
- Adding partition reset on the reboot side of things...Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 stateUpdates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register syncUpdates 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.
- generalizeget_physical_address_rangeinto something common between hvf and whpxUpdates since v2:
- Fixed up a rebase screwup forwhpx-internal.h
- FixedID_AA64ISAR1_EL1andID_AA64ISAR2_EL1feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variantUpdates since v1:
- Shutdowns and reboots
-MPIDR_EL1register sync
- FixingGICD_TYPER_LPISvalue
- IPA size clamping
- -cpu host now implementedMohamed Mediouni (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: addWHPX_INTERCEPT_DEBUG_TRAPSdefine
hw, target, accel: whpx: changeapic_in_platformtokernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unifyget_physical_address_rangebetween WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPXPhilippe Mathieu-Daudé (1):
accel/system: Introducehwaccel_enabled()helperSebastian Ott (1):
target/arm/kvm: add constants for new PSCI versionsMAINTAINERS | 6 + accel/hvf/hvf-all.c | 7 +- accel/meson.build | 1 + accel/stubs/whpx-stub.c | 1 + accel/whpx/meson.build | 7 + {target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +- accel/whpx/whpx-common.c | 536 +++++++++ docs/system/arm/virt.rst | 13 +- hw/arm/virt-acpi-build.c | 16 +- hw/arm/virt.c | 140 ++- 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 | 8 +- include/hw/core/boards.h | 3 +- include/hw/intc/arm_gicv3_common.h | 3 + include/system/hvf_int.h | 5 + 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 | 25 +- include/system/whpx.h | 5 +- meson.build | 20 +- target/arm/cpu.c | 3 + target/arm/cpu64.c | 17 +- 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 | 1020 +++++++++++++++++ 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 42 files changed, 2215 insertions(+), 648 deletions(-)
Quoted 14 lines
create mode 100644 accel/whpx/meson.build
rename {target/i386 =>accel}/whpx/whpx-accel-ops.c(96%) create mode 100644accel/whpx/whpx-common.c
create mode 100644hw/intc/arm_gicv3_whpx.c
rename {target/i386/whpx =>include/system}/whpx-accel-ops.h(92%) create mode 100644include/system/whpx-all.h
create mode 100644include/system/whpx-common.h
rename {target/i386/whpx =>include/system}/whpx-internal.h(88%) delete mode 100644target/arm/hvf-stub.c
create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.c
create mode 100644target/arm/whpx/whpx-stub.c
create mode 100644target/arm/whpx_arm.h
Thanks Mohamed.
Looks all good to me, and all checks are passing.
I hope it can be pulled quickly by a maintainer, before this series conflicts with any other changes on this area.
Regards,
Pierrick
Am 30. Dezember 2025 03:47:20 UTC schrieb Pierrick Bouvier <[email protected]>:
Quoted 192 lines · Mohamed Mediouni
Quoted 176 lines
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windowsx86_64build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine modelUpdates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PRUpdates since v9:
- Adding partition reset on the reboot side of things...Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 stateUpdates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register syncUpdates 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.
- generalizeget_physical_address_rangeinto something common between hvf and whpxUpdates since v2:
- Fixed up a rebase screwup forwhpx-internal.h
- FixedID_AA64ISAR1_EL1andID_AA64ISAR2_EL1feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variantUpdates since v1:
- Shutdowns and reboots
-MPIDR_EL1register sync
- FixingGICD_TYPER_LPISvalue
- IPA size clamping
- -cpu host now implementedMohamed Mediouni (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: addWHPX_INTERCEPT_DEBUG_TRAPSdefine
hw, target, accel: whpx: changeapic_in_platformtokernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unifyget_physical_address_rangebetween WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPXPhilippe Mathieu-Daudé (1):
accel/system: Introducehwaccel_enabled()helperSebastian Ott (1):
target/arm/kvm: add constants for new PSCI versionsMAINTAINERS | 6 + accel/hvf/hvf-all.c | 7 +- accel/meson.build | 1 + accel/stubs/whpx-stub.c | 1 + accel/whpx/meson.build | 7 + {target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +- accel/whpx/whpx-common.c | 536 +++++++++ docs/system/arm/virt.rst | 13 +- hw/arm/virt-acpi-build.c | 16 +- hw/arm/virt.c | 140 ++- 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 | 8 +- include/hw/core/boards.h | 3 +- include/hw/intc/arm_gicv3_common.h | 3 + include/system/hvf_int.h | 5 + 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 | 25 +- include/system/whpx.h | 5 +- meson.build | 20 +- target/arm/cpu.c | 3 + target/arm/cpu64.c | 17 +- 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 | 1020 +++++++++++++++++ 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 42 files changed, 2215 insertions(+), 648 deletions(-)Quoted 14 lines
create mode 100644 accel/whpx/meson.build
rename {target/i386 =>accel}/whpx/whpx-accel-ops.c(96%) create mode 100644accel/whpx/whpx-common.c
create mode 100644hw/intc/arm_gicv3_whpx.c
rename {target/i386/whpx =>include/system}/whpx-accel-ops.h(92%) create mode 100644include/system/whpx-all.h
create mode 100644include/system/whpx-common.h
rename {target/i386/whpx =>include/system}/whpx-internal.h(88%) delete mode 100644target/arm/hvf-stub.c
create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.c
create mode 100644target/arm/whpx/whpx-stub.c
create mode 100644target/arm/whpx_arm.h
Quoted 3 lines
Thanks Mohamed.
Looks all good to me, and all checks are passing.
I hope it can be pulled quickly by a maintainer, before this series conflicts with any other changes on this area.
Hi,
I still need to revert "whpx: apic: use non-deprecated APIs to control interrupt controller" for QEMU not to crash, see:
- https://lore.kernel.org/qemu-devel/[email protected]/
- https://lore.kernel.org/qemu-devel/[email protected]/
The problem can be reproduced by running "qemu-system-x86_64 -accel whpx". Let me know if you need some further details.
Best regards,
Bernhard
Quoted 4 lines
Regards,
Pierrick
Quoted 205 lines · Bernhard Beschow
Am 30. Dezember 2025 03:47:20 UTC schrieb Pierrick Bouvier <[email protected] <mailto:[email protected]>>:
Quoted 192 lines · Mohamed Mediouni
Quoted 181 lines
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windowsx86_64build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine modelUpdates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PRUpdates since v9:
- Adding partition reset on the reboot side of things...Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 stateUpdates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register syncUpdates 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.
- generalizeget_physical_address_rangeinto something common between hvf and whpxUpdates since v2:
- Fixed up a rebase screwup forwhpx-internal.h
- FixedID_AA64ISAR1_EL1andID_AA64ISAR2_EL1feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variantUpdates since v1:
- Shutdowns and reboots
-MPIDR_EL1register sync
- FixingGICD_TYPER_LPISvalue
- IPA size clamping
- -cpu host now implementedMohamed Mediouni (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: addWHPX_INTERCEPT_DEBUG_TRAPSdefine
hw, target, accel: whpx: changeapic_in_platformtokernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unifyget_physical_address_rangebetween WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPXPhilippe Mathieu-Daudé (1):
accel/system: Introducehwaccel_enabled()helperSebastian Ott (1):
target/arm/kvm: add constants for new PSCI versionsMAINTAINERS | 6 + accel/hvf/hvf-all.c | 7 +- accel/meson.build | 1 + accel/stubs/whpx-stub.c | 1 + accel/whpx/meson.build | 7 + {target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +- accel/whpx/whpx-common.c | 536 +++++++++ docs/system/arm/virt.rst | 13 +- hw/arm/virt-acpi-build.c | 16 +- hw/arm/virt.c | 140 ++- 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 | 8 +- include/hw/core/boards.h | 3 +- include/hw/intc/arm_gicv3_common.h | 3 + include/system/hvf_int.h | 5 + 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 | 25 +- include/system/whpx.h | 5 +- meson.build | 20 +- target/arm/cpu.c | 3 + target/arm/cpu64.c | 17 +- 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 | 1020 +++++++++++++++++ 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 42 files changed, 2215 insertions(+), 648 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%)Quoted 9 lines
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 (88%) 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.hQuoted 3 lines
Thanks Mohamed.
Looks all good to me, and all checks are passing.
I hope it can be pulled quickly by a maintainer, before this series conflicts with any other changes on this area.Hi,
Quoted 8 lines
I still need to revert "whpx: apic: use non-deprecated APIs to control interrupt controller" for QEMU not to crash, see:
- https://lore.kernel.org/qemu-devel/[email protected]/
- https://lore.kernel.org/qemu-devel/[email protected]/The problem can be reproduced by running "qemu-system-x86_64 -accel whpx". Let me know if you need some further details.
Best regards,
Bernhard
Hello,
Will be useful to know which platform you saw this on, and that patch is safe to drop on its own. Will send the pull request (if needed to send one) without it pending more investigation.
Thank you,
-Mohamed
Quoted 3 lines
Quoted 3 lines
Regards,
Pierrick
Quoted 218 lines · Mohamed Mediouni
Quoted 206 lines · Bernhard Beschow
Am 30. Dezember 2025 03:47:20 UTC schrieb Pierrick Bouvier <[email protected] <mailto:[email protected]>>:
Quoted 192 lines · Mohamed Mediouni
Quoted 181 lines
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windowsx86_64build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine modelUpdates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PRUpdates since v9:
- Adding partition reset on the reboot side of things...Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 stateUpdates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register syncUpdates 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.
- generalizeget_physical_address_rangeinto something common between hvf and whpxUpdates since v2:
- Fixed up a rebase screwup forwhpx-internal.h
- FixedID_AA64ISAR1_EL1andID_AA64ISAR2_EL1feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variantUpdates since v1:
- Shutdowns and reboots
-MPIDR_EL1register sync
- FixingGICD_TYPER_LPISvalue
- IPA size clamping
- -cpu host now implementedMohamed Mediouni (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: addWHPX_INTERCEPT_DEBUG_TRAPSdefine
hw, target, accel: whpx: changeapic_in_platformtokernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unifyget_physical_address_rangebetween WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPXPhilippe Mathieu-Daudé (1):
accel/system: Introducehwaccel_enabled()helperSebastian Ott (1):
target/arm/kvm: add constants for new PSCI versionsMAINTAINERS | 6 + accel/hvf/hvf-all.c | 7 +- accel/meson.build | 1 + accel/stubs/whpx-stub.c | 1 + accel/whpx/meson.build | 7 + {target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +- accel/whpx/whpx-common.c | 536 +++++++++ docs/system/arm/virt.rst | 13 +- hw/arm/virt-acpi-build.c | 16 +- hw/arm/virt.c | 140 ++- 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 | 8 +- include/hw/core/boards.h | 3 +- include/hw/intc/arm_gicv3_common.h | 3 + include/system/hvf_int.h | 5 + 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 | 25 +- include/system/whpx.h | 5 +- meson.build | 20 +- target/arm/cpu.c | 3 + target/arm/cpu64.c | 17 +- 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 | 1020 +++++++++++++++++ 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 42 files changed, 2215 insertions(+), 648 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%)Quoted 9 lines
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 (88%) 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.hQuoted 3 lines
Thanks Mohamed.
Looks all good to me, and all checks are passing.
I hope it can be pulled quickly by a maintainer, before this series conflicts with any other changes on this area.Hi,
Quoted 8 lines
I still need to revert "whpx: apic: use non-deprecated APIs to control interrupt controller" for QEMU not to crash, see:
- https://lore.kernel.org/qemu-devel/[email protected]/
- https://lore.kernel.org/qemu-devel/[email protected]/The problem can be reproduced by running "qemu-system-x86_64 -accel whpx". Let me know if you need some further details.
Best regards,
Bernhard
Quoted 7 lines
Hello,
Will be useful to know which platform you saw this on, and that patch is safe to drop on its own. Will send the pull request (if needed to send one) without it pending more investigation.
Thank you,
-Mohamed
Nevermind I can reproduce locally on Windows 11 version 25H2. Looking further later…
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Regards,
Pierrick
Quoted 14 lines · Mohamed Mediouni
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v13)
Missing features:
- VM save-restore: interrupt controller state notably
- SVE register sync: I didn't have the time to test this on pre-release hardware with SVE2 support yet. So SVE2 is currently masked for VMs when running this.Known bugs:
- U-Boot still doesn't work (hangs when trying to parse firmware) but EDK2 does.Note:
"target/arm/kvm: add constants for new PSCI versions" taken from the mailing list.
Quoted 8 lines
"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.
"hw: arm: virt-acpi-build: add temporary hack to match existing behavior" is for ACPI stability but what is the right approach to follow there?
Since I missed this question in previous versions and seems no one have answered yet; so I add my answer here:
If the hack is intended to be temporary, it should be implemented with a compatibility property.
docs/devel/migration/compatibility.rst says "migration is only supposed to work if you use the same machine type in both source and destination." So it is fine to make a sensible change to the guest-visible behavior for newer machine type versions.
What's not tolerated is to break the existing versions. Please note that such a rule is applied for *each patch* instead of the entire series. It looks the patch series once creates a change of the ACPI table and patch "hw: arm: virt-acpi-build: add temporary hack to match existing behavior" reverts it. This prevents git bisect so should be avoided according to: docs/devel/submitting-a-patch.rst
I think making a change is fine as long as the rules described in the documentation are followed and it "makes sense" in general; I cannot really tell if it makes sense since I have rarely touched that particular code, but you can actually send a patch to make the change, possibily with the RFC tag, and ask for review.
Regards,
Akihiko Odaki
Quoted 168 lines
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 v12:
- Address review comments and make sure that checkpatch shows no errors, make test also ran
- Tested the Windowsx86_64build too in addition to Windows arm64 and macOS arm64
- Hopefully the last revision, should be ready to merge.Updates since v11:
- Address review comments
- Rebase up to latest staging
- Switch to assuming Qemu 11.0 as the newest machine modelUpdates since v10:
- Bring forward to latest Qemu
- Fix a typo in the GICv3+GICv2m PRUpdates since v9:
- Adding partition reset on the reboot side of things...Updates since v8:
- v9 and v8 were not submitted properly because of my MTA not behaving, sorry for that.
- v10 introduces a new argument, -M msi=, to handle MSI-X configuration more granularly.
- That surfaced what I think is a bug (?), with vms->its=1 on GICv2 configurations... or I did understand everything wrong.
- 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 stateUpdates since v4:
- Taking into account review comments
- Add migration blocker in the vGICv3 code due to missing interrupt controller save/restore
- Debug register syncUpdates 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.
- generalizeget_physical_address_rangeinto something common between hvf and whpxUpdates since v2:
- Fixed up a rebase screwup forwhpx-internal.h
- FixedID_AA64ISAR1_EL1andID_AA64ISAR2_EL1feature probe for -cpu host
- Switched to ID_AA64PFR1_EL1/ID_AA64DFR0_EL1 instead of their non-AA64 variantUpdates since v1:
- Shutdowns and reboots
-MPIDR_EL1register sync
- FixingGICD_TYPER_LPISvalue
- IPA size clamping
- -cpu host now implementedMohamed Mediouni (26):
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
hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
hw: arm: virt: rework MSI-X configuration
hw: arm: virt-acpi-build: add temporary hack to match existing
behavior
docs: arm: update virt machine model description
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out winhvemulation on non-x86_64
whpx: common: addWHPX_INTERCEPT_DEBUG_TRAPSdefine
hw, target, accel: whpx: changeapic_in_platformtokernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: change memory management logic
target/arm: cpu: mark WHPX as supporting PSCI 1.3
whpx: arm64: clamp down IPA size
hw/arm, accel/hvf, whpx: unifyget_physical_address_rangebetween WHPX
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
whpx: apic: use non-deprecated APIs to control interrupt controller
state
whpx: arm64: check for physical address width after WHPX availability
whpx: arm64: add partition-wide reset on the reboot path
MAINTAINERS: update the list of maintained files for WHPXPhilippe Mathieu-Daudé (1):
accel/system: Introducehwaccel_enabled()helperSebastian Ott (1):
target/arm/kvm: add constants for new PSCI versionsMAINTAINERS | 6 + accel/hvf/hvf-all.c | 7 +- accel/meson.build | 1 + accel/stubs/whpx-stub.c | 1 + accel/whpx/meson.build | 7 + {target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +- accel/whpx/whpx-common.c | 536 +++++++++ docs/system/arm/virt.rst | 13 +- hw/arm/virt-acpi-build.c | 16 +- hw/arm/virt.c | 140 ++- 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 | 8 +- include/hw/core/boards.h | 3 +- include/hw/intc/arm_gicv3_common.h | 3 + include/system/hvf_int.h | 5 + 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 | 25 +- include/system/whpx.h | 5 +- meson.build | 20 +- target/arm/cpu.c | 3 + target/arm/cpu64.c | 17 +- 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 | 1020 +++++++++++++++++ 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 42 files changed, 2215 insertions(+), 648 deletions(-)create mode 100644 accel/whpx/meson.build
rename {target/i386 =>accel}/whpx/whpx-accel-ops.c(96%) create mode 100644accel/whpx/whpx-common.c
create mode 100644hw/intc/arm_gicv3_whpx.c
rename {target/i386/whpx =>include/system}/whpx-accel-ops.h(92%) create mode 100644include/system/whpx-all.h
create mode 100644include/system/whpx-common.h
rename {target/i386/whpx =>include/system}/whpx-internal.h(88%) delete mode 100644target/arm/hvf-stub.c
create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.c
create mode 100644target/arm/whpx/whpx-stub.c
create mode 100644target/arm/whpx_arm.h