Skip to content

WHPX support for Arm

Mohamed Mediouni qemu-arm qemu-devel 23 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v22 Latest20 of 22 patches 2 repliesIn review
  2. v2122 patches 1 replySuperseded
  3. v2022 patches 2 repliesSuperseded
Earlier versions · 20
VersionPostedPatchesRepliesStatus
v1922 patches4 repliesSuperseded
v1822 patches12 repliesSuperseded
v1721 patches14 repliesSuperseded
v1626 patches26 repliesSuperseded
v1526 patches8 repliesSuperseded
v1426 patches4 repliesSuperseded
v1328 patches11 repliesSuperseded
v1228 patches19 repliesSuperseded
v1128 patches8 repliesSuperseded
v1028 patches7 repliesSuperseded
v9 posting 2/227 patches1 replySuperseded
v9 posting 1/210 of 24 patches1 replySuperseded
v814 of 24 patches0 repliesSuperseded
v724 patches21 repliesSuperseded
v623 patches9 repliesSuperseded
v518 patches19 repliesSuperseded
v417 patches42 repliesSuperseded
v314 patches17 repliesSuperseded
v214 patches0 repliesSuperseded
v1 RFC9 patches16 repliesSuperseded

20 of 22 patches are in this archive. The cover letter announces 22.

Patches in v22 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22target/arm/kvm: add constants for new PSCI versionstarget/arm/kvm-consts.h+2 -00 replies
2/22accel/system: Introduce hwaccel_enabled() helperinclude/system/hw_accel.h+13 -00 replies
3/22qtest: hw/arm: virt: skip ACPI test for IORT with GICv2tests/qtest/bios-tables-test-allowed-diff.h+3 -00 replies
4/22hw: arm: virt: rework MSI-X configurationhw/arm/virt-acpi-build.c hw/arm/virt.c include/hw/arm/virt.h+128 -160 replies
5/22tests: data: update AArch64 ACPI tablestests/data/acpi/aarch64/virt/IORT tests/data/acpi/aarch64/virt/IORT.smmuv3-dev tests/data/acpi/aarch64/virt/IORT.smmuv3-legacy +1 more+0 -30 replies
6/22qtest: hw/arm: virt: add ACPI tables for new GICv3 + GICv2m test casetests/data/acpi/aarch64/virt/APIC.msi_gicv2m tests/data/acpi/aarch64/virt/IORT.msi_gicv2m+0 -00 replies
7/22qtest: hw/arm: virt: add new test case for GICv3 + GICv2mtests/qtest/bios-tables-test.c+21 -01 reply
8/22docs: arm: update virt machine model descriptiondocs/system/arm/virt.rst+19 -50 replies
9/22whpx: Move around files before introducing AArch64 supportMAINTAINERS accel/meson.build accel/whpx/meson.build +6 more+20 -100 replies
10/22whpx: reshuffle common codeMAINTAINERS accel/whpx/meson.build accel/whpx/whpx-common.c +3 more+612 -5410 replies
11/22whpx: ifdef out winhvemulation on non-x86_64accel/whpx/whpx-common.c include/system/whpx-common.h include/system/whpx-internal.h+20 -30 replies
12/22whpx: common: add WHPX_INTERCEPT_DEBUG_TRAPS defineaccel/whpx/whpx-common.c include/system/whpx-common.h+4 -10 replies
13/22hw, target, accel: whpx: change apic_in_platform to kernel_irqchipMAINTAINERS accel/stubs/whpx-stub.c accel/whpx/whpx-accel-ops.c +11 more+270 -230 replies
14/22whpx: add arm64 supportMAINTAINERS accel/whpx/whpx-common.c target/arm/meson.build +2 more+816 -00 replies
15/22whpx: change memory management logicaccel/whpx/whpx-common.c+36 -610 replies
16/22target/arm: cpu: mark WHPX as supporting PSCI 1.3target/arm/cpu.c+3 -00 replies
17/22whpx: arm64: clamp down IPA sizehw/arm/virt.c include/hw/core/boards.h target/arm/whpx/meson.build +3 more+111 -00 replies
18/22hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVFaccel/hvf/hvf-all.c hw/arm/virt.c include/hw/core/boards.h +7 more+33 -710 replies
19/22whpx: arm64: implement -cpu hosttarget/arm/cpu64.c target/arm/whpx/whpx-all.c target/arm/whpx_arm.h+116 -60 replies
20/22target/arm: whpx: instantiate GIC earlytarget/arm/whpx/whpx-all.c+32 -00 replies

Reviews trailers per patch

17 of 20 patches have a Reviewed-by or Acked-by.

PatchRichard HendersonPierrick BouvierAkihiko OdakiPhilippe Mathieu-DaudéPeter Maydell
1/22R-b R-b R-b
2/22R-b R-b R-b
3/22
4/22R-b
5/22
6/22
7/22R-b
8/22R-b
9/22R-b R-b R-b R-b
10/22R-b R-b
11/22R-b R-b
12/22R-b R-b
13/22R-b R-b
14/22R-b
15/22R-b R-b R-b
16/22R-b R-b R-b
17/22R-b
18/22R-b R-b
19/22R-b R-b
20/22R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v22 thread

Cover letter [PATCH v22 00/22] WHPX support for Arm

Link to branch: https://github.com/mediouni-m/qemu whpx (tag for this submission: whpx-v21)

Patches without a review: patches 3, 5, 6, 7

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 for v22:
- Oops, add updated IORT now that the SMMU patches are merged
The revision field in the IORT changed compared to the revision of the SMMU patches the artefact was built on. Ran a make test again in a clean tree to make sure...

in side note: try to make certain that qemu-system-aarch64 is built as part of make test on macOS instead of the unsigned variant only as that might have been why I didn't observe this

Updates for v21:
- Change commit messsage a bit for the ACPI table updates so that it doesn't get parsed as a diff
- Split "qtest: hw/arm: virt: add new test case for GICv3 + GICv2m" into two commits

Updates for v20:
- Rebase on current origin/staging

Updates for v19:
- Address review comments
- Documentation update
- Base on top of the current target-arm queue (https://patchew.org/QEMU/[email protected]/)

Updates for v18:
- MSI-X config patch: remove workaround to keep existing ACPI tables, as even Ubuntu has hibernation support off in their stock kernel...
- Fold patch "whpx: arm64: gicv3: add migration blocker" into "whpx: interrupt controller support"
- address review for "whpx: interrupt controller support"

Updates for v17:
- Reworking the MSI-X configuration patches
- Accordingly, its= retains the same behavior as before, so add a test case for GICv3 + GICv2m.
- Squashing "whpx: arm64: check for physical address width after WHPX availability" with "whpx: arm64: clamp down IPA size"
- Not worthwhile to have a separate GICv3 + GICv2m patch, squash it into the "rework MSI-X configuration" patch
- Address review comment on "whpx: arm64: gicv3: add migration blocker"

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 (20):
qtest: hw/arm: virt: skip ACPI test for IORT with GICv2
hw: arm: virt: rework MSI-X configuration
tests: data: update AArch64 ACPI tables
qtest: hw/arm: virt: add ACPI tables for new GICv3 + GICv2m test case
qtest: hw/arm: virt: add new test case for GICv3 + GICv2m
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: 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: enable arm64 builds
whpx: arm64: add partition-wide reset on the reboot path

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                      |  24 +-
 hw/arm/virt-acpi-build.c                      |  20 +-
 hw/arm/virt.c                                 | 141 ++-
 hw/i386/x86-cpu.c                             |   4 +-
 hw/intc/arm_gicv3_common.c                    |   3 +
 hw/intc/arm_gicv3_whpx.c                      | 237 +++++
 hw/intc/meson.build                           |   1 +
 include/hw/arm/virt.h                         |   5 +-
 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                    | 994 ++++++++++++++++++
 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.msi_gicv2m  | Bin 0 -> 188 bytes
 tests/data/acpi/aarch64/virt/IORT             | Bin 128 -> 84 bytes
 tests/data/acpi/aarch64/virt/IORT.msi_gicv2m  | Bin 0 -> 172 bytes
 tests/data/acpi/aarch64/virt/IORT.smmuv3-dev  | Bin 364 -> 260 bytes
 .../data/acpi/aarch64/virt/IORT.smmuv3-legacy | Bin 276 -> 192 bytes
 tests/qtest/bios-tables-test.c                |  21 +
 47 files changed, 2166 insertions(+), 637 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.h
 create mode 100644 tests/data/acpi/aarch64/virt/APIC.msi_gicv2m
 create mode 100644 tests/data/acpi/aarch64/virt/IORT.msi_gicv2m
Signature · 1 line
2.50.1 (Apple Git-155)