Skip to content

hvf: Implement Apple Silicon Support

Alexander Graf qemu-arm qemu-devel 12 versions – Applied

Status from this message: Applied to target-arm.next, thanks (with the unnecessary #include

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v12 Latest10 patches 16 repliesApplied
  2. v1110 patches 21 repliesSuperseded
  3. v1010 patches 0 repliesSuperseded
Earlier versions · 9
VersionPostedPatchesRepliesStatus
v911 patches13 repliesSuperseded
v819 patches47 repliesSuperseded
v719 patches0 repliesSuperseded
v611 patches29 repliesApplied
v511 patches3 repliesSuperseded
v411 patches13 repliesSuperseded
v310 patches14 repliesSuperseded
v28 patches1 replySuperseded
v18 patches41 repliesSuperseded

Changes in v12 from the cover letter

- Structure SMC/HVC handling code similarly
- Inject UDEF on HVC with SMC conduit
- s/hvf_unknown_hvf/hvf_unknown_hvc/g
- s/hvf_unknown_hvf/hvf_unknown_hvc/g
- Use muldiv64
- Declare ts at start of block
- Improve SPAN comment

Patches in v12 Applied

#Subject and filesSizeRepliesApplied
1/10arm: Move PMC register definitions to internals.htarget/arm/helper.c target/arm/internals.h+44 -440 replies
2/10hvf: Add execute to dirty log permission bitmapaccel/hvf/hvf-accel-ops.c+2 -20 replies
3/10hvf: Introduce hvf_arch_init() callbackaccel/hvf/hvf-accel-ops.c include/sysemu/hvf_int.h target/i386/hvf/hvf.c+8 -10 replies
4/10hvf: Add Apple Silicon supportMAINTAINERS accel/hvf/hvf-accel-ops.c include/sysemu/hvf_int.h +4 more+833 -15 replies
5/10arm/hvf: Add a WFI handleraccel/hvf/hvf-accel-ops.c include/sysemu/hvf_int.h target/arm/hvf/hvf.c+82 -30 replies
6/10hvf: arm: Implement -cpu hosttarget/arm/cpu.c target/arm/cpu.h target/arm/hvf/hvf.c +2 more+125 -62 replies
7/10hvf: arm: Implement PSCI handlingtarget/arm/cpu.c target/arm/hvf/hvf.c target/arm/hvf/trace-events+139 -70 replies
8/10arm: Add Hypervisor.framework build targetmeson.build target/arm/hvf/meson.build target/arm/meson.build+12 -00 replies
9/10hvf: arm: Add rudimentary PMC supporttarget/arm/hvf/hvf.c+179 -00 replies
10/10arm: tcg: Adhere to SMCCC 1.3 section 5.2target/arm/psci.c+6 -291 reply

Reviews trailers per patch

All 10 patches have a Reviewed-by or Acked-by.

PatchRoman BolshakovSergio LopezPeter Maydell
1/10R-b
2/10R-b
3/10R-b
4/10R-b R-b R-b
5/10A-b R-b
6/10A-b R-b R-b
7/10R-b R-b
8/10R-b T-b R-b R-b
9/10R-b
10/10R-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 3 reviewers.

Read the v12 thread

Cover letter [PATCH v12 00/10] hvf: Implement Apple Silicon Support

Now that Apple Silicon is widely available, people are obviously excited to try and run virtualized workloads on them, such as Linux and Windows.

This patch set implements a fully functional version to get the ball going on that. With this applied, I can successfully run both Linux and Windows as guests. I am not aware of any limitations specific to Hypervisor.framework apart from:

- gdbstub debugging (breakpoints)
- missing GICv3 support
- Windows will not work due to UDEF SMC implementation

To use hvf support, please make sure to run -M virt,highmem=off to fit in M1's physical address space limits and use -cpu host.

Enjoy!

Alex

v1 -> v2:

- New patch: hvf: Actually set SIG_IPI mask
- New patch: hvf: Introduce hvf vcpu struct
- New patch: hvf: arm: Mark CPU as dirty on reset
- Removed patch: hw/arm/virt: Disable highmem when on hypervisor.framework
- Removed patch: arm: Synchronize CPU on PSCI on
- Fix build on 32bit arm
- Merge vcpu kick function patch into ARM enablement
- Implement WFI handling (allows vCPUs to sleep)
- Synchronize system registers (fixes OVMF crashes and reboot)
- Don't always call cpu_synchronize_state()
- Use more fine grained iothread locking
- Populate aa64mmfr0 from hardware
- Make safe to ctrl-C entitlement application

v2 -> v3:

- Removed patch: hvf: Actually set SIG_IPI mask
- New patch: hvf: arm: Add support for GICv3
- New patch: hvf: arm: Implement -cpu host
- Advance PC on SMC
- Use cp list interface for sysreg syncs
- Do not set current_cpu
- Fix sysreg isread mask
- Move sysreg handling to functions
- Remove WFI logic again
- Revert to global iothread locking

v3 -> v4:

- Removed patch: hvf: arm: Mark CPU as dirty on reset
- New patch: hvf: Simplify post reset/init/loadvm hooks
- Remove i386-softmmu target (meson.build for hvf target)
- Combine both if statements (PSCI)
- Use hv.h instead of Hypervisor.h for 10.15 compat
- Remove manual inclusion of Hypervisor.h in common .c files
- No longer include Hypervisor.h in arm hvf .c files
- Remove unused exe_full variable
- Reuse exe_name variable

v4 -> v5:

- Use g_free() on destroy

v5 -> v6:

- Switch SYSREG() macro order to the same as asm intrinsics

v6 -> v7:

- Already merged: hvf: Add hypervisor entitlement to output binaries
- Already merged: hvf: x86: Remove unused definitions
- Patch split: hvf: Move common code out

    -> hvf: Move assert_hvf_ok() into common directory
    -> hvf: Move vcpu thread functions into common directory
    -> hvf: Move cpu functions into common directory
    -> hvf: Move hvf internal definitions into common header
    -> hvf: Make hvf_set_phys_mem() static
    -> hvf: Remove use of hv_uvaddr_t and hv_gpaddr_t
    -> hvf: Split out common code on vcpu init and destroy
    -> hvf: Use cpu_synchronize_state()
    -> hvf: Make synchronize functions static
    -> hvf: Remove hvf-accel-ops.h

- New patch: hvf: arm: Implement PSCI handling
- New patch: arm: Enable Windows 10 trusted SMCCC boot call
- New patch: hvf: arm: Handle Windows 10 SMC call
- Removed patch: "arm: Set PSCI to 0.2 for HVF" (included above)
- Removed patch: "hvf: arm: Add support for GICv3" (deferred to later)
- Remove osdep.h include from hvf_int.h
- Synchronize SIMD registers as well
- Prepend 0x for hex values
- Convert DPRINTF to trace points
- Use main event loop (fixes gdbstub issues)
- Remove PSCI support, inject UDEF on HVC/SMC
- Change vtimer logic to look at ctl.istatus for vtimer mask sync
- Add kick callback again (fixes remote CPU notification)
- Move function define to own header
- Do not propagate SVE features for HVF
- Remove stray whitespace change
- Verify that EL0 and EL1 do not allow AArch32 mode
- Only probe host CPU features once
- Move WFI into function
- Improve comment wording
- Simplify HVF matching logic in meson build file

v7 -> v8:

- checkpatch fixes
- Do not advance for HVC, PC is already updated by hvf (fixes Linux boot)

v8 -> v9:

- [Merged] hvf: Move assert_hvf_ok() into common directory
- [Merged] hvf: Move vcpu thread functions into common directory
- [Merged] hvf: Move cpu functions into common directory
- [Merged] hvf: Move hvf internal definitions into common header
- [Merged] hvf: Make hvf_set_phys_mem() static
- [Merged] hvf: Remove use of hv_uvaddr_t and hv_gpaddr_t
- [Merged] hvf: Split out common code on vcpu init and destroy
- [Merged] hvf: Use cpu_synchronize_state()
- [Merged] hvf: Make synchronize functions static
- [Merged] hvf: Remove hvf-accel-ops.h
- [Merged] hvf: Introduce hvf vcpu struct
- [Merged] hvf: Simplify post reset/init/loadvm hooks
- [Dropped] arm: Enable Windows 10 trusted SMCCC boot call
- [Dropped] hvf: arm: Handle Windows 10 SMC call
- [New] arm: Move PMC register definitions to cpu.h
- [New] hvf: Add execute to dirty log permission bitmap
- [New] hvf: Introduce hvf_arch_init() callback
- [New] hvf: arm: Implement PSCI handling
- [New] hvf: arm: Add rudimentary PMC support
- [New] arm: tcg: Adhere to SMCCC 1.3 section 5.2
- [New] hvf: arm: Adhere to SMCCC 1.3 section 5.2
- Make kick function non-weak
- Use arm_cpu_do_interrupt()
- Remove CNTPCT_EL0 write case
- Inject UDEF on invalid sysreg access
- Add support for OS locking sysregs
- Remove PMCCNTR_EL0 handling
- Print PC on unhandled sysreg trace
- Sync SP (x31) based on SP_EL0/SP_EL1
- Fix SPSR_EL1 mapping
- Only sync known sysregs, assert when syncing fails
- Improve error message on unhandled ec
- Move vtimer sync to post-exit (fixes disable corner case from kvm-unit-tests)
- Add vtimer offset, migration and pause logic
- Flush registers only after EXCP checkers (fixes PSCI on race)
- Remove Windows specifics and just comply with SMCCC spec
- Zero-initialize host_isar
- Use M1 SCTLR reset value
- Add support for cntv offsets
- Improve code readability
- Use new hvf_raise_exception() prototype
- Make cpu_off function void
- Add comment about return value, use -1 for "not found"
- Remove cpu_synchronize_state() when halted

v9 -> v10:

- [Dropped] hvf: arm: Adhere to SMCCC 1.3 section 5.2
- Only handle PSCI calls for the current conduit
- Return true/false
- Return -1 in x0 on unknown SMC/HVC calls
- Move to target/arm/internals.h
- Fail -cpu host class creation gracefully
- Adjust error message on -cpu host realize failure
- Extend SCTLR comment that hvf returns 0 as default value
- Return true/false
- Report errors lazily
- Fix comment

v10 -> v11:

- Treat SMC as UDEF. A follow-up patch set will try to change behavior consistently in TCG as well as HVF.

v11 -> v12:

- Structure SMC/HVC handling code similarly
- Inject UDEF on HVC with SMC conduit
- s/hvf_unknown_hvf/hvf_unknown_hvc/g
- s/hvf_unknown_hvf/hvf_unknown_hvc/g
- Use muldiv64
- Declare ts at start of block
- Improve SPAN comment

Alexander Graf (9):
arm: Move PMC register definitions to internals.h
hvf: Add execute to dirty log permission bitmap
hvf: Introduce hvf_arch_init() callback
hvf: Add Apple Silicon support
hvf: arm: Implement -cpu host
hvf: arm: Implement PSCI handling
arm: Add Hypervisor.framework build target
hvf: arm: Add rudimentary PMC support
arm: tcg: Adhere to SMCCC 1.3 section 5.2

Peter Collingbourne (1):
arm/hvf: Add a WFI handler

 MAINTAINERS                 |    5 +
 accel/hvf/hvf-accel-ops.c   |   21 +-
 include/sysemu/hvf_int.h    |   12 +-
 meson.build                 |    8 +
 target/arm/cpu.c            |   17 +-
 target/arm/cpu.h            |    2 +
 target/arm/helper.c         |   44 --
 target/arm/hvf/hvf.c        | 1274 +++++++++++++++++++++++++++++++++++
 target/arm/hvf/meson.build  |    3 +
 target/arm/hvf/trace-events |   11 +
 target/arm/hvf_arm.h        |   19 +
 target/arm/internals.h      |   44 ++
 target/arm/kvm_arm.h        |    2 -
 target/arm/meson.build      |    2 +
 target/arm/psci.c           |   35 +-
 target/i386/hvf/hvf.c       |   10 +
 16 files changed, 1421 insertions(+), 88 deletions(-)
 create mode 100644 target/arm/hvf/hvf.c
 create mode 100644 target/arm/hvf/meson.build
 create mode 100644 target/arm/hvf/trace-events
 create mode 100644 target/arm/hvf_arm.h
Signature · 1 line
2.30.1 (Apple Git-130)