WHPX support for Arm
v16 cover WHPX support for Arm
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v17)
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.
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 v16:
- Address some last review comments
- Rebase with the latest origin/staging
Updates since v15:
- Some last tiny changes addressed.
Updates since v14:
- Working around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87950
It turns out that we can't avoid default: in case with an enum on GCC without warnings, although Clang allows that behavior.
Updates since v13:
- Addressing review comments from Akihiko Odaki
- Squash GICv2 ACPI workaround patch and have it documented as a separate function
- Rebase with current origin/staging
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 (24):
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
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: 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 | 27 +-
hw/arm/virt.c | 140 ++-
hw/i386/x86-cpu.c | 4 +-
hw/intc/arm_gicv3_common.c | 3 +
hw/intc/arm_gicv3_whpx.c | 248 +++++
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 | 4 +
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 | 16 +-
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 | 985 ++++++++++++++++++
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 | 2 +-
tests/data/acpi/aarch64/virt/APIC.its_off | Bin 164 -> 188 bytes
42 files changed, 2146 insertions(+), 636 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 (95%)
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 v16 1/26 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 v16 2/26 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 v16 3/26 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 v16 4/26 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 | 8 ++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)
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 +8 -0
@@ -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); }
@@ -2449,6 +2451,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);
@@ -3497,6 +3501,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 ;
@@ -3549,7 +3554,10 @@ DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)static void virt_machine_10_2_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_11_0_options (mc); + vmc->no_gicv3_with_gicv2m = true;compat_props_add (mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); }DEFINE_VIRT_MACHINE (10 ,2 )
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;MemoryRegion *sysmem;
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 61 lines · Mohamed Mediouni
On 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.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- hw/arm/virt-acpi-build.c | 5 ++++- hw/arm/virt.c | 8 ++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)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 +5
-0@@ -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); }@@ -2449,6 +2451,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);@@ -3497,6 +3501,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 ;
hw/arm/virt.c DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) · line 3562
Quoted 9 lines
hw/arm/virt.c +3
-0@@ -3549,7 +3554,10 @@ DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)static void virt_machine_10_2_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_11_0_options (mc); + vmc->no_gicv3_with_gicv2m = true;compat_props_add (mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); }
The MSI controller selection logic is already pretty confusing, and this is making it more complicated. I don't think we should need this machine back compatibility, because currently there is no setup where you can have a GICv3 that doesn't also have either an ITS or no MSI controller.
I think also that we can make the code cleaner if we:
(1) clean the existing "pick an MSI controller" logic up so that we do it up front, the same way we do "pick a GIC version"
(2) add the new "msi" property and deprecate the old "its" one
(3) then add the gicv3-with-gicv2m-on-hvf logic to that
I see this series adds an "msi" property, but it also makes the old "its" property an OnOffAuto -- do we really need both ?
I wrote some code for this this afternoon before I realised that you'd done the "msi" property in that series (so the duplication with your work is my fault). I'll send them out as an RFC to give an idea of what I have in mind.
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 11 lines · Peter Maydell
The MSI controller selection logic is already pretty confusing, and this is making it more complicated. I don't think we should need this machine back compatibility, because currently there is no setup where you can have a GICv3 that doesn't also have either an ITS or no MSI controller.
Hello,
This was to replicate the “no_tcg_its” where this was done when introducing TCG.
And for the purpose of VM save/restore on HVF with the older machine type continuing to work as expected.
Also worth noting that for HVF specifically GICv3 + ITS works today when using kernel-irqchip=off and that only kernel-irqchip=on to leverage the hardware vGIC doesn’t support it.
Quoted 10 lines
I think also that we can make the code cleaner if we:
(1) clean the existing "pick an MSI controller" logic up so that we do it up front, the same way we do "pick a GIC version"
(2) add the new "msi" property and deprecate the old "its" one
(3) then add the gicv3-with-gicv2m-on-hvf logic to thatI see this series adds an "msi" property, but it also makes the old "its" property an OnOffAuto -- do we really need both ?
The “rework MSI-X configuration” patch in the series flips the “its” property back to a bool.
Would it be better to reorder that earlier in the series or keep it as is?
Squashing the “hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS” commit with “rework MSI-X configuration” is an option too.
Thank you,
-Mohamed
Quoted 4 lines
I wrote some code for this this afternoon before I realised that you'd done the "msi" property in that series (so the duplication with your work is my fault). I'll send them out as an RFC to give an idea of what I have in mind.
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 12 lines · Mohamed Mediouni
Quoted 12 lines · Peter Maydell
The MSI controller selection logic is already pretty confusing, and this is making it more complicated. I don't think we should need this machine back compatibility, because currently there is no setup where you can have a GICv3 that doesn't also have either an ITS or no MSI controller.
Quoted 4 lines
Hello,
This was to replicate the “no_tcg_its” where this was done when introducing TCG.
And for the purpose of VM save/restore on HVF with the older machine type continuing to work as expected.
no_tcg_its is there for backwards compatibility: on older QEMU versions before we added the TCG ITS, if you said "-machine virt,gic-version=3 -accel tcg" you didn't get an ITS; we wanted to change the default in new machine versions, so we needed the back compat switch.
What is the command line that works today and where we want to go from "default to GICv3 without ITS or v2m" to "default to GICv3 with v2m" ? I might have missed it but back last year when I was looking at the current configs I didn't think we had one.
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 28 lines · Peter Maydell
Quoted 12 lines · Mohamed Mediouni
Quoted 12 lines · Peter Maydell
The MSI controller selection logic is already pretty confusing, and this is making it more complicated. I don't think we should need this machine back compatibility, because currently there is no setup where you can have a GICv3 that doesn't also have either an ITS or no MSI controller.
Quoted 4 lines
Hello,
This was to replicate the “no_tcg_its” where this was done when introducing TCG.
And for the purpose of VM save/restore on HVF with the older machine type continuing to work as expected.
no_tcg_itsis there for backwards compatibility: on older QEMU versions before we added the TCG ITS, if you said "-machine virt,gic-version=3 -accel tcg" you didn't get an ITS; we wanted to change the default in new machine versions, so we needed the back compat switch.
Quoted 5 lines
What is the command line that works today and where we want to go from "default to GICv3 without ITS or v2m" to "default to GICv3 with v2m" ? I might have missed it but back last year when I was looking at the current configs I didn't think we had one.
Hello,
None, was thinking about what its=off should mean but perhaps the right behaviour to do there is to have it mean no MSI-X controller.
The no_gicv3_with_gicv2m flag is solely used for the its config option (which is legacy) and not used for the msi config option.
Will make the next patch rev make its=off mean no MSI-X controller at all and remove the no_gicv3_with_gicv2m flag then.
Quoted 2 lines
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 34 lines · Mohamed Mediouni
Quoted 29 lines · Peter Maydell
Quoted 12 lines · Mohamed Mediouni
Quoted 12 lines · Peter Maydell
The MSI controller selection logic is already pretty confusing, and this is making it more complicated. I don't think we should need this machine back compatibility, because currently there is no setup where you can have a GICv3 that doesn't also have either an ITS or no MSI controller.
Quoted 4 lines
Hello,
This was to replicate the “no_tcg_its” where this was done when introducing TCG.
And for the purpose of VM save/restore on HVF with the older machine type continuing to work as expected.
no_tcg_itsis there for backwards compatibility: on older QEMU versions before we added the TCG ITS, if you said "-machine virt,gic-version=3 -accel tcg" you didn't get an ITS; we wanted to change the default in new machine versions, so we needed the back compat switch.Quoted 5 lines
What is the command line that works today and where we want to go from "default to GICv3 without ITS or v2m" to "default to GICv3 with v2m" ? I might have missed it but back last year when I was looking at the current configs I didn't think we had one.
Quoted 4 lines
Hello,
None, was thinking about what its=off should mean but perhaps the right behaviour to do there is to have it mean no MSI-X controller.
Yeah, this is a bit tricky. I think that at the moment
we allow "gic-version=2,its=off" and you still get a gicv2m.
So we need to retain that behaviour (though I doubt anybody
is deliberately using it), which I think means we do need
the its option to be an on/off/auto one. On the other
hand that means that the finalize_msi_controller() logic
(see https://patchew.org/QEMU/[email protected]/
that I posted yesterday) can look relatively neat:
if (vms->its != auto) {
/*
* User set the legacy "its" option, which traditionally
* meant "ignored if GICv2 (always provide GICv2m), enable
* or disable ITS for GICv3".
* Translate into its "msi" option equivalent:
* - "its=no" means "msi=gicv2m" for a GICv2, "msi=none"
* for GICv3 and up.
* - "its=yes" means "msi=auto"
*/
if (vms->msi_controller != VIRT_MSI_CTRL_NOSEL) {
error("msi and its options cannot be used together");
exit(1);
}
if (vms->its == off) {
if (vms->gic_version == VIRT_GIC_VERSION_2) {
vms->msi_controller = VIRT_MSI_CTRL_GICV2M;
} else {
vms->msi_controller = VIRT_MSI_CTRL_NONE;
}
}
/* for vms->its == on we leave msi_controller at NOSEL */
}
if (vms->msi_controller != VIRT_MSI_CTRL_NOSEL) {
/*
* User specified an "msi" option: check what they
* specified, and use it.
*/
if (vms->msi_controller == VIRT_MSI_CTRL_ITS &&
vms->gic_version == VIRT_GIC_VERSION_2) {
error_report("A GICv2 cannot use an ITS");
exit(1);
}
/* other error checks here as needed */
return;
}/* logic to pick the best msi_controller goes here */
This puts all the option handling code in one function that has three parts:
* deal with the legacy its= option by converting it to the equivalent msi= option
* error check any explicitly set msi option
* pick an msi for the user if they didn't specify
Then the rest of the code in virt.c doesn't need to care about the option flags or back-compat stuff directly, it can look at just the final resulting msi_controller setting.
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 6 lines · Peter Maydell
which I think means we do need
the its option to be an on/off/auto one
Hello,
Would this be ok instead?
typedef enum VirtMSIControllerType { VIRT_MSI_CTRL_NONE,
/* This value is overriden at runtime.*/ VIRT_MSI_CTRL_AUTO,
/* Legacy option: its=off provides a GICv2m when using GICv2.*/ VIRT_MSI_LEGACY_OPT_ITS_OFF,VIRT_MSI_CTRL_GICV2M,VIRT_MSI_CTRL_ITS,
} VirtMSIControllerType;
Combined with:
static void finalize_msi_controller(VirtMachineState *vms) {
if (vms->msi_controller == VIRT_MSI_LEGACY_OPT_ITS_OFF) { if (vms->gic_version == 2) {vms->msi_controller = VIRT_MSI_CTRL_GICV2M;
}
else {vms->msi_controller = VIRT_MSI_CTRL_NONE;
}
}
Thank you,
-Mohamed
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 24 lines · Mohamed Mediouni
Quoted 7 lines · Peter Maydell
which I think means we do need
the its option to be an on/off/auto oneHello,
Would this be ok instead?
typedef enum VirtMSIControllerType {
VIRT_MSI_CTRL_NONE,
/* This value is overriden at runtime.*/VIRT_MSI_CTRL_AUTO,
/* Legacy option: its=off provides a GICv2m when using GICv2.*/VIRT_MSI_LEGACY_OPT_ITS_OFF,VIRT_MSI_CTRL_GICV2M,VIRT_MSI_CTRL_ITS,
} VirtMSIControllerType;Combined with:
Quoted 10 lines
static void
finalize_msi_controller(VirtMachineState *vms){
if (vms->msi_controller==VIRT_MSI_LEGACY_OPT_ITS_OFF) { if (vms->gic_version== 2) {vms->msi_controller=VIRT_MSI_CTRL_GICV2M;
}
else {vms->msi_controller=VIRT_MSI_CTRL_NONE;
}
}
Is this with the idea that the its option get/set functions would set msi_controller (to ITS_OFF or ITS) ?
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 40 lines · Peter Maydell
Quoted 24 lines · Mohamed Mediouni
Quoted 7 lines · Peter Maydell
which I think means we do need
the its option to be an on/off/auto oneHello,
Would this be ok instead?
typedef enum VirtMSIControllerType {
VIRT_MSI_CTRL_NONE,
/* This value is overriden at runtime.*/VIRT_MSI_CTRL_AUTO,
/* Legacy option: its=off provides a GICv2m when using GICv2.*/VIRT_MSI_LEGACY_OPT_ITS_OFF,VIRT_MSI_CTRL_GICV2M,VIRT_MSI_CTRL_ITS,
} VirtMSIControllerType;Combined with:
Quoted 10 lines
static void
finalize_msi_controller(VirtMachineState *vms){
if (vms->msi_controller==VIRT_MSI_LEGACY_OPT_ITS_OFF) { if (vms->gic_version== 2) {vms->msi_controller=VIRT_MSI_CTRL_GICV2M;
}
else {vms->msi_controller=VIRT_MSI_CTRL_NONE;
}
}
Quoted 3 lines
Is this with the idea that the its option get/set functions would set
msi_controller(toITS_OFFor ITS) ?
Yes, vms->its is completely gone in my tree.
Going to post a rev with it soon, would you prefer to have it separate instead of a whole WHPX series?
Quoted 2 lines
thanks
-- PMM
Re: [PATCH v16 04/26] hw/arm: virt: add GICv2m for the case when ITS is not available
Quoted 41 lines · Mohamed Mediouni
Quoted 41 lines · Peter Maydell
Quoted 34 lines · Mohamed Mediouni
Quoted 7 lines · Peter Maydell
which I think means we do need
the its option to be an on/off/auto oneHello,
Would this be ok instead?
typedef enum VirtMSIControllerType {
VIRT_MSI_CTRL_NONE,
/* This value is overriden at runtime.*/VIRT_MSI_CTRL_AUTO,
/* Legacy option: its=off provides a GICv2m when using GICv2.*/VIRT_MSI_LEGACY_OPT_ITS_OFF,VIRT_MSI_CTRL_GICV2M,VIRT_MSI_CTRL_ITS,
} VirtMSIControllerType;Combined with:
static void
finalize_msi_controller(VirtMachineState *vms){
if (vms->msi_controller==VIRT_MSI_LEGACY_OPT_ITS_OFF) { if (vms->gic_version== 2) {vms->msi_controller=VIRT_MSI_CTRL_GICV2M;
}
else {vms->msi_controller=VIRT_MSI_CTRL_NONE;
}
}
Quoted 4 lines
Quoted 3 lines
Is this with the idea that the its option get/set functions would set
msi_controller(toITS_OFFor ITS) ?Yes,
vms->itsis completely gone in my tree.
That sounds like a good cleanup -- I was hoping to get rid of vms->its but didn't quite see the way to doing it.
Quoted 2 lines
Going to post a rev with it soon, would you prefer to have it separate instead of a whole WHPX series?
If these cleanup patches are at the start of the series you might as well post the whole lot with the WHPX patches.
thanks
-- PMM
PATCH v16 5/26 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 v16 6/26 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;
@@ -218,4 +218,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)
PATCH v16 7/26 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 | 24 +++++--- hw/arm/virt.c | 116 ++++++++++++++++++++++++++++++++------- include/hw/arm/virt.h | 4 +- 3 files changed, 116 insertions(+), 28 deletions(-)
hw/arm/virt-acpi-build.c +17 -7
@@ -440,6 +440,17 @@ static void create_rc_its_idmaps(GArray *its_idmaps, GArray *smmuv3_devs) } } +/* +* In 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. +*/ +static int is_gicv2_acpi_workaround_needed (VirtMachineState *vms) { +return vms->gic_version ==2 ; +} +/* * Input Output Remapping Table (IORT) * Conforms to "IO Remapping Table System Software on ARM Platforms",
@@ -473,7 +484,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) ||is_gicv2_acpi_workaround_needed (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 +495,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) ||is_gicv2_acpi_workaround_needed (vms)) { nb_nodes =2 ;/* RC and ITS */ rc_mapping_count =1 ;/* Direct map to ITS */ }else {
@@ -499,7 +510,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) ||is_gicv2_acpi_workaround_needed (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 +529,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) ||is_gicv2_acpi_workaround_needed (vms)) { smmu_mapping_count =1 ;/* ITS Group node */ offset_to_id_array =SMMU_V3_ENTRY_SIZE ;/* Just after the header */ }else {
@@ -611,7 +622,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } -if (virt_is_its_enabled (vms)) { +if (virt_is_its_enabled (vms) ||is_gicv2_acpi_workaround_needed (vms)) {/* * Map bypassed (don't go through the SMMU) RIDs (input) to * ITS Group node directly: RC -> ITS.
@@ -962,8 +973,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 +96 -20
166 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;
@@ -219,5 +220,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)
PATCH v16 8/26 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 v16 9/26 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
@@ -563,9 +563,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)
Re: [PATCH v16 09/26] whpx: Move around files before introducing AArch64 support
Hi Mohamed,
Quoted 18 lines · Mohamed Mediouni
Switch to a design where we can share whpx code between x86 and AArch64 when it makes sense to do so.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Richard Henderson <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- 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(-)
Quoted 4 lines
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%)
Just wondering, could we have target/i386/whpx/whpx-internal.h moved to accel/whpx/whpx-internal.h? (can be done on top in another patch)
PATCH v16 10/26 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
@@ -568,6 +568,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)
Re: [PATCH v16 10/26] whpx: reshuffle common code
Quoted 61 lines · Mohamed Mediouni
Some code can be shared between
x86_64and arm64 WHPX. Do so as much as reasonable.Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- 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 100644include/system/whpx-all.h
create mode 100644include/system/whpx-common.hinclude/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 +11
-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;
include/system/whpx-common.h line 21
Quoted 10 lines
include/system/whpx-common.h new file +10
-0+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
I'd rather rename the target-specific handlers as whpx_foo() -> whpx_arch_foo() to help follow in common code when we are calling target-specific implementations. (can be done on top later if the series is good to go)
Re: [PATCH v16 10/26] whpx: reshuffle common code
Quoted 70 lines · Philippe Mathieu-Daudé
Quoted 65 lines · Mohamed Mediouni
Some code can be shared between
x86_64and arm64 WHPX. Do so as much as reasonable.Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- 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.hinclude/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 +17
-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);
Quoted 8 lines
include/system/whpx-common.h line 21
Quoted 4 lines
include/system/whpx-common.h new file +4
-0+int whpx_last_vcpu_stopping (CPUState *cpu); +void whpx_memory_init (void ); +struct whpx_breakpoint *whpx_lookup_breakpoint_by_addr (uint64_t address); +#endif I'd rather rename the target-specific handlers as
whpx_foo()->whpx_arch_foo()to help follow in common code when we are calling target-specific implementations. (can be done on top later if the series is good to go)
Hello,
Going to take care of this one with a post-merge follow-up patch, along with moving the header location.
PATCH v16 11/26 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)
Re: [PATCH v16 11/26] whpx: ifdef out winhvemulation on non-x86_64
Quoted 5 lines · Mohamed Mediouni
winhvemulation is
x86_64only.In the future, we might want to get rid of winhvemulation usage entirely.
Quoted 8 lines
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- 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(-)
PATCH v16 12/26 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 v16 13/26 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 v16 14/26 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 | 238 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 248 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"
@@ -2121,6 +2122,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 +238 -0
238 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)
PATCH v16 15/26 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 | 810 ++++++++++++++++++++++++++++++++++++ 4 files changed, 815 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 +810 -0
810 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v16 15/26] whpx: add arm64 support
Quoted 12 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 | 810 ++++++++++++++++++++++++++++++++++++ 4 files changed, 815 insertions(+)create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.c
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) +{ +
g_assert_not_reached() ?
target/arm/whpx/whpx-all.c line 292
Quoted 7 lines
target/arm/whpx/whpx-all.c new file +7
-0+} +void whpx_translate_cpu_breakpoints ( +struct whpx_breakpoints *breakpoints, +CPUState *cpu, +int cpu_breakpoint_count) +{ +
g_assert_not_reached() ?
Quoted 1 line
+}
Re: [PATCH v16 15/26] whpx: add arm64 support
Quoted 26 lines · Philippe Mathieu-Daudé
Quoted 12 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 | 810 ++++++++++++++++++++++++++++++++++++ 4 files changed, 815 insertions(+) create mode 100644 target/arm/whpx/meson.build create mode 100644 target/arm/whpx/whpx-all.ctarget/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) +{ +
g_assert_not_reached()?
Quoted 12 lines
target/arm/whpx/whpx-all.c line 292
Quoted 7 lines
target/arm/whpx/whpx-all.c new file +7
-0+} +void whpx_translate_cpu_breakpoints ( +struct whpx_breakpoints *breakpoints, +CPUState *cpu, +int cpu_breakpoint_count) +{ +
g_assert_not_reached()?Quoted 1 line
+}
Hello,
Called unconditionally today from the common code. But does nothing as breakpoints aren’t supported on the platform.
If trying to actually enable a breakpoint, common code will go through whpx_set_exception_exit_bitmap and error there.
Re: [PATCH v16 15/26] whpx: add arm64 support
Quoted 36 lines · Mohamed Mediouni
Quoted 36 lines · Philippe Mathieu-Daudé
Quoted 12 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 | 810 ++++++++++++++++++++++++++++++++++++ 4 files changed, 815 insertions(+)create mode 100644 target/arm/whpx/meson.build
create mode 100644target/arm/whpx/whpx-all.ctarget/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) +{ +
g_assert_not_reached()?target/arm/whpx/whpx-all.c line 292
Quoted 7 lines
target/arm/whpx/whpx-all.c new file +7
-0+} +void whpx_translate_cpu_breakpoints ( +struct whpx_breakpoints *breakpoints, +CPUState *cpu, +int cpu_breakpoint_count) +{ +
g_assert_not_reached()?
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
+}
Hello,
Called unconditionally today from the common code. But does nothing as breakpoints aren’t supported on the platform.
If trying to actually enable a breakpoint, common code will go through
whpx_set_exception_exit_bitmapand error there.
Ah OK, then let's just add /* Breakpoints aren’t supported on this platform */ twice.
PATCH v16 16/26 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)
Re: [PATCH v16 16/26] whpx: change memory management logic
Quoted 108 lines · Mohamed Mediouni
This allows edk2 to work on Arm, although u-boot is still not functional.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- accel/whpx/whpx-common.c | 97 +++++++++++++++------------------------- 1 file changed, 36 insertions(+), 61 deletions(-)accel/whpx/whpx-common.c +26
-55@@ -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
accel/whpx/whpx-common.c void whpx_vcpu_kick(CPUState *cpu) · line 302
Quoted 10 lines
accel/whpx/whpx-common.c +7
-2+ | (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 ();
Maybe aborting is too violent (i.e. trying to start a SBSA-Ref guest) and we could just exit(1)... Anyhow,
Quoted 2 lines
accel/whpx/whpx-common.c +1
-0+ } }
PATCH v16 17/26 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 v16 18/26 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 | 46 +++++++++++++++++++++++++++++++++++++ target/arm/whpx/whpx-stub.c | 15 ++++++++++++ target/arm/whpx_arm.h | 16 +++++++++++++ 6 files changed, 112 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"
@@ -3330,6 +3331,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. whpx_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);
@@ -3429,6 +3460,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 +46 -0
76 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)
PATCH v16 19/26 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 | 43 +++++--------------------------------- include/hw/core/boards.h | 4 ++-- include/system/hvf_int.h | 4 ++++ 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(+), 71 deletions(-) delete mode 100644 target/arm/hvf-stub.c
accel/hvf/hvf-all.c +5 -2
@@ -18,6 +18,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;
@@ -186,8 +187,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 +5 -38
64 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 +4 -0
@@ -57,6 +57,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 );void hvf_kick_vcpu_thread (CPUState *cpu);/* Must be called by the owning thread */
@@ -107,5 +109,7 @@ int hvf_update_guest_debug(CPUState *cpu);bool hvf_arch_supports_guest_debug (void );bool hvf_arch_cpu_realize (CPUState *cpu,Error **errp); +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
@@ -729,7 +729,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. */
@@ -825,7 +825,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);
@@ -834,7 +834,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
@@ -770,8 +770,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 ) { ret = -EINVAL ; goto error;
target/i386/hvf/hvf.c +11 -0
@@ -228,6 +228,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)
Re: [PATCH v16 19/26] hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVF
Quoted 15 lines · Mohamed Mediouni
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- accel/hvf/hvf-all.c | 7 +++++-- hw/arm/virt.c | 43 +++++--------------------------------- include/hw/core/boards.h | 4 ++-- include/system/hvf_int.h | 4 ++++ 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(+), 71 deletions(-)
Quoted 1 line
delete mode 100644
target/arm/hvf-stub.c
PATCH v16 20/26 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 v16 21/26 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
@@ -940,6 +940,29 @@ int whpx_accel_init(AccelState *as, MachineState *ms)memset (&prop,0 ,sizeof (prop)); +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 (prop)); +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 v16 22/26 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"
@@ -204,6 +205,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)
Re: [PATCH v16 22/26] whpx: arm64: gicv3: add migration blocker
Quoted 21 lines · Mohamed Mediouni
GICv3 state save-restore is currently not implemented yet.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- hw/intc/arm_gicv3_whpx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/intc/arm_gicv3_whpx.c +1
-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"
hw/intc/arm_gicv3_whpx.c static void whpx_gicv3_realize(DeviceState *dev, Error **errp) · line 214
Quoted 10 lines
hw/intc/arm_gicv3_whpx.c +7
-0@@ -204,6 +205,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);
* This error_free() might cause an issue, IIUC
migrate_add_blocker(&wphx_migration_blocker
-> migrate_add_blocker_modes(reasonp,
-> is_only_migratable(reasonp, ...) / is_busy(reasonp, ...)
...
error_propagate_prepend(errp, *reasonp, ...)
*reasonp = NULL;
return true;* ie. when error_propagate_prepend() happens, errp starts pointing to *reasonp, so *reasonp is set to NULL above. Instead of error_free() -> say -> error_report_err(errp) above;
Thank you.
---
- Prasad
PATCH v16 23/26 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 += {
@@ -892,13 +893,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 v16 24/26 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 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
target/arm/whpx/whpx-all.c +9 -10
@@ -654,7 +654,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); }
@@ -874,15 +874,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 ) { - ret = -EINVAL ; - goto error; - } - } - whpx->mem_quota = ms->ram_size; hr = whp_dispatch.WHvGetCapability(
@@ -910,6 +901,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)
Re: [PATCH v16 24/26] whpx: arm64: check for physical address width after WHPX availability
Quoted 8 lines · Mohamed Mediouni
In the case where WHPX isn't supported on the platform, makes the intended error appear instead of failing at getting the IPA width.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- target/arm/whpx/whpx-all.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
Re: [PATCH v16 24/26] whpx: arm64: check for physical address width after WHPX availability
In reply to Mohamed MediouniQuoted 43 lines · Mohamed Mediouni
In the case where WHPX isn't supported on the platform, makes the intended error appear instead of failing at getting the IPA width.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- target/arm/whpx/whpx-all.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)target/arm/whpx/whpx-all.c +2
-10@@ -654,7 +654,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); }@@ -874,15 +874,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 ) { - ret = -EINVAL ; - goto error; - } - } - whpx->mem_quota = ms->ram_size; hr = whp_dispatch.WHvGetCapability(@@ -910,6 +901,14 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } +if (mc->get_physical_address_range) {
target/arm/whpx/whpx-all.c int whpx_accel_init(AccelState *as, MachineState *ms) · line 914
Quoted 10 lines
target/arm/whpx/whpx-all.c +7
-0+ 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);
Squash with patch 18/26 "whpx: arm64: clamp down IPA size"?
PATCH v16 25/26 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
@@ -86,6 +86,8 @@ void whpx_apic_get(APICCommonState *s);X (HRESULT , WHvSetVirtualProcessorInterruptControllerState2, \ (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, PVOID State, \ UINT32 StateSize)) \ +X (HRESULT , WHvResetPartition, \ + (WHV_PARTITION_HANDLE Partition)) \#define LIST_WINHVEMULATION_FUNCTIONS (X ) \ X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS* Callbacks, WHV_EMULATOR_HANDLE* Emulator)) \
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 v16 26/26 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
@@ -565,6 +565,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)
Re: [PATCH v16 26/26] MAINTAINERS: update the list of maintained files for WHPX
Quoted 13 lines · Mohamed Mediouni
Add arm64-specific files.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Pierrick Bouvier <[email protected]>--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)MAINTAINERS +0
-0
MAINTAINERS M: Mohamed Mediouni <[email protected]> · line 568
Quoted 4 lines
MAINTAINERS +1
-0@@ -565,6 +565,8 @@ M: Mohamed Mediouni <[email protected]> S: Supported F: accel/whpx/ F: target/i386/whpx/ +F: target/arm/whpx/
-> squash in patch #15
MAINTAINERS M: Mohamed Mediouni <[email protected]> · line 569
Quoted 1 line
MAINTAINERS +1
-0+F: hw/intc/arm_gicv3_whpx.c
-> squash in patch #14
Quoted 6 lines · Mohamed Mediouni
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v17)
patchew tells me that this doesn’t apply on top of origin/master right now but does apply on top of origin/staging, so this should sort itself out soon-ish
Quoted 17 lines · Mohamed Mediouni
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v17)
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.
Quoted 8 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 v16:
- Address some last review comments
- Rebase with the latest origin/staging
I see no bugs with this version. For the whole series:
Thank you for your continuous effort on this.
Regards,
Akihiko Odaki
Quoted 173 lines
Updates since v15:
- Some last tiny changes addressed.Updates since v14:
- Working around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87950It turns out that we can't avoid default: in case with an enum on GCC without warnings, although Clang allows that behavior.
Updates since v13:
- Addressing review comments from Akihiko Odaki
- Squash GICv2 ACPI workaround patch and have it documented as a separate function
- Rebase with current origin/stagingUpdates 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 (24):
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
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: 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 | 27 +- hw/arm/virt.c | 140 ++- hw/i386/x86-cpu.c | 4 +- hw/intc/arm_gicv3_common.c | 3 + hw/intc/arm_gicv3_whpx.c | 248 +++++ 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 | 4 + 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 | 16 +- 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 | 985 ++++++++++++++++++ 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 | 2 +- tests/data/acpi/aarch64/virt/APIC.its_off | Bin 164 -> 188 bytes 42 files changed, 2146 insertions(+), 636 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(95%) 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 19 lines · Mohamed Mediouni
Mohamed Mediouni (24):
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
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
Quoted 8 lines
and HVF
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
whpx: arm64: gicv3: add migration blocker
whpx: enable arm64 builds
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
Note for myself (rthogonal to this work): thinking about generic accel/ infra we could add these common methods to AccelClass and get rid of some per-accel #ifdef'ry:
- accel_has_in_kernel_irq_handling()
- accel_arch_get_cpu_features_from_host()
- accel_arch_set_cpu_features_from_host()
Am 16. Januar 2026 13:52:09 UTC schrieb Mohamed Mediouni <[email protected]>:
Quoted 17 lines
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v17)
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.
Quoted 6 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 v16:
I suppose: s/since/for/
Quoted 2 lines
- Address some last review comments
- Rebase with the latest origin/staging
Works for me! So, for x86_64:
Quoted 173 lines
Updates since v15:
- Some last tiny changes addressed.Updates since v14:
- Working around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87950It turns out that we can't avoid default: in case with an enum on GCC without warnings, although Clang allows that behavior.
Updates since v13:
- Addressing review comments from Akihiko Odaki
- Squash GICv2 ACPI workaround patch and have it documented as a separate function
- Rebase with current origin/stagingUpdates 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 (24):
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
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: 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 | 27 +- hw/arm/virt.c | 140 ++- hw/i386/x86-cpu.c | 4 +- hw/intc/arm_gicv3_common.c | 3 + hw/intc/arm_gicv3_whpx.c | 248 +++++ 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 | 4 + 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 | 16 +- 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 | 985 ++++++++++++++++++ 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 | 2 +- tests/data/acpi/aarch64/virt/APIC.its_off | Bin 164 -> 188 bytes 42 files changed, 2146 insertions(+), 636 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(95%) 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