WHPX support for Arm
v3 cover WHPX support for Arm
Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v3)
Missing features:
- PSCI state sync with Hyper-V: notably breaks reboots when multiple cores are enabled
- Interrupt controller save-restore
- Debug register sync
- SVE register sync
- Adding a migration blocker because of the items above.
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 (14):
hw/arm: virt: add GICv2m for the case when ITS is not available
whpx: Move around files before introducing AArch64 support
whpx: reshuffle common code
whpx: ifdef out some x86-only code paths
hw, target, accel: whpx: change apic_in_platform to kernel_irqchip
whpx: interrupt controller support
whpx: add arm64 support
whpx: copy over memory management logic from hvf target/arm: cpu: mark WHPX as supporting PSCI 1.1 hw/arm: virt: cleanly fail on attempt to use the platform vGIC
together with ITS
whpx: arm64: clamp down IPA size
whpx: arm64: implement -cpu host
target/arm: whpx: instantiate GIC early
MAINTAINERS: Add myself as a maintainer for WHPX
MAINTAINERS | 9 +-
accel/meson.build | 1 +
accel/whpx/meson.build | 7 +
{target/i386 => accel}/whpx/whpx-accel-ops.c | 6 +-
accel/whpx/whpx-common.c | 674 +++++++++++
hw/arm/virt-acpi-build.c | 4 +-
hw/arm/virt.c | 55 +-
hw/i386/x86-cpu.c | 4 +-
hw/intc/arm_gicv3_common.c | 3 +
hw/intc/arm_gicv3_whpx.c | 261 +++++
hw/intc/meson.build | 1 +
include/hw/arm/virt.h | 2 +
include/hw/boards.h | 1 +
include/hw/intc/arm_gicv3_common.h | 3 +
.../whpx => include/system}/whpx-accel-ops.h | 4 +-
include/system/whpx-all.h | 14 +
include/system/whpx-common.h | 23 +
.../whpx => include/system}/whpx-internal.h | 14 +-
include/system/whpx.h | 4 +-
meson.build | 21 +-
target/arm/cpu.c | 3 +-
target/arm/cpu64.c | 14 +-
target/arm/meson.build | 1 +
target/arm/whpx/meson.build | 5 +
target/arm/whpx/whpx-all.c | 1029 +++++++++++++++++
target/arm/whpx/whpx-stub.c | 15 +
target/arm/whpx_arm.h | 17 +
target/i386/cpu-apic.c | 2 +-
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 540 +--------
target/i386/whpx/whpx-apic.c | 2 +-
31 files changed, 2183 insertions(+), 557 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 (96%)
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.39.5 (Apple Git-154)
PATCH v3 1/14 hw/arm: virt: add GICv2m for the case when ITS is not available
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.
--- hw/arm/virt-acpi-build.c | 4 +++- hw/arm/virt.c | 8 ++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +3 -1
@@ -848,7 +848,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data, memmap[VIRT_GIC_ITS ].base,8 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ } - }else { + } + +if (!vms->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
@@ -953,6 +953,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); }
@@ -2402,6 +2404,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);
@@ -3410,6 +3414,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 ;
@@ -3462,8 +3467,11 @@ DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)static void virt_machine_10_0_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_10_1_options (mc);compat_props_add (mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); + vmc->no_gicv3_with_gicv2m = true; }DEFINE_VIRT_MACHINE (10 ,0 )
include/hw/arm/virt.h +2 -0
@@ -131,6 +131,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; };
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v3 2/14 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 | 0
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 4 ++--
target/i386/whpx/whpx-internal.h | 1 +
8 files changed, 14 insertions(+), 5 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 (100%)MAINTAINERS +2 -0
@@ -542,9 +542,11 @@ F: include/system/hvf_int.h WHPX CPUs M: Sunil Muthuswamy <[email protected]> S: Supported +F: accel/whpx/ F: target/i386/whpx/ F: accel/stubs/whpx-stub.c F: include/system/whpx.h +F: include/system/whpx-accel-ops.h X86 Instruction Emulator M: Cameron Esfahani <[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 +0 -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-internal.h +1 -0
@@ -117,3 +117,4 @@ typedef enum WHPFunctionList { } WHPFunctionList;#endif /* TARGET_I386_WHPX_INTERNAL_H */ +
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 02/14] whpx: Move around files before introducing AArch64 support
Note: I _also_ screwed up this rebase a bit unfortunately but this one should be clean: https://github.com/mediouni-m/qemu/commit/66f052d80b6b51a60374074cec876f9bfc8a756c
To not cause too much spam on the ML will most likely batch this when I have more changes...
Quoted 120 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]>---
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 | 0 target/i386/whpx/meson.build | 1 - target/i386/whpx/whpx-all.c | 4 ++-- target/i386/whpx/whpx-internal.h | 1 + 8 files changed, 14 insertions(+), 5 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(100%)MAINTAINERS +0
-0@@ -542,9 +542,11 @@ F: include/system/hvf_int.hWHPX CPUs
M: Sunil Muthuswamy <[email protected]>
S: Supported
+F: accel/whpx/
F: target/i386/whpx/
F:accel/stubs/whpx-stub.c
F:include/system/whpx.h
+F:include/system/whpx-accel-ops.hX86 Instruction Emulator
M: Cameron Esfahani <[email protected]>accel/meson.build +0
-0@@ -6,6 +6,7 @@ user_ss.add(files('accel-user.c')) subdir('tcg')if
have_system
subdir('hvf')accel/meson.build +1
-0+ 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 +0
-0target/i386/whpx/meson.build +0
-0@@ -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-internal.h +1
-0@@ -117,3 +117,4 @@ typedef enum WHPFunctionList { } WHPFunctionList;#endif /* TARGET_I386_WHPX_INTERNAL_H */ +Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 02/14] whpx: Move around files before introducing AArch64 support
In reply to Mohamed MediouniQuoted 15 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]>--- 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 | 0 target/i386/whpx/meson.build | 1 - target/i386/whpx/whpx-all.c | 4 ++-- target/i386/whpx/whpx-internal.h | 1 + 8 files changed, 14 insertions(+), 5 deletions(-)
Quoted 3 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(100%)
r~
PATCH v3 3/14 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 | 564 ++++++++++++++++++
include/system/whpx-accel-ops.h | 4 +-
include/system/whpx-all.h | 12 +
include/system/whpx-common.h | 21 +
.../whpx => include/system}/whpx-internal.h | 6 +-
target/i386/whpx/whpx-all.c | 522 +---------------
target/i386/whpx/whpx-apic.c | 2 +-
9 files changed, 611 insertions(+), 523 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
rename {target/i386/whpx => include/system}/whpx-internal.h (98%)MAINTAINERS +2 -0
@@ -547,6 +547,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 X86 Instruction Emulator M: Cameron Esfahani <[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 +564 -0
564 lines not on this page · raw message
include/system/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-all.h new file +12 -0
@@ -0,0 +1,12 @@ +/* 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); +#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
include/system/whpx-internal.h renamed from target/i386/whpx/whpx-internal.h +3 -3
@@ -1,5 +1,6 @@ -#ifndef TARGET_I386_WHPX_INTERNAL_H -#define TARGET_I386_WHPX_INTERNAL_H +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SYSTEM_WHPX_INTERNAL_H +#define SYSTEM_WHPX_INTERNAL_H #include <windows.h> #include <winhvplatform.h>
@@ -117,4 +118,3 @@ typedef enum WHPFunctionList { } WHPFunctionList;#endif /* TARGET_I386_WHPX_INTERNAL_H */ -
target/i386/whpx/whpx-all.c +5 -517
571 lines not on this page · raw message
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.39.5 (Apple Git-154)
Re: [PATCH v3 03/14] whpx: reshuffle common code
Quoted 2 lines · Mohamed Mediouni
accel/whpx/whpx-common.c new file +0
-0
...
accel/whpx/whpx-common.c line 47
Quoted 7 lines
accel/whpx/whpx-common.c new file +7
-0+bool whpx_allowed; +static bool whp_dispatch_initialized; +static HMODULE hWinHvPlatform; +static HMODULE hWinHvEmulation; + +struct whpx_state whpx_global; +struct WHPDispatch whp_dispatch;
You failed to remove these from target/i386/whpx/whpx-all.c.
I'm surprised you didn't receive a link error for at least whpx_allowed. I guess the windows compiler doesn't support -fno-common? Or a compile-time error for the unused static variables?
You need to make sure x86 still builds at every step.
r~
PATCH v3 4/14 whpx: ifdef out some x86-only code paths
In reply to Mohamed Mediouniwinhvemulation is x86_64 only.
Exception exit bitmaps are also x86_64 only Others are just variable definitions not used on arm64.
--- accel/whpx/whpx-common.c | 20 ++++++++++++++++++-- include/system/whpx-all.h | 2 ++ include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 4 files changed, 28 insertions(+), 3 deletions(-)
accel/whpx/whpx-common.c +18 -2
@@ -41,7 +41,9 @@bool whpx_allowed;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform; +#ifdef __x86_64__static HMODULE hWinHvEmulation; +#endif struct whpx_state whpx_global;struct WHPDispatch whp_dispatch;
@@ -106,11 +108,16 @@ int whpx_first_vcpu_starting(CPUState *cpu)* whpx_translate_cpu_breakpoints(). WHPX breakpoints must * now be recomputed. */ +#ifdef __x86_64__whpx_translate_cpu_breakpoints (&whpx->breakpoints, cpu, i); +#endif } +#ifdef __x86_64__/* Actually insert the breakpoints into the memory. */ whpx_apply_breakpoints (whpx->breakpoints.breakpoints, cpu, true); +#endif } +#ifdef __x86_64__HRESULT hr;uint64_t exception_mask; if (whpx->step_pending ||
@@ -132,6 +139,7 @@ int whpx_first_vcpu_starting(CPUState *cpu) "hr=%08lx.", hr); return 1; } +#endif return 0 ; }
@@ -238,8 +246,10 @@ void whpx_destroy_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); +#ifdef __x86_64__AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); +#endif g_free (cpu->accel); }
@@ -414,8 +424,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else +abort (); +#endif break ;case WINHV_PLATFORM_FNS_SUPPLEMENTAL :WHP_LOAD_LIB (WINHV_PLATFORM_DLL , hLib)
@@ -541,11 +555,11 @@ bool init_whp_dispatch(void)if (!load_whp_dispatch_fns (&hWinHvPlatform,WINHV_PLATFORM_FNS_DEFAULT )) { goto error; } - +#ifdef __x86_64__if (!load_whp_dispatch_fns (&hWinHvEmulation,WINHV_EMULATION_FNS_DEFAULT )) { goto error; } - +#endif assert (load_whp_dispatch_fns (&hWinHvPlatform,WINHV_PLATFORM_FNS_SUPPLEMENTAL )); whp_dispatch_initialized = true;
@@ -555,9 +569,11 @@ error:if (hWinHvPlatform) {FreeLibrary (hWinHvPlatform); } +#ifdef __x86_64__if (hWinHvEmulation) {FreeLibrary (hWinHvEmulation); } +#endif return false; }
include/system/whpx-all.h +2 -0
@@ -8,5 +8,7 @@ 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); +#ifdef __x86_64__HRESULT whpx_set_exception_exit_bitmap (UINT64 exceptions);#endif +#endif
include/system/whpx-common.h +2 -0
@@ -3,6 +3,7 @@#define SYSTEM_WHPX_COMMON_H struct AccelCPUState { +#ifdef __x86_64__WHV_EMULATOR_HANDLE emulator;bool window_registered;bool interruptable;
@@ -10,6 +11,7 @@ struct AccelCPUState {uint64_t tpr;uint64_t apic_base;bool interruption_pending; +#endif /* Must be the last field as it may have a tail */ WHV_RUN_VP_EXIT_CONTEXT exit_ctx; };
include/system/whpx-internal.h +6 -1
@@ -4,8 +4,9 @@#include <windows.h> #include <winhvplatform.h> +#ifdef __x86_64__#include <winhvemulation.h> - +#endif typedef enum WhpxBreakpointState { WHPX_BP_CLEARED = 0, WHPX_BP_SET_PENDING,
@@ -98,12 +99,16 @@ void whpx_apic_get(DeviceState *s);/* Define function typedef */ LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE) +#ifdef __x86_64__ LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE) +#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL (WHP_DEFINE_TYPE) struct WHPDispatch { LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER) +#ifdef __x86_64__ LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER) +#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER) };
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
Quoted 29 lines · Mohamed Mediouni
winhvemulation is
x86_64only.
Exception exit bitmaps are alsox86_64only Others are just variable definitions not used on arm64.Signed-off-by Mohamed Mediouni <[email protected]>--- accel/whpx/whpx-common.c | 20 ++++++++++++++++++-- include/system/whpx-all.h | 2 ++ include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 4 files changed, 28 insertions(+), 3 deletions(-)accel/whpx/whpx-common.c +2
-0@@ -41,7 +41,9 @@bool whpx_allowed;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform; +#ifdef __x86_64__static HMODULE hWinHvEmulation; +#endif struct whpx_state whpx_global;struct WHPDispatch whp_dispatch;@@ -106,11 +108,16 @@ int whpx_first_vcpu_starting(CPUState *cpu)* whpx_translate_cpu_breakpoints(). WHPX breakpoints must * now be recomputed.
accel/whpx/whpx-common.c int whpx_first_vcpu_starting(CPUState *cpu) · line 119
Quoted 10 lines
accel/whpx/whpx-common.c +4
-0*/ +#ifdef __x86_64__whpx_translate_cpu_breakpoints (&whpx->breakpoints, cpu, i); +#endif } +#ifdef __x86_64__/* Actually insert the breakpoints into the memory. */ whpx_apply_breakpoints (whpx->breakpoints.breakpoints, cpu, true); +#endif }
These are still static in target/i386/whpx/whpx-all.c, so the split in the previous patch didn't work. You probably want arm to *have* these functions, even if they're empty.
accel/whpx/whpx-common.c int whpx_first_vcpu_starting(CPUState *cpu) · line 142
Quoted 9 lines
accel/whpx/whpx-common.c +2
-0+#ifdef __x86_64__HRESULT hr;uint64_t exception_mask; if (whpx->step_pending ||@@ -132,6 +139,7 @@ int whpx_first_vcpu_starting(CPUState *cpu) "hr=%08lx.", hr); return 1; } +#endif
I'm not quite sure what this is doing, but it probably needs to be split out to a new function which can be specialized between architectures.
accel/whpx/whpx-common.c void whpx_destroy_vcpu(CPUState *cpu) · line 252
Quoted 8 lines
accel/whpx/whpx-common.c +2
-0@@ -238,8 +246,10 @@ void whpx_destroy_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); +#ifdef __x86_64__AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); +#endif
Does the os function exist on arm? The answer to that determines whether we must split this out to an architecture function or if we can do
if (vcpu->emulator) {
destroy
}accel/whpx/whpx-common.c static bool load_whp_dispatch_fns(HMODULE *handle, · line 432
Quoted 10 lines
accel/whpx/whpx-common.c +4
-0@@ -414,8 +424,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else +abort (); +#endif
Use g_assert_not_reached not abort.
That said, it might be cleaner to split this into two functions, rather than select pieces of the function via an enumerator. At which point I could see the entire set of emulation code staying in target/i386/.
r~
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
Quoted 44 lines · Richard Henderson
Quoted 26 lines · Mohamed Mediouni
winhvemulation is
x86_64only.
Exception exit bitmaps are alsox86_64only Others are just variable definitions not used on arm64.Signed-off-by Mohamed Mediouni <[email protected]>--- accel/whpx/whpx-common.c | 20 ++++++++++++++++++-- include/system/whpx-all.h | 2 ++ include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 4 files changed, 28 insertions(+), 3 deletions(-)accel/whpx/whpx-common.c +2
-0@@ -41,7 +41,9 @@bool whpx_allowed;static bool whp_dispatch_initialized;static HMODULE hWinHvPlatform; +#ifdef __x86_64__static HMODULE hWinHvEmulation; +#endif struct whpx_state whpx_global;struct WHPDispatch whp_dispatch;@@ -106,11 +108,16 @@ int whpx_first_vcpu_starting(CPUState *cpu)* whpx_translate_cpu_breakpoints(). WHPX breakpoints must * now be recomputed. accel/whpx/whpx-common.c int whpx_first_vcpu_starting(CPUState *cpu) · line 119
Quoted 10 lines
accel/whpx/whpx-common.c +4
-0*/ +#ifdef __x86_64__whpx_translate_cpu_breakpoints (&whpx->breakpoints, cpu, i); +#endif } +#ifdef __x86_64__/* Actually insert the breakpoints into the memory. */ whpx_apply_breakpoints (whpx->breakpoints.breakpoints, cpu, true); +#endif }These are still static in
target/i386/whpx/whpx-all.c, so the split in the previous patch didn't work. You probably want arm to *have* these functions, even if they're empty.
Quoted 11 lines
accel/whpx/whpx-common.c int whpx_first_vcpu_starting(CPUState *cpu) · line 142
Quoted 9 lines
accel/whpx/whpx-common.c +2
-0+#ifdef __x86_64__HRESULT hr;uint64_t exception_mask; if (whpx->step_pending ||@@ -132,6 +139,7 @@ int whpx_first_vcpu_starting(CPUState *cpu) "hr=%08lx.", hr); return 1; } +#endif I'm not quite sure what this is doing, but it probably needs to be split out to a new function which can be specialized between architectures.
Hello,
Arm WHPX has no specific functionality for debugging today, but we could support kernel mode breakpoints via replacing them by an unhandled hvc #2, stubbing might be the right route to go...
Quoted 11 lines
accel/whpx/whpx-common.c void whpx_destroy_vcpu(CPUState *cpu) · line 251
Quoted 8 lines
accel/whpx/whpx-common.c +2
-0@@ -238,8 +246,10 @@ void whpx_destroy_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global; whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); +#ifdef __x86_64__AccelCPUState *vcpu = cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator); +#endif Does the os function exist on arm? The answer to that determines whether we must split this out to an architecture function or if we can do
Quoted 3 lines
if (vcpu->emulator) {
destroy
}The winhvemulation header has x86-isms and isn’t parsable on arm unfortunately.
The whole winhvemulation library is x86_64 specific.
That said, I don’t think we need winhvemulation on x86 in the first place and it could be a good idea to get rid of the dependency there too.
Quoted 13 lines
accel/whpx/whpx-common.c static bool load_whp_dispatch_fns(HMODULE *handle, · line 432
Quoted 10 lines
accel/whpx/whpx-common.c +4
-0@@ -414,8 +424,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else +abort (); +#endif Use
g_assert_not_reachednot abort.
Quoted 1 line
That said, it might be cleaner to split this into two functions, rather than select pieces of the function via an enumerator. At which point I could see the entire set of emulation code staying in target/i386/.
There’s still significant shared code that might be worth keeping I think… will test a bit on x86 and see what makes sense to do…
Thank you,
Quoted 3 lines
r~
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
Quoted 1 line · Mohamed Mediouni
Arm WHPX has no specific functionality for debugging today, but we could support kernel mode breakpoints via replacing them by an unhandled hvc #2, stubbing might be the right route to go...
Surely the debug registers are usable? In the meantime, stub functions which do nothing are better than ifdefs wherever possible.
r~
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
Quoted 8 lines · Richard Henderson
Quoted 1 line · Mohamed Mediouni
Arm WHPX has no specific functionality for debugging today, but we could support kernel mode breakpoints via replacing them by an unhandled hvc #2, stubbing might be the right route to go...
Surely the debug registers are usable? In the meantime, stub functions which do nothing are better than ifdefs wherever possible.
The debug exception goes to EL1 if we do so instead of the hypervisor because there aren't exit bitmaps/a debug trap API on arm64 WHP to make the HV vmexit in that case
Quoted 1 line
r~
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
Quoted 9 lines · Mohamed Mediouni
Quoted 8 lines · Richard Henderson
Quoted 1 line · Mohamed Mediouni
Arm WHPX has no specific functionality for debugging today, but we could support kernel mode breakpoints via replacing them by an unhandled hvc #2, stubbing might be the right route to go...
Surely the debug registers are usable? In the meantime, stub functions which do nothing are better than ifdefs wherever possible.
The debug exception goes to EL1 if we do so instead of the hypervisor because there aren't exit bitmaps/a debug trap API on arm64 WHP to make the HV vmexit in that case
Huh. I thought I remembered some el2 debugging. Oh well. Leaving it support as stub functions is good enough for now.
r~
Re: [PATCH v3 04/14] whpx: ifdef out some x86-only code paths
In reply to Mohamed Mediouniaccel/whpx/whpx-common.c static bool load_whp_dispatch_fns(HMODULE *handle, · line 433
Quoted 11 lines · Mohamed Mediouni
accel/whpx/whpx-common.c +4
-0@@ -414,8 +424,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle,LIST_WINHVPLATFORM_FUNCTIONS (WHP_LOAD_FIELD) break;case WINHV_EMULATION_FNS_DEFAULT : +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else +abort (); +#endif break ;
BTW, are there import libraries for these?
If not, could we use dlltool or something to create one at build time?
Since they are required for whpx to function, I just thought it might be easier to have them auto-loaded with the executable, and functions dispatched by the linker, rather than go through whp_dispatch.
r~
PATCH v3 5/14 hw, target, accel: whpx: change apic_in_platform to kernel_irqchip
In reply to Mohamed MediouniChange terminology to match the KVM one, as APIC is x86-specific.
--- accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 4 ++-- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 2 +- include/system/whpx.h | 4 ++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-)
accel/whpx/whpx-accel-ops.c +1 -1
@@ -80,7 +80,7 @@ static void whpx_kick_vcpu_thread(CPUState *cpu)static bool whpx_vcpu_thread_is_idle (CPUState *cpu) { -return !whpx_apic_in_platform (); +return !whpx_irqchip_in_kernel (); }static void whpx_accel_ops_class_init (ObjectClass *oc,const void *data)
accel/whpx/whpx-common.c +2 -2
@@ -504,9 +504,9 @@ static const TypeInfo whpx_cpu_accel_type = {* Partition support */ -bool whpx_apic_in_platform (void ) +bool whpx_irqchip_in_kernel (void ) { -return whpx_global.apic_in_platform; +return whpx_global.kernel_irqchip; }static void whpx_accel_class_init (ObjectClass *oc,const void *data)
hw/i386/x86-cpu.c +2 -2
@@ -45,7 +45,7 @@ static void pic_irq_request(void *opaque, int irq, int level)trace_x86_pic_interrupt (irq, level);if (cpu_is_apic_enabled (cpu->apic_state) && !kvm_irqchip_in_kernel () && - !whpx_apic_in_platform ()) { + !whpx_irqchip_in_kernel ()) {CPU_FOREACH (cs) { cpu =X86_CPU (cs);if (apic_accept_pic_intr (cpu->apic_state)) {
@@ -71,7 +71,7 @@ int cpu_get_pic_interrupt(CPUX86State *env)X86CPU *cpu =env_archcpu (env);int intno; -if (!kvm_irqchip_in_kernel () && !whpx_apic_in_platform ()) { +if (!kvm_irqchip_in_kernel () && !whpx_irqchip_in_kernel ()) { intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno;
include/system/whpx-internal.h +1 -1
@@ -42,7 +42,7 @@ struct whpx_state {bool kernel_irqchip_allowed;bool kernel_irqchip_required; -bool apic_in_platform; +bool kernel_irqchip; };extern struct whpx_state whpx_global;
include/system/whpx.h +2 -2
@@ -26,10 +26,10 @@#ifdef CONFIG_WHPX_IS_POSSIBLE extern bool whpx_allowed;#define whpx_enabled () (whpx_allowed) -bool whpx_apic_in_platform (void ); +bool whpx_irqchip_in_kernel (void );#else /* !CONFIG_WHPX_IS_POSSIBLE */ #define whpx_enabled () 0 -#define whpx_apic_in_platform () (0) +#define whpx_irqchip_in_kernel () (0)#endif /* !CONFIG_WHPX_IS_POSSIBLE */ #endif /* QEMU_WHPX_H */
target/i386/cpu-apic.c +1 -1
@@ -32,7 +32,7 @@ APICCommonClass *apic_get_class(Error **errp) apic_type ="kvm-apic" ; }else if (xen_enabled ()) { apic_type ="xen-apic" ; - }else if (whpx_apic_in_platform ()) { + }else if (whpx_irqchip_in_kernel ()) { apic_type ="whpx-apic" ; }
target/i386/whpx/whpx-all.c +7 -7
@@ -626,7 +626,7 @@ static 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
@@ -768,7 +768,7 @@ static 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); }
@@ -1395,7 +1395,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);
@@ -1568,7 +1568,7 @@ static 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 ;
@@ -1656,7 +1656,7 @@ static 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 ;
@@ -2203,7 +2203,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } }else { - whpx->apic_in_platform = true; + whpx->kernel_irqchip = true; } }
@@ -2212,7 +2212,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.39.5 (Apple Git-154)
Re: [PATCH v3 05/14] hw, target, accel: whpx: change apic_in_platform to kernel_irqchip
Quoted 12 lines · Mohamed Mediouni
Change terminology to match the KVM one, as APIC is x86-specific.
Signed-off-by Mohamed Mediouni<[email protected]>--- accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 4 ++-- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 2 +- include/system/whpx.h | 4 ++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-)
r~
PATCH v3 6/14 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 | 261 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 271 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 "hw/loader.h" #include "qapi/error.h"
@@ -2060,6 +2061,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)
@@ -662,6 +663,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 +261 -0
261 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')) specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) specific_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', 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')) specific_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
@@ -306,6 +306,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.39.5 (Apple Git-154)
PATCH v3 7/14 whpx: add arm64 support
In reply to Mohamed Mediouni--- accel/whpx/whpx-common.c | 1 + meson.build | 21 +- target/arm/meson.build | 1 + target/arm/whpx/meson.build | 3 + target/arm/whpx/whpx-all.c | 831 ++++++++++++++++++++++++++++++++++++ 5 files changed, 850 insertions(+), 7 deletions(-) create mode 100644 target/arm/whpx/meson.build create mode 100644 target/arm/whpx/whpx-all.c
accel/whpx/whpx-common.c +1 -0
@@ -16,6 +16,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"
meson.build +14 -7
@@ -327,7 +327,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 += {
@@ -884,14 +885,20 @@ accelerators = [] if get_option('kvm').allowed() and host_os == 'linux' accelerators += 'CONFIG_KVM' 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()
target/arm/meson.build +1 -0
@@ -46,6 +46,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 +831 -0
831 lines not on this page · raw message
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 07/14] whpx: add arm64 support
target/arm/whpx/whpx-all.c line 129
Quoted 8 lines · Mohamed Mediouni
target/arm/whpx/whpx-all.c new file +8
-0+struct whpx_sreg_match { +WHV_REGISTER_NAME reg; +uint32_t key; +bool global; +uint32_t cp_idx; +}; + +static struct whpx_sreg_match whpx_sreg_match[] = {
const.
Quoted 11 lines
target/arm/whpx/whpx-all.c new file +11
-0+#ifdef SYNC_NO_RAW_REGS + /* + * The registers below are manually synced on init because they are + * marked as NO_RAW. We still list them to make number space sync easier. + */ + { WHvArm64RegisterMidrEl1, WHPX_SYSREG(0, 0, 3, 0, 0) }, + { WHvArm64RegisterMpidrEl1, WHPX_SYSREG(0, 0, 3, 0, 5) }, + { WHvArm64RegisterIdPfr0El1, WHPX_SYSREG(0, 4, 3, 0, 0) }, +#endif + { WHvArm64RegisterIdAa64Pfr1El1, WHPX_SYSREG(0, 4, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Dfr0El1, WHPX_SYSREG(0, 5, 3, 0, 0), true },
target/arm/whpx/whpx-all.c line 231
Quoted 10 lines
target/arm/whpx/whpx-all.c new file +10
-0+ { WHvArm64RegisterIdAa64Dfr1El1, WHPX_SYSREG(0, 5, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Isar0El1, WHPX_SYSREG(0, 6, 3, 0, 0), true }, + { WHvArm64RegisterIdAa64Isar1El1, WHPX_SYSREG(0, 6, 3, 0, 1), true }, +#ifdef SYNC_NO_MMFR0 + /* We keep the hardware MMFR0 around. HW limits are there anyway */ + { WHvArm64RegisterIdAa64Mmfr0El1, WHPX_SYSREG(0, 7, 3, 0, 0) }, +#endif + { WHvArm64RegisterIdAa64Mmfr1El1, WHPX_SYSREG(0, 7, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Mmfr2El1, WHPX_SYSREG(0, 7, 3, 0, 2), true }, + { WHvArm64RegisterIdAa64Mmfr3El1, WHPX_SYSREG(0, 7, 3, 0, 3), true },
All of these are id registers. I can understand reading them once at startup, to populate -cpu host, but they need not be synced otherwise.
target/arm/whpx/whpx-all.c line 334
Quoted 5 lines
target/arm/whpx/whpx-all.c new file +5
-0+static uint64_t whpx_get_gp_reg (CPUState *cpu,int rt) +{ +if (rt >=31 ) { +return 0 ; + }
assert? Or return 0 for 31 and assert <= 32?
target/arm/whpx/whpx-all.c line 346
Quoted 12 lines
target/arm/whpx/whpx-all.c new file +12
-0+WHV_REGISTER_NAME reg = WHvArm64RegisterX0 + rt; +WHV_REGISTER_VALUE val; +whpx_get_reg (cpu, reg, &val); + +return val.Reg64; +} + +static void whpx_set_gp_reg (CPUState *cpu,int rt,uint64_t val) +{ +if (rt >=31 ) { +abort (); + }
assert. Or ignore write to 31 and assert <= 32?
target/arm/whpx/whpx-all.c line 370
Quoted 5 lines
target/arm/whpx/whpx-all.c new file +5
-0+if (cm) { +/* We don't cache MMIO regions */ +abort (); +return 0 ; + }
assert.
r~
Re: [PATCH v3 07/14] whpx: add arm64 support
Quoted 15 lines · Richard Henderson
target/arm/whpx/whpx-all.c line 129
Quoted 8 lines · Mohamed Mediouni
target/arm/whpx/whpx-all.c new file +8
-0+struct whpx_sreg_match { +WHV_REGISTER_NAME reg; +uint32_t key; +bool global; +uint32_t cp_idx; +}; + +static struct whpx_sreg_match whpx_sreg_match[] = {const.
cp_idx is constructed at runtime (in whpx_init_vcpu) , so this is not constant.
Quoted 16 lines
Quoted 16 lines
target/arm/whpx/whpx-all.c new file +15
-0+#ifdef SYNC_NO_RAW_REGS + /* + * The registers below are manually synced on init because they are + * marked as NO_RAW. We still list them to make number space sync easier. + */ + { WHvArm64RegisterMidrEl1, WHPX_SYSREG(0, 0, 3, 0, 0) }, + { WHvArm64RegisterMpidrEl1, WHPX_SYSREG(0, 0, 3, 0, 5) }, + { WHvArm64RegisterIdPfr0El1, WHPX_SYSREG(0, 4, 3, 0, 0) }, +#endif + { WHvArm64RegisterIdAa64Pfr1El1, WHPX_SYSREG(0, 4, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Dfr0El1, WHPX_SYSREG(0, 5, 3, 0, 0), true }, + { WHvArm64RegisterIdAa64Dfr1El1, WHPX_SYSREG(0, 5, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Isar0El1, WHPX_SYSREG(0, 6, 3, 0, 0), true }, + { WHvArm64RegisterIdAa64Isar1El1, WHPX_SYSREG(0, 6, 3, 0, 1), true }, +#ifdef SYNC_NO_MMFR0
Quoted 8 lines
target/arm/whpx/whpx-all.c line 231
Quoted 6 lines
target/arm/whpx/whpx-all.c new file +6
-0+ /* We keep the hardware MMFR0 around. HW limits are there anyway */ + { WHvArm64RegisterIdAa64Mmfr0El1, WHPX_SYSREG(0, 7, 3, 0, 0) }, +#endif + { WHvArm64RegisterIdAa64Mmfr1El1, WHPX_SYSREG(0, 7, 3, 0, 1), true }, + { WHvArm64RegisterIdAa64Mmfr2El1, WHPX_SYSREG(0, 7, 3, 0, 2), true }, + { WHvArm64RegisterIdAa64Mmfr3El1, WHPX_SYSREG(0, 7, 3, 0, 3), true },All of these are id registers. I can understand reading them once at startup, to populate -cpu host, but they need not be synced otherwise.
Will need to sync them once somewhere for targets other than -cpu host, but no need to do so for every vCPU (as they’re global values)
Quoted 33 lines
target/arm/whpx/whpx-all.c line 334
Quoted 5 lines
target/arm/whpx/whpx-all.c new file +5
-0+static uint64_t whpx_get_gp_reg (CPUState *cpu,int rt) +{ +if (rt >=31 ) { +return 0 ; + }assert? Or return 0 for 31 and assert <= 32?
target/arm/whpx/whpx-all.c line 346
Quoted 12 lines
target/arm/whpx/whpx-all.c new file +12
-0+WHV_REGISTER_NAME reg = WHvArm64RegisterX0 + rt; +WHV_REGISTER_VALUE val; +whpx_get_reg (cpu, reg, &val); + +return val.Reg64; +} + +static void whpx_set_gp_reg (CPUState *cpu,int rt,uint64_t val) +{ +if (rt >=31 ) { +abort (); + }assert. Or ignore write to 31 and assert <= 32?
target/arm/whpx/whpx-all.c line 370
Quoted 5 lines
target/arm/whpx/whpx-all.c new file +5
-0+if (cm) { +/* We don't cache MMIO regions */ +abort (); +return 0 ; + }assert.
r~
PATCH v3 8/14 whpx: copy over memory management logic from hvf
In reply to Mohamed MediouniThis allows edk2 to work, although u-boot is still not functional.
--- accel/whpx/whpx-common.c | 201 ++++++++++++++++++++++++++++----------- 1 file changed, 147 insertions(+), 54 deletions(-)
accel/whpx/whpx-common.c +147 -54
@@ -266,89 +266,174 @@ 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) +/* whpx_slot flags */ +#define WHPX_SLOT_LOG (1 << 0) +typedef struct whpx_slot { +uint64_t start; +uint64_t size; +uint8_t *mem; +int slot_id; +uint32_t flags; +MemoryRegion *region; +}whpx_slot ; + +typedef struct WHPXState { +whpx_slot slots[32 ]; +int num_slots; +}WHPXState ; + +WHPXState *whpx_state; + +struct mac_slot { +int present; +uint64_t size; +uint64_t gpa_start; +uint64_t gva; +}; + +struct mac_slot mac_slots[32 ]; + +static int do_whpx_set_memory (whpx_slot *slot,WHV_MAP_GPA_RANGE_FLAGS flags) {struct whpx_state *whpx = &whpx_global; +struct mac_slot *macslot;HRESULT hr; -/* -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); + macslot = &mac_slots[slot->slot_id]; + +if (macslot->present) { +if (macslot->size != slot->size) { + macslot->present =0 ; + hr = whp_dispatch.WHvUnmapGpaRange (whpx->partition, + macslot->gpa_start, macslot->size); +if (FAILED (hr)) { +abort (); + } + } } -*/ - -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 (!slot->size) { +return 0 ; } -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); + macslot->present =1 ; + macslot->gpa_start = slot->start; + macslot->size = slot->size; + hr = whp_dispatch.WHvMapGpaRange (whpx->partition, + slot->mem, slot->start, slot->size, flags); +return 0 ; +} + +static whpx_slot *whpx_find_overlap_slot (uint64_t start,uint64_t size) +{ +whpx_slot *slot; +int x; +for (x =0 ; x < whpx_state->num_slots; ++x) { + slot = &whpx_state->slots[x]; +if (slot->size && start < (slot->start + slot->size) && + (start + size) > slot->start) { +return slot; + } } +return NULL ; } -static void whpx_process_section (MemoryRegionSection *section,int add) +static void whpx_set_phys_mem (MemoryRegionSection *section,bool 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; +whpx_slot *mem; +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 (); + +if (!memory_region_is_ram (area)) { +if (writable) { +return ; + }else if (!memory_region_is_romd (area)) { +/* +* If the memory device is not in romd_mode, then we actually want +* to remove the whpx memory slot so all accesses will trap. +*/ + add = false; + } + } -if (!memory_region_is_ram (mr)) { -return ; +if (!QEMU_IS_ALIGNED (int128_get64 (section->size), page_size) || + !QEMU_IS_ALIGNED (section->offset_within_address_space, 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 ; + mem =whpx_find_overlap_slot ( + section->offset_within_address_space, +int128_get64 (section->size)); + +if (mem && add) { +if (mem->size ==int128_get64 (section->size) && + mem->start == section->offset_within_address_space && + mem->mem == (memory_region_get_ram_ptr (area) + + section->offset_within_region)) { +return ;/* Same region was attempted to register, go away. */ + } + } + +/* Region needs to be reset. set the size to 0 and remap it. */ +if (mem) { + mem->size =0 ; +if (do_whpx_set_memory (mem,0 )) { +error_report ("Failed to reset overlapping slot" ); +abort (); + } } - start_pa += delta; - size -= delta; - size &=qemu_real_host_page_mask (); -if (!size || (start_pa & ~qemu_real_host_page_mask ())) { + +if (!add) {return ; } - host_va = (uintptr_t )memory_region_get_ram_ptr (mr) - + section->offset_within_region + delta; +if (area->readonly || + (!memory_region_is_ram (area) &&memory_region_is_romd (area))) { + flags = WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagExecute; + }else { + flags = WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagWrite + | WHvMapGpaRangeFlagExecute; + } + +/* Now make a new slot. */ +int x; + +for (x =0 ; x < whpx_state->num_slots; ++x) { + mem = &whpx_state->slots[x]; +if (!mem->size) { +break ; + } + } + +if (x == whpx_state->num_slots) { +error_report ("No free slots" ); +abort (); + } -whpx_update_mapping (start_pa, size, (void *)(uintptr_t )host_va, add, -memory_region_is_rom (mr), mr->name); + mem->size =int128_get64 (section->size); + mem->mem =memory_region_get_ram_ptr (area) + section->offset_within_region; + mem->start = section->offset_within_address_space; + mem->region = area; + +if (do_whpx_set_memory (mem, flags)) { +error_report ("Error registering new memory slot" ); +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)
@@ -532,6 +617,14 @@ static void whpx_accel_instance_init(Object *obj)memset (whpx,0 ,sizeof (struct whpx_state ));/* Turn on kernel-irqchip, by default */ whpx->kernel_irqchip_allowed = true; + +int x; + whpx_state =malloc (sizeof (WHPXState)); + whpx_state->num_slots =ARRAY_SIZE (whpx_state->slots); +for (x =0 ; x < whpx_state->num_slots; ++x) { + whpx_state->slots[x].size =0 ; + whpx_state->slots[x].slot_id = x; + } }static const TypeInfo whpx_accel_type = {
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v3 9/14 target/arm: cpu: mark WHPX as supporting PSCI 1.1
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, 2 insertions(+), 1 deletion(-)
target/arm/cpu.c +2 -1
@@ -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"
@@ -1496,7 +1497,7 @@ static void arm_cpu_initfn(Object *obj) cpu->psci_version =QEMU_PSCI_VERSION_0_1 ;/* By default assume PSCI v0.1 */ cpu->kvm_target =QEMU_KVM_ARM_TARGET_NONE ; -if (tcg_enabled () ||hvf_enabled ()) { +if (tcg_enabled () ||hvf_enabled () ||whpx_enabled ()) {/* TCG and HVF implement PSCI 1.1 */ cpu->psci_version =QEMU_PSCI_VERSION_1_1 ; }
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 09/14] target/arm: cpu: mark WHPX as supporting PSCI 1.1
Quoted 7 lines · Mohamed Mediouni
Hyper-V supports PSCI 1.3, and that implementation is exposed through WHPX.
Signed-off-by Mohamed Mediouni<[email protected]>--- target/arm/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
r~
PATCH v3 10/14 hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS
In reply to Mohamed MediouniWindows Hypervisor Platform's vGIC doesn't support ITS.
Deal with this by reporting to the user and not creating the ITS device.
--- hw/arm/virt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/arm/virt.c +10 -0
@@ -741,6 +741,16 @@ static void create_its(VirtMachineState *vms)return ; } +if (whpx_enabled () && vms->tcg_its) { +/* +* In the HVF case, inform the user that they can use the +* user-mode GIC if they want to have an ITS. +*/ +info_report ("ITS not supported without kernel-irqchip=off on WHPX" ); +info_report ("Disabling ITS" ); +return ; + } + dev =qdev_new (its_class_name ()); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic),
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 10/14] hw/arm: virt: cleanly fail on attempt to use the platform vGIC together with ITS
Quoted 13 lines · Mohamed Mediouni
Windows Hypervisor Platform's vGIC doesn't support ITS.
Deal with this by reporting to the user and not creating the ITS device.Signed-off-by Mohamed Mediouni <[email protected]>--- hw/arm/virt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/arm/virt.c +0
-0
hw/arm/virt.c static void create_its(VirtMachineState *vms) · line 746
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -741,6 +741,16 @@ static void create_its(VirtMachineState *vms)return ; } +if (whpx_enabled () && vms->tcg_its) { +/* +* In the HVF case, inform the user that they can use the
Watch out for the cut-and-paste of HVF.
r~
PATCH v3 11/14 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/boards.h | 1 + target/arm/whpx/meson.build | 2 ++ target/arm/whpx/whpx-all.c | 45 +++++++++++++++++++++++++++++++++++++ target/arm/whpx/whpx-stub.c | 15 +++++++++++++ target/arm/whpx_arm.h | 16 +++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 target/arm/whpx/whpx-stub.c create mode 100644 target/arm/whpx_arm.h
hw/arm/virt.c +32 -0
@@ -70,6 +70,7 @@#include "hw/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"
@@ -3162,6 +3163,36 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)return fixed_ipa ?0 : requested_pa_size; } +static int virt_whpx_get_physical_address_range (MachineState *ms) +{ +VirtMachineState *vms =VIRT_MACHINE (ms); + +int max_ipa_size =whpx_arm_get_ipa_bit_size (); + +/* We freeze the memory map to compute the highest gpa */ +virt_set_memmap (vms, max_ipa_size); + +int requested_ipa_size =64 -clz64 (vms->highest_gpa); + +/* +* If we're <= the default IPA size just use the default. +* If we're above the default but below the maximum, round up to +* the maximum. hvf_arm_get_max_ipa_bit_size() conveniently only +* returns values that are valid ARM PARange values. +*/ +if (requested_ipa_size <= max_ipa_size) { + requested_ipa_size = max_ipa_size; + }else { +error_report ("-m and ,maxmem option values " +"require an IPA range (%d bits) larger than " +"the one supported by the host (%d bits)" , + requested_ipa_size, max_ipa_size); +return -1 ; + } + +return requested_ipa_size; +} +static int virt_hvf_get_physical_address_range (MachineState *ms) {VirtMachineState *vms =VIRT_MACHINE (ms);
@@ -3256,6 +3287,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/boards.h +1 -0
@@ -276,6 +276,7 @@ struct MachineClass {void (*wakeup)(MachineState *state);int (*kvm_type)(MachineState *machine,const char *arg);int (*hvf_get_physical_address_range)(MachineState *machine); +int (*whpx_get_physical_address_range)(MachineState *machine);BlockInterfaceType block_default_type;int units_per_default_bus;
target/arm/whpx/meson.build +2 -0
@@ -1,3 +1,5 @@ arm_system_ss.add(when: 'CONFIG_WHPX', if_true: files( 'whpx-all.c', )) + +arm_common_system_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))
target/arm/whpx/whpx-all.c +45 -0
75 lines not on this page · raw message
target/arm/whpx/whpx-stub.c new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX stubs for ARM +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#include "qemu/osdep.h" +#include "whpx_arm.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ) +{ +g_assert_not_reached (); +}
target/arm/whpx_arm.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* WHPX support -- ARM specifics +* +* Copyright (c) 2025 Mohamed Mediouni +* +*/ + +#ifndef QEMU_WHPX_ARM_H +#define QEMU_WHPX_ARM_H + +#include "target/arm/cpu-qom.h" + +uint32_t whpx_arm_get_ipa_bit_size (void ); + +#endif
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 11/14] whpx: arm64: clamp down IPA size
include/hw/boards.h struct MachineClass { · line 279
Quoted 6 lines · Mohamed Mediouni
+++
b/include/hw/boards.hinclude/hw/boards.h +1
-0@@ -276,6 +276,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);
We need to generalize this to an accelerator hook, so that there's one code path for both hvf and whpx. And kvm, for that matter, though it's less obvious how that's handled.
r~
PATCH v3 12/14 whpx: arm64: implement -cpu host
In reply to Mohamed MediouniOpenProcessorKey and ReadRegU64 adapted from:
https://github.com/FEX-Emu/FEX/blob/e6de17e72ef03aa88ba14fa0ec13163061608c74/Source/Windows/Common/CPUFeatures.cpp#L62
--- hw/arm/virt.c | 2 +- target/arm/cpu64.c | 14 ++-- target/arm/whpx/whpx-all.c | 130 +++++++++++++++++++++++++++++++++++++ target/arm/whpx_arm.h | 1 + 4 files changed, 142 insertions(+), 5 deletions(-)
hw/arm/virt.c +1 -1
@@ -3249,7 +3249,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)#ifdef TARGET_AARCH64 ARM_CPU_TYPE_NAME("cortex-a53"), ARM_CPU_TYPE_NAME("cortex-a57"), -#if defined(CONFIG_KVM ) || defined(CONFIG_HVF ) +#if defined(CONFIG_KVM ) || defined(CONFIG_HVF ) || defined(CONFIG_WHPX ) ARM_CPU_TYPE_NAME("host"),#endif /* CONFIG_KVM || CONFIG_HVF */ #endif /* TARGET_AARCH64 */
target/arm/cpu64.c +10 -4
@@ -26,10 +26,12 @@#include "qemu/units.h" #include "system/kvm.h" #include "system/hvf.h" +#include "system/whpx.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/qdev-properties.h" #include "internals.h"
@@ -522,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 (kvm_enabled () ||hvf_enabled () ||whpx_enabled ()) {/* * Exit early if PAuth is enabled and fall through to disable it. * The algorithm selection properties are not present.
@@ -599,7 +601,7 @@ 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 (kvm_enabled () ||hvf_enabled () ||whpx_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!
@@ -773,6 +775,10 @@ static void aarch64_host_initfn(Object *obj)ARMCPU *cpu =ARM_CPU (obj);hvf_arm_set_cpu_features_from_host (cpu);aarch64_add_pauth_properties (obj); +#elif defined(CONFIG_WHPX ) +ARMCPU *cpu =ARM_CPU (obj); +whpx_arm_set_cpu_features_from_host (cpu); +aarch64_add_pauth_properties (obj);#else g_assert_not_reached ();#endif
@@ -780,7 +786,7 @@ static void aarch64_host_initfn(Object *obj)static void aarch64_max_initfn (Object *obj) { -if (kvm_enabled () ||hvf_enabled ()) { +if (kvm_enabled () ||hvf_enabled () ||whpx_enabled ()) {/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */ aarch64_host_initfn (obj);return ;
@@ -800,7 +806,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 +130 -0
142 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.39.5 (Apple Git-154)
Re: [PATCH v3 12/14] whpx: arm64: implement -cpu host
target/arm/cpu64.c void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) · line 527
Quoted 6 lines · Mohamed Mediouni
target/arm/cpu64.c +1
-1@@ -522,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 (kvm_enabled () ||hvf_enabled () ||whpx_enabled ()) {
Just a heads up, Phil has a patch which adds hwaccel_enabled().
https://lore.kernel.org/qemu-devel/[email protected]/
and I believe cleans up both here...
target/arm/cpu64.c void aarch64_add_pauth_properties(Object *obj) · line 604
Quoted 9 lines
target/arm/cpu64.c +1
-1/* * Exit early if PAuth is enabled and fall through to disable it. * The algorithm selection properties are not present. @@ -599,7 +601,7 @@ 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 (kvm_enabled () ||hvf_enabled () ||whpx_enabled ()) {
here...
target/arm/cpu64.c static void aarch64_host_initfn(Object *obj) · line 790
Quoted 7 lines
target/arm/cpu64.c +1
-1@@ -780,7 +786,7 @@ static void aarch64_host_initfn(Object *obj)static void aarch64_max_initfn (Object *obj) { -if (kvm_enabled () ||hvf_enabled ()) { +if (kvm_enabled () ||hvf_enabled () ||whpx_enabled ()) {/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */
and here.
Quoted 10 lines
target/arm/whpx/whpx-all.c +10
-0+static HKEY OpenProcessorKey (void ) +{ +HKEY Out; +const char *path ="Hardware\\Description\\System\\CentralProcessor\\0\\" ; +if (RegOpenKeyExA (HKEY_LOCAL_MACHINE , path,0 ,KEY_READ , &Out)) { +return NULL ; + } +return Out; +} +
target/arm/whpx/whpx-all.c static void clamp_id_aa64mmfr0_parange_to_ipa_size(ARMISARegisters *isar) · line 709
Quoted 10 lines
target/arm/whpx/whpx-all.c +10
-0+static uint64_t ReadRegU64 (HKEY Key,const char *name) +{ +uint64_t Value =0 ; +DWORD Size =sizeof (Value); +LONG res =RegGetValueA (Key,NULL , name,RRF_RT_REG_QWORD ,NULL , &Value, &Size); +if (res !=ERROR_SUCCESS ) { +printf ("Failed to get register value: error: 0x%x\n" , res); + } +return Value; +}
4 space indentation.
assert, not printf. :-)
Quoted 10 lines
target/arm/whpx/whpx-all.c +10
-0+ +static bool whpx_arm_get_host_cpu_features (ARMHostCPUFeatures *ahcf) +{ +ARMISARegisters host_isar = {}; +const struct isar_regs { +WHV_REGISTER_NAME reg; +uint64_t *val; + } regs[] = { + { WHvArm64RegisterIdAa64Pfr0El1, &host_isar.idregs[ID_AA64PFR0_EL1_IDX ] }, + { WHvArm64RegisterIdAa64Pfr1El1, &host_isar.idregs[ID_AA64PFR1_EL1_IDX ] },
target/arm/whpx/whpx-all.c static void clamp_id_aa64mmfr0_parange_to_ipa_size(ARMISARegisters *isar) · line 729
Quoted 10 lines
target/arm/whpx/whpx-all.c +10
-0+ { WHvArm64RegisterIdAa64Dfr0El1, &host_isar.idregs[ID_AA64DFR0_EL1_IDX] }, + { WHvArm64RegisterIdAa64Dfr1El1 , &host_isar.idregs[ID_AA64DFR1_EL1_IDX] }, + { WHvArm64RegisterIdAa64Isar0El1, &host_isar.idregs[ID_AA64ISAR0_EL1_IDX] }, + { WHvArm64RegisterIdAa64Isar1El1, &host_isar.idregs[ID_AA64ISAR1_EL1_IDX] }, + { WHvArm64RegisterIdAa64Isar2El1, &host_isar.idregs[ID_AA64ISAR2_EL1_IDX] }, + { WHvArm64RegisterIdAa64Mmfr0El1, &host_isar.idregs[ID_AA64MMFR0_EL1_IDX] }, + { WHvArm64RegisterIdAa64Mmfr1El1, &host_isar.idregs[ID_AA64MMFR1_EL1_IDX] }, + { WHvArm64RegisterIdAa64Mmfr2El1, &host_isar.idregs[ID_AA64MMFR2_EL1_IDX] }, + { WHvArm64RegisterIdAa64Mmfr3El1, &host_isar.idregs[ID_AA64MMFR2_EL1_IDX] } + };
I'm sure this arrangement was easiest before the id regs reorg, but now we can store the ID_* not the pointer in the table, and the table can be static const.
Why do we need the host_isar local variable?
We could be writing to ahcf->isar to begin.
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* + * Disable SME, which is not properly handled by QEMU hvf yet.
hvf. :-)
target/arm/whpx/whpx-all.c static void clamp_id_aa64mmfr0_parange_to_ipa_size(ARMISARegisters *isar) · line 783
Quoted 11 lines
target/arm/whpx/whpx-all.c +11
-0+/* +* A scratch vCPU returns SCTLR 0, so let's fill our default with the M1 +* boot SCTLR from https://github.com/AsahiLinux/m1n1/issues/97 +*/ + ahcf->reset_sctlr =0x30100180 ; +/* +* SPAN is disabled by default when SCTLR.SPAN=1. To improve compatibility, +* let's disable it on boot and then allow guest software to turn it on by +* setting it to 0. +*/ + ahcf->reset_sctlr |=0x00800000 ;
Is this really required, or just copied from hvf?
r~
PATCH v3 13/14 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
@@ -984,6 +984,29 @@ int whpx_accel_init(AccelState *as, MachineState *ms)memset (&prop,0 ,sizeof (WHV_PARTITION_PROPERTY )); +WHV_ARM64_IC_PARAMETERS ic_params = { + .EmulationMode = WHvArm64IcEmulationModeGicV3, + .GicV3Parameters = { + .GicdBaseAddress =0x08000000 , + .GitsTranslaterBaseAddress =0x08080000 , + .GicLpiIntIdBits =0 , + .GicPpiPerformanceMonitorsInterrupt =VIRTUAL_PMU_IRQ , + .GicPpiOverflowInterruptFromCntv =ARCH_TIMER_VIRT_IRQ + } + }; + prop.Arm64IcParameters = ic_params; + + hr = whp_dispatch.WHvSetPartitionProperty ( + whpx->partition, + WHvPartitionPropertyCodeArm64IcParameters, + &prop, +sizeof (WHV_PARTITION_PROPERTY )); +if (FAILED (hr)) { +error_report ("WHPX: Failed to enable GICv3 interrupt controller, hr=%08lx" , hr); + ret = -EINVAL ; + goto error; + } + hr = whp_dispatch.WHvSetupPartition (whpx->partition);if (FAILED (hr)) {error_report ("WHPX: Failed to setup partition, hr=%08lx" , hr);
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v3 14/14 MAINTAINERS: Add myself as a maintainer for WHPX
In reply to Mohamed MediouniAnd add arm64 files.
--- MAINTAINERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
MAINTAINERS +4 -1
@@ -539,11 +539,14 @@ F: accel/stubs/hvf-stub.c F: include/system/hvf.h F: include/system/hvf_int.h -WHPX CPUs +WHPX M: Sunil Muthuswamy <[email protected]> +M: Mohamed Mediouni <[email protected]> S: Supported F: accel/whpx/ F: target/i386/whpx/ +F: target/arm/whpx_arm.h +F: target/arm/whpx/ F: accel/stubs/whpx-stub.c F: include/system/whpx.h F: include/system/whpx-accel-ops.h
Signature · 1 line
2.39.5 (Apple Git-154)
Re: [PATCH v3 14/14] MAINTAINERS: Add myself as a maintainer for WHPX
Quoted 3 lines · Mohamed Mediouni
And add arm64 files.
Signed-off-by Mohamed Mediouni <[email protected]>
r~