Skip to contentSkip to conversation

hvf: Implement Apple Silicon Support

PATCH Superseded Alexander Graf 4 participants 25 messages Sep 12, 2021 – Sep 15, 2021 Arm/Amlogic Meson SoC support

v9 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v9 cover 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

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

Alexander Graf (10):
arm: Move PMC register definitions to cpu.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
hvf: arm: 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            |   13 +-
 target/arm/cpu.h            |   46 ++
 target/arm/helper.c         |   44 --
 target/arm/hvf/hvf.c        | 1246 +++++++++++++++++++++++++++++++++++
 target/arm/hvf/meson.build  |    3 +
 target/arm/hvf/trace-events |   11 +
 target/arm/hvf_arm.h        |   19 +
 target/arm/kvm_arm.h        |    2 -
 target/arm/meson.build      |    2 +
 target/arm/psci.c           |   26 +-
 target/i386/hvf/hvf.c       |   10 +
 15 files changed, 1387 insertions(+), 81 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)
#1 lore raw

PATCH v9 1/11 arm: Move PMC register definitions to cpu.h

We will need PMC register definitions in accel specific code later. Move all constant definitions to common arm headers so we can reuse them.

---
 target/arm/cpu.h    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 target/arm/helper.c | 44 --------------------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)
target/arm/cpu.h +44 -0
index 6a987f65e4..6d60b64c15 100644
@@ -1550,6 +1550,50 @@ static inline void xpsr_write(CPUARMState *env, uint32_t val, uint32_t mask)
 #define HSTR_TTEE (1 << 16)
 #define HSTR_TJDBX (1 << 17)
 
+/* Definitions for the PMU registers */
+#define PMCRN_MASK  0xf800
+#define PMCRN_SHIFT 11
+#define PMCRLC  0x40
+#define PMCRDP  0x20
+#define PMCRX   0x10
+#define PMCRD   0x8
+#define PMCRC   0x4
+#define PMCRP   0x2
+#define PMCRE   0x1
+/*
+ * Mask of PMCR bits writeable by guest (not including WO bits like C, P,
+ * which can be written as 1 to trigger behaviour but which stay RAZ).
+ */
+#define PMCR_WRITEABLE_MASK (PMCRLC | PMCRDP | PMCRX | PMCRD | PMCRE)
+
+#define PMXEVTYPER_P          0x80000000
+#define PMXEVTYPER_U          0x40000000
+#define PMXEVTYPER_NSK        0x20000000
+#define PMXEVTYPER_NSU        0x10000000
+#define PMXEVTYPER_NSH        0x08000000
+#define PMXEVTYPER_M          0x04000000
+#define PMXEVTYPER_MT         0x02000000
+#define PMXEVTYPER_EVTCOUNT   0x0000ffff
+#define PMXEVTYPER_MASK       (PMXEVTYPER_P | PMXEVTYPER_U | PMXEVTYPER_NSK | \
+                               PMXEVTYPER_NSU | PMXEVTYPER_NSH | \
+                               PMXEVTYPER_M | PMXEVTYPER_MT | \
+                               PMXEVTYPER_EVTCOUNT)
+
+#define PMCCFILTR             0xf8000000
+#define PMCCFILTR_M           PMXEVTYPER_M
+#define PMCCFILTR_EL0         (PMCCFILTR | PMCCFILTR_M)
+
+static inline uint32_t pmu_num_counters(CPUARMState *env)
+{
+  return (env->cp15.c9_pmcr & PMCRN_MASK) >> PMCRN_SHIFT;
+}
+
+/* Bits allowed to be set/cleared for PMCNTEN* and PMINTEN* */
+static inline uint64_t pmu_counter_mask(CPUARMState *env)
+{
+  return (1 << 31) | ((1 << pmu_num_counters(env)) - 1);
+}
+
 /* Return the current FPSCR value.  */
 uint32_t vfp_get_fpscr(CPUARMState *env);
 void vfp_set_fpscr(CPUARMState *env, uint32_t val);
target/arm/helper.c +0 -44

50 lines not on this page · raw message

Signature · 1 line
2.30.1 (Apple Git-130)
#2 lore raw

Re: [PATCH v9 01/11] arm: Move PMC register definitions to cpu.h

Quoted 10 lines · Alexander Graf

We will need PMC register definitions in accel specific code later. Move all constant definitions to common arm headers so we can reuse them.

---
 target/arm/cpu.h    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 target/arm/helper.c | 44 --------------------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

Do these need to be in cpu.h, or would target/arm/internals.h be good enough? (Lots of files all over the codebase include cpu.h, so if the only users of these defines and functions are in target/arm, internals.h is better.)

-- PMM

#3 lore raw

PATCH v9 2/11 hvf: Add execute to dirty log permission bitmap

In reply to Alexander Graf

Hvf's permission bitmap during and after dirty logging does not include the HV_MEMORY_EXEC permission. At least on Apple Silicon, this leads to instruction faults once dirty logging was enabled.

Add the bit to make it work properly.

---
 accel/hvf/hvf-accel-ops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
accel/hvf/hvf-accel-ops.c +2 -2
index d1691be989..71cc2fa70f 100644
@@ -239,12 +239,12 @@ static void hvf_set_dirty_tracking(MemoryRegionSection *section, bool on)
     if (on) {
         slot->flags |= HVF_SLOT_LOG;
         hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
-                      HV_MEMORY_READ);
+                      HV_MEMORY_READ | HV_MEMORY_EXEC);
     /* stop tracking region*/
     } else {
         slot->flags &= ~HVF_SLOT_LOG;
         hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
-                      HV_MEMORY_READ | HV_MEMORY_WRITE);
+                      HV_MEMORY_READ | HV_MEMORY_WRITE | HV_MEMORY_EXEC);
     }
 }
 
Signature · 1 line
2.30.1 (Apple Git-130)
#4 lore raw

PATCH v9 3/11 hvf: Introduce hvf_arch_init() callback

In reply to Alexander Graf

We will need to install a migration helper for the ARM hvf backend. Let's introduce an arch callback for the overall hvf init chain to do so.

---
 accel/hvf/hvf-accel-ops.c | 3 ++-
 include/sysemu/hvf_int.h  | 1 +
 target/i386/hvf/hvf.c     | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
accel/hvf/hvf-accel-ops.c +2 -1
index 71cc2fa70f..65d431868f 100644
@@ -324,7 +324,8 @@ static int hvf_accel_init(MachineState *ms)
 
     hvf_state = s;
     memory_listener_register(&hvf_memory_listener, &address_space_memory);
-    return 0;
+
+    return hvf_arch_init();
 }
 
 static void hvf_accel_class_init(ObjectClass *oc, void *data)
include/sysemu/hvf_int.h +1 -0
index 8b66a4e7d0..0466106d16 100644
@@ -48,6 +48,7 @@ struct hvf_vcpu_state {
 };
 
 void assert_hvf_ok(hv_return_t ret);
+int hvf_arch_init(void);
 int hvf_arch_init_vcpu(CPUState *cpu);
 void hvf_arch_vcpu_destroy(CPUState *cpu);
 int hvf_vcpu_exec(CPUState *);
target/i386/hvf/hvf.c +5 -0
index 79ba4ed93a..abef24a9c8 100644
@@ -206,6 +206,11 @@ static inline bool apic_bus_freq_is_known(CPUX86State *env)
     return env->apic_bus_freq != 0;
 }
 
+int hvf_arch_init(void)
+{
+    return 0;
+}
+
 int hvf_arch_init_vcpu(CPUState *cpu)
 {
     X86CPU *x86cpu = X86_CPU(cpu);
Signature · 1 line
2.30.1 (Apple Git-130)
#5 lore raw

PATCH v9 4/11 hvf: Add Apple Silicon support

In reply to Alexander Graf

With Apple Silicon available to the masses, it's a good time to add support for driving its virtualization extensions from QEMU.

This patch adds all necessary architecture specific code to get basic VMs working. It's still pretty raw, but definitely functional.

Known limitations:

- Vtimer acknowledgement is hacky
- Should implement more sysregs and fault on invalid ones then
- WFI handling is missing, need to marry it with vtimer

---

v1 -> v2:

- Merge vcpu kick function patch
- 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

v2 -> v3:

- 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
- Use Hypervisor.h on arm, hv.h does not contain aarch64 definitions

v3 -> v4:

- No longer include Hypervisor.h

v5 -> v6:

- Swap sysreg definition order. This way we're in line with asm outputs.

v6 -> v7:

- 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)

v7 -> v8:

- Fix checkpatch errors

v8 -> v9:

- 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)

---
 MAINTAINERS                 |   5 +
 accel/hvf/hvf-accel-ops.c   |   9 +
 include/sysemu/hvf_int.h    |  10 +-
 meson.build                 |   1 +
 target/arm/hvf/hvf.c        | 793 ++++++++++++++++++++++++++++++++++++
 target/arm/hvf/trace-events |  10 +
 target/i386/hvf/hvf.c       |   5 +
 7 files changed, 832 insertions(+), 1 deletion(-)
 create mode 100644 target/arm/hvf/hvf.c
 create mode 100644 target/arm/hvf/trace-events
MAINTAINERS +5 -0
index 6c20634d63..d7915ec128 100644
@@ -433,6 +433,11 @@ F: accel/accel-*.c
 F: accel/Makefile.objs
 F: accel/stubs/Makefile.objs
 
+Apple Silicon HVF CPUs
+M: Alexander Graf <[email protected]>
+S: Maintained
+F: target/arm/hvf/
+
 X86 HVF CPUs
 M: Cameron Esfahani <[email protected]>
 M: Roman Bolshakov <[email protected]>
accel/hvf/hvf-accel-ops.c +9 -0
index 65d431868f..4f75927a8e 100644
@@ -60,6 +60,10 @@
 
 HVFState *hvf_state;
 
+#ifdef __aarch64__
+#define HV_VM_DEFAULT NULL
+#endif
+
 /* Memory slots */
 
 hvf_slot *hvf_find_overlap_slot(uint64_t start, uint64_t size)
@@ -376,7 +380,11 @@ static int hvf_init_vcpu(CPUState *cpu)
     pthread_sigmask(SIG_BLOCK, NULL, &set);
     sigdelset(&set, SIG_IPI);
 
+#ifdef __aarch64__
+    r = hv_vcpu_create(&cpu->hvf->fd, (hv_vcpu_exit_t **)&cpu->hvf->exit, NULL);
+#else
     r = hv_vcpu_create((hv_vcpuid_t *)&cpu->hvf->fd, HV_VCPU_DEFAULT);
+#endif
     cpu->vcpu_dirty = 1;
     assert_hvf_ok(r);
 
@@ -452,6 +460,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, void *data)
     AccelOpsClass *ops = ACCEL_OPS_CLASS(oc);
 
     ops->create_vcpu_thread = hvf_start_vcpu_thread;
+    ops->kick_vcpu_thread = hvf_kick_vcpu_thread;
 
     ops->synchronize_post_reset = hvf_cpu_synchronize_post_reset;
     ops->synchronize_post_init = hvf_cpu_synchronize_post_init;
include/sysemu/hvf_int.h +9 -1
index 0466106d16..7c245c7b11 100644
@@ -11,7 +11,11 @@
 #ifndef HVF_INT_H
 #define HVF_INT_H
 
+#ifdef __aarch64__
+#include <Hypervisor/Hypervisor.h>
+#else
 #include <Hypervisor/hv.h>
+#endif
 
 /* hvf_slot flags */
 #define HVF_SLOT_LOG (1 << 0)
@@ -40,11 +44,14 @@ struct HVFState {
     int num_slots;
 
     hvf_vcpu_caps *hvf_caps;
+    uint64_t vtimer_offset;
 };
 extern HVFState *hvf_state;
 
 struct hvf_vcpu_state {
-    int fd;
+    uint64_t fd;
+    void *exit;
+    bool vtimer_masked;
 };
 
 void assert_hvf_ok(hv_return_t ret);
@@ -55,5 +62,6 @@ int hvf_vcpu_exec(CPUState *);
 hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t);
 int hvf_put_registers(CPUState *);
 int hvf_get_registers(CPUState *);
+void hvf_kick_vcpu_thread(CPUState *cpu);
 
 #endif
meson.build +1 -0
index 9a64d16943..a3e9b95846 100644
@@ -2169,6 +2169,7 @@ if have_system or have_user
     'accel/tcg',
     'hw/core',
     'target/arm',
+    'target/arm/hvf',
     'target/hppa',
     'target/i386',
     'target/i386/kvm',
target/arm/hvf/hvf.c new file +793 -0

793 lines not on this page · raw message

target/arm/hvf/trace-events new file +10 -0
new file mode 100644
index 0000000000..e972bdd9ce
@@ -0,0 +1,10 @@
+hvf_unhandled_sysreg_read(uint64_t pc, uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, uint32_t crm, uint32_t op2) "unhandled sysreg read at pc=0x%"PRIx64": 0x%08x (op0=%d op1=%d crn=%d crm=%d op2=%d)"
+hvf_unhandled_sysreg_write(uint64_t pc, uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, uint32_t crm, uint32_t op2) "unhandled sysreg write at pc=0x%"PRIx64": 0x%08x (op0=%d op1=%d crn=%d crm=%d op2=%d)"
+hvf_inject_fiq(void) "injecting FIQ"
+hvf_inject_irq(void) "injecting IRQ"
+hvf_data_abort(uint64_t pc, uint64_t va, uint64_t pa, bool isv, bool iswrite, bool s1ptw, uint32_t len, uint32_t srt) "data abort: [pc=0x%"PRIx64" va=0x%016"PRIx64" pa=0x%016"PRIx64" isv=%d iswrite=%d s1ptw=%d len=%d srt=%d]"
+hvf_sysreg_read(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, uint32_t crm, uint32_t op2, uint64_t val) "sysreg read 0x%08x (op0=%d op1=%d crn=%d crm=%d op2=%d) = 0x%016"PRIx64
+hvf_sysreg_write(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, uint32_t crm, uint32_t op2, uint64_t val) "sysreg write 0x%08x (op0=%d op1=%d crn=%d crm=%d op2=%d, val=0x%016"PRIx64")"
+hvf_unknown_hvf(uint64_t x0) "unknown HVC! 0x%016"PRIx64
+hvf_unknown_smc(uint64_t x0) "unknown SMC! 0x%016"PRIx64
+hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "exit: 0x%"PRIx64" [ec=0x%x pc=0x%"PRIx64"]"
target/i386/hvf/hvf.c +5 -0
index abef24a9c8..33a4e74980 100644
@@ -206,6 +206,11 @@ static inline bool apic_bus_freq_is_known(CPUX86State *env)
     return env->apic_bus_freq != 0;
 }
 
+void hvf_kick_vcpu_thread(CPUState *cpu)
+{
+    cpus_kick_thread(cpu);
+}
+
 int hvf_arch_init(void)
 {
     return 0;
Signature · 1 line
2.30.1 (Apple Git-130)
#6 lore raw

PATCH v9 5/11 arm/hvf: Add a WFI handler

In reply to Alexander Graf

From: Peter Collingbourne <[email protected]>

Sleep on WFI until the VTIMER is due but allow ourselves to be woken up on IPI.

In this implementation IPI is blocked on the CPU thread at startup and pselect() is used to atomically unblock the signal and begin sleeping. The signal is sent unconditionally so there's no need to worry about races between actually sleeping and the "we think we're sleeping" state. It may lead to an extra wakeup but that's better than missing it entirely.

[agraf: Remove unused 'set' variable, always advance PC on WFX trap,
support vm stop / continue operations and cntv offsets]

---

v6 -> v7:

- Move WFI into function
- Improve comment wording

v8 -> v9:

- Add support for cntv offsets
- Improve code readability

---
 accel/hvf/hvf-accel-ops.c |  5 ++-
 include/sysemu/hvf_int.h  |  1 +
 target/arm/hvf/hvf.c      | 76 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 3 deletions(-)
accel/hvf/hvf-accel-ops.c +2 -3
index 4f75927a8e..93976f4ece 100644
@@ -370,15 +370,14 @@ static int hvf_init_vcpu(CPUState *cpu)
     cpu->hvf = g_malloc0(sizeof(*cpu->hvf));
 
     /* init cpu signals */
-    sigset_t set;
     struct sigaction sigact;
 
     memset(&sigact, 0, sizeof(sigact));
     sigact.sa_handler = dummy_signal;
     sigaction(SIG_IPI, &sigact, NULL);
 
-    pthread_sigmask(SIG_BLOCK, NULL, &set);
-    sigdelset(&set, SIG_IPI);
+    pthread_sigmask(SIG_BLOCK, NULL, &cpu->hvf->unblock_ipi_mask);
+    sigdelset(&cpu->hvf->unblock_ipi_mask, SIG_IPI);
 
 #ifdef __aarch64__
     r = hv_vcpu_create(&cpu->hvf->fd, (hv_vcpu_exit_t **)&cpu->hvf->exit, NULL);
include/sysemu/hvf_int.h +1 -0
index 7c245c7b11..6545f7cd61 100644
@@ -52,6 +52,7 @@ struct hvf_vcpu_state {
     uint64_t fd;
     void *exit;
     bool vtimer_masked;
+    sigset_t unblock_ipi_mask;
 };
 
 void assert_hvf_ok(hv_return_t ret);
target/arm/hvf/hvf.c +76 -0

100 lines not on this page · raw message

Signature · 1 line
2.30.1 (Apple Git-130)
#7 lore raw

PATCH v9 6/11 hvf: arm: Implement -cpu host

In reply to Alexander Graf

Now that we have working system register sync, we push more target CPU properties into the virtual machine. That might be useful in some situations, but is not the typical case that users want.

So let's add a -cpu host option that allows them to explicitly pass all CPU capabilities of their host CPU into the guest.

---

v6 -> v7:

- 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

v8 -> v9:

- Zero-initialize host_isar
- Use M1 SCTLR reset value

---
 target/arm/cpu.c     |  9 ++++--
 target/arm/cpu.h     |  2 ++
 target/arm/hvf/hvf.c | 76 ++++++++++++++++++++++++++++++++++++++++++++
 target/arm/hvf_arm.h | 19 +++++++++++
 target/arm/kvm_arm.h |  2 --
 5 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 target/arm/hvf_arm.h
target/arm/cpu.c +7 -2
index d631c4683c..551b15243d 100644
@@ -39,6 +39,7 @@
 #include "sysemu/tcg.h"
 #include "sysemu/hw_accel.h"
 #include "kvm_arm.h"
+#include "hvf_arm.h"
 #include "disas/capstone.h"
 #include "fpu/softfloat.h"
 
@@ -2058,15 +2059,19 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
 #endif /* CONFIG_TCG */
 }
 
-#ifdef CONFIG_KVM
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
 static void arm_host_initfn(Object *obj)
 {
     ARMCPU *cpu = ARM_CPU(obj);
 
+#ifdef CONFIG_KVM
     kvm_arm_set_cpu_features_from_host(cpu);
     if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
         aarch64_add_sve_properties(obj);
     }
+#else
+    hvf_arm_set_cpu_features_from_host(cpu);
+#endif
     arm_cpu_post_init(obj);
 }
 
@@ -2126,7 +2131,7 @@ static void arm_cpu_register_types(void)
 {
     type_register_static(&arm_cpu_type_info);
 
-#ifdef CONFIG_KVM
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
     type_register_static(&host_arm_cpu_type_info);
 #endif
 }
target/arm/cpu.h +2 -0
index 6d60b64c15..fa9ccafdff 100644
@@ -3060,6 +3060,8 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync);
 #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX)
 #define CPU_RESOLVING_TYPE TYPE_ARM_CPU
 
+#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU
+
 #define cpu_signal_handler cpu_arm_signal_handler
 #define cpu_list arm_cpu_list
 
target/arm/hvf/hvf.c +76 -0

94 lines not on this page · raw message

target/arm/hvf_arm.h new file +19 -0
new file mode 100644
index 0000000000..603074a331
@@ -0,0 +1,19 @@
+/*
+ * QEMU Hypervisor.framework (HVF) support -- ARM specifics
+ *
+ * Copyright (c) 2021 Alexander Graf
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_HVF_ARM_H
+#define QEMU_HVF_ARM_H
+
+#include "qemu/accel.h"
+#include "cpu.h"
+
+void hvf_arm_set_cpu_features_from_host(struct ARMCPU *cpu);
+
+#endif
target/arm/kvm_arm.h +0 -2
index 34f8daa377..828dca4a4a 100644
@@ -214,8 +214,6 @@ bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try,
  */
 void kvm_arm_destroy_scratch_host_vcpu(int *fdarray);
 
-#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU
-
 /**
  * ARMHostCPUFeatures: information about the host CPU (identified
  * by asking the host kernel)
Signature · 1 line
2.30.1 (Apple Git-130)
#8 lore raw

Re: [PATCH v9 06/11] hvf: arm: Implement -cpu host

Quoted 30 lines · Alexander Graf

Now that we have working system register sync, we push more target CPU properties into the virtual machine. That might be useful in some situations, but is not the typical case that users want.

So let's add a -cpu host option that allows them to explicitly pass all CPU capabilities of their host CPU into the guest.

---
 target/arm/cpu.c     |  9 ++++--
 target/arm/cpu.h     |  2 ++
 target/arm/hvf/hvf.c | 76 ++++++++++++++++++++++++++++++++++++++++++++
 target/arm/hvf_arm.h | 19 +++++++++++
 target/arm/kvm_arm.h |  2 --
 5 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 target/arm/hvf_arm.h
target/arm/cpu.c +1 -1
@@ -2058,15 +2059,19 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
 #endif /* CONFIG_TCG */
 }
 
-#ifdef CONFIG_KVM
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
 static void arm_host_initfn(Object *obj)
 {

target/arm/cpu.c static void arm_cpu_class_init(ObjectClass *oc, void *data) · line 2074

Quoted 10 lines
target/arm/cpu.c +4 -0
     ARMCPU *cpu = ARM_CPU(obj);
 
+#ifdef CONFIG_KVM
     kvm_arm_set_cpu_features_from_host(cpu);
     if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
         aarch64_add_sve_properties(obj);
     }
+#else
+    hvf_arm_set_cpu_features_from_host(cpu);
+#endif

Could be cleaner as ARMCPUClass::set_cpu_features_from_host()?

#9 lore raw

PATCH v9 7/11 hvf: arm: Implement PSCI handling

In reply to Alexander Graf

We need to handle PSCI calls. Most of the TCG code works for us, but we can simplify it to only handle aa64 mode and we need to handle SUSPEND differently.

This patch takes the TCG code as template and duplicates it in HVF.

To tell the guest that we support PSCI 0.2 now, update the check in arm_cpu_initfn() as well.

---

v6 -> v7:

- This patch integrates "arm: Set PSCI to 0.2 for HVF"

v7 -> v8:

- Do not advance for HVC, PC is already updated by hvf
- Fix checkpatch error

v8 -> v9:

- 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

---
 target/arm/cpu.c            |   4 +-
 target/arm/hvf/hvf.c        | 127 ++++++++++++++++++++++++++++++++++--
 target/arm/hvf/trace-events |   1 +
 3 files changed, 126 insertions(+), 6 deletions(-)
target/arm/cpu.c +2 -2
index 551b15243d..c111b2ee32 100644
@@ -1093,8 +1093,8 @@ static void arm_cpu_initfn(Object *obj)
     cpu->psci_version = 1; /* By default assume PSCI v0.1 */
     cpu->kvm_target = QEMU_KVM_ARM_TARGET_NONE;
 
-    if (tcg_enabled()) {
-        cpu->psci_version = 2; /* TCG implements PSCI 0.2 */
+    if (tcg_enabled() || hvf_enabled()) {
+        cpu->psci_version = 2; /* TCG and HVF implement PSCI 0.2 */
     }
 }
 
target/arm/hvf/hvf.c +123 -4

154 lines not on this page · raw message

target/arm/hvf/trace-events +1 -0
index e972bdd9ce..cf4fb68f79 100644
@@ -8,3 +8,4 @@ hvf_sysreg_write(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, uint32_
 hvf_unknown_hvf(uint64_t x0) "unknown HVC! 0x%016"PRIx64
 hvf_unknown_smc(uint64_t x0) "unknown SMC! 0x%016"PRIx64
 hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "exit: 0x%"PRIx64" [ec=0x%x pc=0x%"PRIx64"]"
+hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t cpuid) "PSCI Call x0=0x%016"PRIx64" x1=0x%016"PRIx64" x2=0x%016"PRIx64" x3=0x%016"PRIx64" cpu=0x%x"
Signature · 1 line
2.30.1 (Apple Git-130)
#10 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 30 lines · Alexander Graf

We need to handle PSCI calls. Most of the TCG code works for us, but we can simplify it to only handle aa64 mode and we need to handle SUSPEND differently.

This patch takes the TCG code as template and duplicates it in HVF.

To tell the guest that we support PSCI 0.2 now, update the check in arm_cpu_initfn() as well.

---

v6 -> v7:

- This patch integrates "arm: Set PSCI to 0.2 for HVF"

v7 -> v8:

- Do not advance for HVC, PC is already updated by hvf
- Fix checkpatch error

v8 -> v9:

- 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

Quoted 5 lines
---
 target/arm/cpu.c            |   4 +-
 target/arm/hvf/hvf.c        | 127 ++++++++++++++++++++++++++++++++++--
 target/arm/hvf/trace-events |   1 +
 3 files changed, 126 insertions(+), 6 deletions(-)

Something in here should be checking whether the insn the guest used matches the PSCI conduit configured for the VM, ie what arm_is_psci_call() does after your patch 10.

-- PMM

#11 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 35 lines · Peter Maydell
Quoted 29 lines · Alexander Graf

We need to handle PSCI calls. Most of the TCG code works for us, but we can simplify it to only handle aa64 mode and we need to handle SUSPEND differently.

This patch takes the TCG code as template and duplicates it in HVF.

To tell the guest that we support PSCI 0.2 now, update the check in arm_cpu_initfn() as well.

---

v6 -> v7:

- This patch integrates "arm: Set PSCI to 0.2 for HVF"

v7 -> v8:

- Do not advance for HVC, PC is already updated by hvf
- Fix checkpatch error

v8 -> v9:

- 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

Quoted 5 lines
---
 target/arm/cpu.c            |   4 +-
 target/arm/hvf/hvf.c        | 127 ++++++++++++++++++++++++++++++++++--
 target/arm/hvf/trace-events |   1 +
 3 files changed, 126 insertions(+), 6 deletions(-)
Quoted 3 lines

Something in here should be checking whether the insn the guest used matches the PSCI conduit configured for the VM, ie what arm_is_psci_call() does after your patch 10.

It's yet another case where I believe we are both reading the spec differently :)

  https://documentation-service.arm.com/static/6013e5faeee5236980d08619

Section 2.5.3 speaks about the conduits. It says

    Service calls are expected to be invoked through SMC instructions, except
    for Standard Hypervisor Calls and Vendor Specific Hypervisor Calls. On some platforms, however, SMC instructions are not available, and the services can be accessed through HVC instructions. The method that is used to invoke the service is referred to as the conduit.

To me, that reads like "Use SMC whenever you can. If your hardware does not give you a way to handle SMC calls, falling back to HVC is ok. In that case, indicate that mandate to the OS".

In hvf, we can very easily trap for SMC calls and handle them. Why are we making OSs implement HVC call paths when SMC would work just as well for everyone?

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

IMHO the best way to resolve all of this mess is to consolidate to SMC as default PSCI handler and for now treat HVC as if it was an SMC call as well for virtual environments. Once we get nested virtualization, we will need to move to SMC as default anyway.

Alex

[1]
https://git.qemu.org/?p=qemu.git;a=blob;f=target/arm/op_helper.c;hb=HEAD#l813
[2]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/kvm/handle_exit.c#n52

#12 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 22 lines · Alexander Graf
Quoted 3 lines · Peter Maydell

Something in here should be checking whether the insn the guest used matches the PSCI conduit configured for the VM, ie what arm_is_psci_call() does after your patch 10.

It's yet another case where I believe we are both reading the spec differently :)

https://documentation-service.arm.com/static/6013e5faeee5236980d08619

Section 2.5.3 speaks about the conduits. It says

Service calls are expected to be invoked through SMC instructions,
except
for Standard Hypervisor Calls and Vendor Specific Hypervisor Calls. On some platforms, however, SMC instructions are not available, and the services can be accessed through HVC instructions. The method that is used to invoke the service is referred to as the conduit.

Quoted 3 lines

To me, that reads like "Use SMC whenever you can. If your hardware does not give you a way to handle SMC calls, falling back to HVC is ok. In that case, indicate that mandate to the OS".

QEMU here is being the platform, so we define what the conduit is (or if one even exists). For the virt board this is "if the guest has EL3 firmware, then the guest firmware is providing PSCI, and QEMU should not; otherwise if the guest has EL2 then QEMU's emulated firmware should be at EL3 using SMC, otherwise use HVC".

(So in practice for hvf at the moment this will mean the conduit is always HVC, since hvf doesn't allow EL3 or EL2 in the guest.)

Quoted 3 lines

In hvf, we can very easily trap for SMC calls and handle them. Why are we making OSs implement HVC call paths when SMC would work just as well for everyone?

OSes have to handle both anyway, because on real hardware if there is no EL3 then it is IMPDEF whether SMC is trappable to the hypervisor or whether it just UNDEFs to EL1.

Quoted 3 lines

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

-- PMM

#13 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 40 lines · Peter Maydell
Quoted 20 lines · Alexander Graf
Quoted 3 lines · Peter Maydell

Something in here should be checking whether the insn the guest used matches the PSCI conduit configured for the VM, ie what arm_is_psci_call() does after your patch 10.

It's yet another case where I believe we are both reading the spec differently :)

https://documentation-service.arm.com/static/6013e5faeee5236980d08619

Section 2.5.3 speaks about the conduits. It says

Service calls are expected to be invoked through SMC instructions,
except
for Standard Hypervisor Calls and Vendor Specific Hypervisor Calls. On some platforms, however, SMC instructions are not available, and the services can be accessed through HVC instructions. The method that is used to invoke the service is referred to as the conduit.

Quoted 3 lines

To me, that reads like "Use SMC whenever you can. If your hardware does not give you a way to handle SMC calls, falling back to HVC is ok. In that case, indicate that mandate to the OS".

QEMU here is being the platform, so we define what the conduit is (or if one even exists). For the virt board this is "if the guest has EL3 firmware, then the guest firmware is providing PSCI, and QEMU should not; otherwise if the guest has EL2 then QEMU's emulated firmware should be at EL3 using SMC, otherwise use HVC".

(So in practice for hvf at the moment this will mean the conduit is always HVC, since hvf doesn't allow EL3 or EL2 in the guest.)

Quoted 3 lines

In hvf, we can very easily trap for SMC calls and handle them. Why are we making OSs implement HVC call paths when SMC would work just as well for everyone?

OSes have to handle both anyway, because on real hardware if there is no EL3 then it is IMPDEF whether SMC is trappable to the hypervisor or whether it just UNDEFs to EL1.

Quoted 5 lines
Quoted 3 lines

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why? Also, why does KVM behave differently? And why does Windows rely on SMC availability on boot?

If you really insist that you don't care about users running Windows with TCG and EL2=0, so be it. At least you can enable EL2 and it works then. But I can't on hvf. It's one of the most useful use cases for hvf on QEMU and I won't break it just because you insist that "SMC behavior is IMPDEF, so it must be UNDEF". If it's IMPDEF, it may as well be "set x0 to -1 and add 4 to pc".

And yes, this is a hill I will die on :)

Alex

#14 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 11 lines · Alexander Graf
Quoted 6 lines · Peter Maydell
Quoted 3 lines · Alexander Graf

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why?

QEMU's assumption here is that there are basically two scenarios for these instructions:
(1) we're providing an emulation of firmware that uses this instruction (and only this insn, not the other one) to provide PSCI services
(2) we're not emulating any firmware at all, we're running it in the guest, and that guest firmware is providing PSCI

In case (1) we provide a PSCI ABI on the end of the insn. In case (2) we provide the architectural behaviour for the insn so that the guest firmware can use it.

We don't currently have
(3) we're providing an emulation of firmware that does something other than providing PSCI services on this instruction

which is what I think you're asking for. (Alternatively, you might be after "provide PSCI via SMC, not HVC", ie use a different conduit. If hvf documents that SMC is guaranteed to trap that would be possible, I guess.)

Quoted 1 line

Also, why does KVM behave differently?

Looks like Marc made KVM set x0 to -1 for SMC calls in kernel commit c0938c72f8070aa; conveniently he's on the cc list here so we can ask him :-)

Quoted 2 lines

And why does Windows rely on
SMC availability on boot?

Ask Microsoft, but probably either they don't realize that SMC might not exist and be trappable, or they only have a limited set of hosts they care about. CPUs with no EL3 are not that common.

Quoted 6 lines

If you really insist that you don't care about users running Windows with TCG and EL2=0, so be it. At least you can enable EL2 and it works then. But I can't on hvf. It's one of the most useful use cases for hvf on QEMU and I won't break it just because you insist that "SMC behavior is IMPDEF, so it must be UNDEF". If it's IMPDEF, it may as well be "set x0 to -1 and add 4 to pc".

I am not putting in random hacks for the benefit of specific guest OSes. If there's a good reason why QEMU's behaviour is wrong then we can change it, but "I want Windows to boot" doesn't count.

thanks
-- PMM

#15 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 22 lines · Peter Maydell
Quoted 9 lines · Alexander Graf
Quoted 6 lines · Peter Maydell
Quoted 3 lines · Alexander Graf

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why?

QEMU's assumption here is that there are basically two scenarios for these instructions:
(1) we're providing an emulation of firmware that uses this instruction (and only this insn, not the other one) to provide PSCI services
(2) we're not emulating any firmware at all, we're running it in the guest, and that guest firmware is providing PSCI

In case (1) we provide a PSCI ABI on the end of the insn. In case (2) we provide the architectural behaviour for the insn so that the guest firmware can use it.

Quoted 8 lines

We don't currently have
(3) we're providing an emulation of firmware that does something other than providing PSCI services on this instruction

which is what I think you're asking for. (Alternatively, you might be after "provide PSCI via SMC, not HVC", ie use a different conduit. If hvf documents that SMC is guaranteed to trap that would be possible, I guess.)

Hvf doesn't document anything. The only documentation it has are its C headers.

However, M1 does not implement EL3, but traps SMC calls. It's the only chip Apple has out for hvf on ARM today. I would be very surprised if they started to regress on that functionality.

So, would you be open to changing the default conduit to SMC for hvf_enabled()? Is that really a better experience than just modeling behavior after KVM?

Quoted 11 lines
Quoted 2 lines

Also, why does KVM behave differently?

Looks like Marc made KVM set x0 to -1 for SMC calls in kernel commit c0938c72f8070aa; conveniently he's on the cc list here so we can ask him :-)

Quoted 2 lines

And why does Windows rely on
SMC availability on boot?

Ask Microsoft, but probably either they don't realize that SMC might not exist and be trappable, or they only have a limited set of hosts they care about. CPUs with no EL3 are not that common.

I'm pretty sure it's the latter :).

Quoted 10 lines
Quoted 7 lines

If you really insist that you don't care about users running Windows with TCG and EL2=0, so be it. At least you can enable EL2 and it works then. But I can't on hvf. It's one of the most useful use cases for hvf on QEMU and I won't break it just because you insist that "SMC behavior is IMPDEF, so it must be UNDEF". If it's IMPDEF, it may as well be "set x0 to -1 and add 4 to pc".

I am not putting in random hacks for the benefit of specific guest OSes. If there's a good reason why QEMU's behaviour is wrong then we can change it, but "I want Windows to boot" doesn't count.

Ok, so today we have 2 implementations for SMC traps in an EL0/1 only VM:

  * TCG injects #UD
  * KVM sets x0 = -1 and pc += 4.

With v10 of the HVF patch set, I'm following what KVM is doing. Can we leave it at that for now and sort out with Marc (and maybe ARM spec writers) what we want to do consistently across all implementations as a follow-up?

Thanks,

Alex

#16 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

In reply to Peter Maydell
Quoted 35 lines · Peter Maydell
Quoted 11 lines · Alexander Graf
Quoted 6 lines · Peter Maydell
Quoted 3 lines · Alexander Graf

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why?

QEMU's assumption here is that there are basically two scenarios for these instructions:
(1) we're providing an emulation of firmware that uses this instruction (and only this insn, not the other one) to provide PSCI services
(2) we're not emulating any firmware at all, we're running it in the guest, and that guest firmware is providing PSCI

In case (1) we provide a PSCI ABI on the end of the insn. In case (2) we provide the architectural behaviour for the insn so that the guest firmware can use it.

We don't currently have
(3) we're providing an emulation of firmware that does something other than providing PSCI services on this instruction

which is what I think you're asking for. (Alternatively, you might be after "provide PSCI via SMC, not HVC", ie use a different conduit. If hvf documents that SMC is guaranteed to trap that would be possible, I guess.)

Quoted 5 lines
Quoted 1 line

Also, why does KVM behave differently?

Looks like Marc made KVM set x0 to -1 for SMC calls in kernel commit c0938c72f8070aa; conveniently he's on the cc list here so we can ask him :-)

If we got a SMC trap into KVM, that's because the HW knows about it, so injecting an UNDEF is rather counter productive (we don't hide the fact that EL3 actually exists).

However, we don't implement anything on the back of this instruction, so we just return NOT_IMPLEMENTED (-1). With NV, we actually use it as a guest hypervisor can use it for PSCI and SMC is guaranteed to trap even if EL3 doesn't exist in the HW.

For the brain-damaged case where there is no EL3, SMC traps and the hypervisor doesn't actually advertises EL3, that's likely a guest bug. Tough luck.

Side note: Not sure where HVF does, but on the M1 running Linux, SMC appears to trap to EL2 with EC=0x3f, which is a reserved exception class. This of course results in an UNDEF being injected because as far as KVM is concerned, this should never happen.

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
#17 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 33 lines · Marc Zyngier
Quoted 31 lines · Peter Maydell
Quoted 9 lines · Alexander Graf
Quoted 6 lines · Peter Maydell
Quoted 3 lines · Alexander Graf

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why?

QEMU's assumption here is that there are basically two scenarios for these instructions:
(1) we're providing an emulation of firmware that uses this instruction (and only this insn, not the other one) to provide PSCI services
(2) we're not emulating any firmware at all, we're running it in the guest, and that guest firmware is providing PSCI

In case (1) we provide a PSCI ABI on the end of the insn. In case (2) we provide the architectural behaviour for the insn so that the guest firmware can use it.

We don't currently have
(3) we're providing an emulation of firmware that does something other than providing PSCI services on this instruction

which is what I think you're asking for. (Alternatively, you might be after "provide PSCI via SMC, not HVC", ie use a different conduit. If hvf documents that SMC is guaranteed to trap that would be possible, I guess.)

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Also, why does KVM behave differently?

Looks like Marc made KVM set x0 to -1 for SMC calls in kernel commit c0938c72f8070aa; conveniently he's on the cc list here so we can ask him :-)

If we got a SMC trap into KVM, that's because the HW knows about it, so injecting an UNDEF is rather counter productive (we don't hide the fact that EL3 actually exists).

This is the part where you and Peter disagree :). What would you suggest to do to create consistency between KVM and TCG based EL0/1 only VMs?

Quoted 5 lines

However, we don't implement anything on the back of this instruction, so we just return NOT_IMPLEMENTED (-1). With NV, we actually use it as a guest hypervisor can use it for PSCI and SMC is guaranteed to trap even if EL3 doesn't exist in the HW.

Quoted 8 lines

For the brain-damaged case where there is no EL3, SMC traps and the hypervisor doesn't actually advertises EL3, that's likely a guest bug. Tough luck.

Side note: Not sure where HVF does, but on the M1 running Linux, SMC appears to trap to EL2 with EC=0x3f, which is a reserved exception class. This of course results in an UNDEF being injected because as far as KVM is concerned, this should never happen.

Could that be yet another magical implementation specific MSR bit that needs to be set? Hvf returns 0x17 (EC_AA64_SMC) for SMC calls.

Alex

#18 lore raw

Re: [PATCH v9 07/11] hvf: arm: Implement PSCI handling

Quoted 40 lines · Alexander Graf
Quoted 37 lines · Marc Zyngier
Quoted 35 lines · Peter Maydell
Quoted 9 lines · Alexander Graf
Quoted 6 lines · Peter Maydell
Quoted 3 lines · Alexander Graf

To keep your train of thought though, what would you do if we encounter a conduit that is different from the chosen one? Today, I am aware of 2 different implementations: TCG injects #UD [1] while KVM sets x0 to -1 [2].

If the SMC or HVC insn isn't being used for PSCI then it should have its standard architectural behaviour.

Why?

QEMU's assumption here is that there are basically two scenarios for these instructions:
(1) we're providing an emulation of firmware that uses this instruction (and only this insn, not the other one) to provide PSCI services
(2) we're not emulating any firmware at all, we're running it in the guest, and that guest firmware is providing PSCI

In case (1) we provide a PSCI ABI on the end of the insn. In case (2) we provide the architectural behaviour for the insn so that the guest firmware can use it.

We don't currently have
(3) we're providing an emulation of firmware that does something other than providing PSCI services on this instruction

which is what I think you're asking for. (Alternatively, you might be after "provide PSCI via SMC, not HVC", ie use a different conduit. If hvf documents that SMC is guaranteed to trap that would be possible, I guess.)

Quoted 1 line

Also, why does KVM behave differently?

Looks like Marc made KVM set x0 to -1 for SMC calls in kernel commit c0938c72f8070aa; conveniently he's on the cc list here so we can ask him :-)

Quoted 7 lines
Quoted 3 lines

If we got a SMC trap into KVM, that's because the HW knows about it, so injecting an UNDEF is rather counter productive (we don't hide the fact that EL3 actually exists).

This is the part where you and Peter disagree :). What would you suggest to do to create consistency between KVM and TCG based EL0/1 only VMs?

I don't think we disagree. We simply have different implementation choices. The KVM "firmware" can only be used with HVC, and not SMC. SMC is reserved for cases where the guest talks to the actual EL3, or an emulation of it in the case of NV.

As for consistency between TGC and KVM, I have no plan for that whatsoever. Both implementations are valid, and they don't have to be identical. Even more, diversity is important, as it weeds out silly assumptions that are baked in non-portable SW.

Windows doesn't boot? I won't loose any sleep over it.

Quoted 10 lines
Quoted 10 lines

However, we don't implement anything on the back of this instruction, so we just return NOT_IMPLEMENTED (-1). With NV, we actually use it as a guest hypervisor can use it for PSCI and SMC is guaranteed to trap even if EL3 doesn't exist in the HW.

For the brain-damaged case where there is no EL3, SMC traps and the hypervisor doesn't actually advertises EL3, that's likely a guest bug. Tough luck.

Quoted 7 lines
Quoted 4 lines

Side note: Not sure where HVF does, but on the M1 running Linux, SMC appears to trap to EL2 with EC=0x3f, which is a reserved exception class. This of course results in an UNDEF being injected because as far as KVM is concerned, this should never happen.

Could that be yet another magical implementation specific MSR bit that needs to be set? Hvf returns 0x17 (EC_AA64_SMC) for SMC calls.

That's possible, but that's not something KVM will do. Also, from what I understand of HVF, this value is what you get in userspace, and it says nothing of what the kernel side does. It could well be translating the invalid EC into something else, after having read the instruction from the guest for all I know.

It is pretty obvious that this HW is not a valid implementation of the architecture and if it decides to screw itself up, I'm happy to oblige.

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
#19 lore raw

PATCH v9 8/11 arm: Add Hypervisor.framework build target

In reply to Alexander Graf

Now that we have all logic in place that we need to handle Hypervisor.framework on Apple Silicon systems, let's add CONFIG_HVF for aarch64 as well so that we can build it.

---

v1 -> v2:

- Fix build on 32bit arm

v3 -> v4:

- Remove i386-softmmu target

v6 -> v7:

- Simplify HVF matching logic in meson build file

---
 meson.build                | 7 +++++++
 target/arm/hvf/meson.build | 3 +++
 target/arm/meson.build     | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 target/arm/hvf/meson.build
meson.build +7 -0
index a3e9b95846..cf91256c9a 100644
@@ -77,6 +77,13 @@ else
 endif
 
 accelerator_targets = { 'CONFIG_KVM': kvm_targets }
+
+if cpu in ['aarch64']
+  accelerator_targets += {
+    'CONFIG_HVF': ['aarch64-softmmu']
+  }
+endif
+
 if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
   # i368 emulator provides xenpv machine type for multiple architectures
   accelerator_targets += {
target/arm/hvf/meson.build new file +3 -0
new file mode 100644
index 0000000000..855e6cce5a
@@ -0,0 +1,3 @@
+arm_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files(
+  'hvf.c',
+))
target/arm/meson.build +2 -0
index 25a02bf276..50f152214a 100644
@@ -60,5 +60,7 @@ arm_softmmu_ss.add(files(
   'psci.c',
 ))
 
+subdir('hvf')
+
 target_arch += {'arm': arm_ss}
 target_softmmu_arch += {'arm': arm_softmmu_ss}
Signature · 1 line
2.30.1 (Apple Git-130)
#20 lore raw

PATCH v9 9/11 hvf: arm: Add rudimentary PMC support

In reply to Alexander Graf

We can expose cycle counters on the PMU easily. To be as compatible as possible, let's do so, but make sure we don't expose any other architectural counters that we can not model yet.

This allows OSs to work that require PMU support.

---
 target/arm/hvf/hvf.c | 179 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
target/arm/hvf/hvf.c +179 -0
index 20d795366a..b62cfa3976 100644
@@ -42,6 +42,18 @@
 #define SYSREG_OSLSR_EL1      SYSREG(2, 0, 1, 1, 4)
 #define SYSREG_OSDLR_EL1      SYSREG(2, 0, 1, 3, 4)
 #define SYSREG_CNTPCT_EL0     SYSREG(3, 3, 14, 0, 1)
+#define SYSREG_PMCR_EL0       SYSREG(3, 3, 9, 12, 0)
+#define SYSREG_PMUSERENR_EL0  SYSREG(3, 3, 9, 14, 0)
+#define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1)
+#define SYSREG_PMCNTENCLR_EL0 SYSREG(3, 3, 9, 12, 2)
+#define SYSREG_PMINTENCLR_EL1 SYSREG(3, 0, 9, 14, 2)
+#define SYSREG_PMOVSCLR_EL0   SYSREG(3, 3, 9, 12, 3)
+#define SYSREG_PMSWINC_EL0    SYSREG(3, 3, 9, 12, 4)
+#define SYSREG_PMSELR_EL0     SYSREG(3, 3, 9, 12, 5)
+#define SYSREG_PMCEID0_EL0    SYSREG(3, 3, 9, 12, 6)
+#define SYSREG_PMCEID1_EL0    SYSREG(3, 3, 9, 12, 7)
+#define SYSREG_PMCCNTR_EL0    SYSREG(3, 3, 9, 13, 0)
+#define SYSREG_PMCCFILTR_EL0  SYSREG(3, 3, 14, 15, 7)
 
 #define WFX_IS_WFE (1 << 0)
 
@@ -708,6 +720,40 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
         val = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) /
               gt_cntfrq_period_ns(arm_cpu);
         break;
+    case SYSREG_PMCR_EL0:
+        val = env->cp15.c9_pmcr;
+        break;
+    case SYSREG_PMCCNTR_EL0:
+        pmu_op_start(env);
+        val = env->cp15.c15_ccnt;
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMCNTENCLR_EL0:
+        val = env->cp15.c9_pmcnten;
+        break;
+    case SYSREG_PMOVSCLR_EL0:
+        val = env->cp15.c9_pmovsr;
+        break;
+    case SYSREG_PMSELR_EL0:
+        val = env->cp15.c9_pmselr;
+        break;
+    case SYSREG_PMINTENCLR_EL1:
+        val = env->cp15.c9_pminten;
+        break;
+    case SYSREG_PMCCFILTR_EL0:
+        val = env->cp15.pmccfiltr_el0;
+        break;
+    case SYSREG_PMCNTENSET_EL0:
+        val = env->cp15.c9_pmcnten;
+        break;
+    case SYSREG_PMUSERENR_EL0:
+        val = env->cp15.c9_pmuserenr;
+        break;
+    case SYSREG_PMCEID0_EL0:
+    case SYSREG_PMCEID1_EL0:
+        /* We can't really count anything yet, declare all events invalid */
+        val = 0;
+        break;
     case SYSREG_OSLSR_EL1:
         val = env->cp15.oslsr_el1;
         break;
@@ -738,6 +784,82 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
     return 0;
 }
 
+static void pmu_update_irq(CPUARMState *env)
+{
+    ARMCPU *cpu = env_archcpu(env);
+    qemu_set_irq(cpu->pmu_interrupt, (env->cp15.c9_pmcr & PMCRE) &&
+            (env->cp15.c9_pminten & env->cp15.c9_pmovsr));
+}
+
+static bool pmu_event_supported(uint16_t number)
+{
+    return false;
+}
+
+/* Returns true if the counter (pass 31 for PMCCNTR) should count events using
+ * the current EL, security state, and register configuration.
+ */
+static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter)
+{
+    uint64_t filter;
+    bool enabled, filtered = true;
+    int el = arm_current_el(env);
+
+    enabled = (env->cp15.c9_pmcr & PMCRE) &&
+              (env->cp15.c9_pmcnten & (1 << counter));
+
+    if (counter == 31) {
+        filter = env->cp15.pmccfiltr_el0;
+    } else {
+        filter = env->cp15.c14_pmevtyper[counter];
+    }
+
+    if (el == 0) {
+        filtered = filter & PMXEVTYPER_U;
+    } else if (el == 1) {
+        filtered = filter & PMXEVTYPER_P;
+    }
+
+    if (counter != 31) {
+        /*
+         * If not checking PMCCNTR, ensure the counter is setup to an event we
+         * support
+         */
+        uint16_t event = filter & PMXEVTYPER_EVTCOUNT;
+        if (!pmu_event_supported(event)) {
+            return false;
+        }
+    }
+
+    return enabled && !filtered;
+}
+
+static void pmswinc_write(CPUARMState *env, uint64_t value)
+{
+    unsigned int i;
+    for (i = 0; i < pmu_num_counters(env); i++) {
+        /* Increment a counter's count iff: */
+        if ((value & (1 << i)) && /* counter's bit is set */
+                /* counter is enabled and not filtered */
+                pmu_counter_enabled(env, i) &&
+                /* counter is SW_INCR */
+                (env->cp15.c14_pmevtyper[i] & PMXEVTYPER_EVTCOUNT) == 0x0) {
+            /*
+             * Detect if this write causes an overflow since we can't predict
+             * PMSWINC overflows like we can for other events
+             */
+            uint32_t new_pmswinc = env->cp15.c14_pmevcntr[i] + 1;
+
+            if (env->cp15.c14_pmevcntr[i] & ~new_pmswinc & INT32_MIN) {
+                env->cp15.c9_pmovsr |= (1 << i);
+                pmu_update_irq(env);
+            }
+
+            env->cp15.c14_pmevcntr[i] = new_pmswinc;
+        }
+    }
+}
+
 static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)
 {
     ARMCPU *arm_cpu = ARM_CPU(cpu);
@@ -752,6 +874,63 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)
                            val);
 
     switch (reg) {
+    case SYSREG_PMCCNTR_EL0:
+        pmu_op_start(env);
+        env->cp15.c15_ccnt = val;
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMCR_EL0:
+        pmu_op_start(env);
+
+        if (val & PMCRC) {
+            /* The counter has been reset */
+            env->cp15.c15_ccnt = 0;
+        }
+
+        if (val & PMCRP) {
+            unsigned int i;
+            for (i = 0; i < pmu_num_counters(env); i++) {
+                env->cp15.c14_pmevcntr[i] = 0;
+            }
+        }
+
+        env->cp15.c9_pmcr &= ~PMCR_WRITEABLE_MASK;
+        env->cp15.c9_pmcr |= (val & PMCR_WRITEABLE_MASK);
+
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMUSERENR_EL0:
+        env->cp15.c9_pmuserenr = val & 0xf;
+        break;
+    case SYSREG_PMCNTENSET_EL0:
+        env->cp15.c9_pmcnten |= (val & pmu_counter_mask(env));
+        break;
+    case SYSREG_PMCNTENCLR_EL0:
+        env->cp15.c9_pmcnten &= ~(val & pmu_counter_mask(env));
+        break;
+    case SYSREG_PMINTENCLR_EL1:
+        pmu_op_start(env);
+        env->cp15.c9_pminten |= val;
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMOVSCLR_EL0:
+        pmu_op_start(env);
+        env->cp15.c9_pmovsr &= ~val;
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMSWINC_EL0:
+        pmu_op_start(env);
+        pmswinc_write(env, val);
+        pmu_op_finish(env);
+        break;
+    case SYSREG_PMSELR_EL0:
+        env->cp15.c9_pmselr = val & 0x1f;
+        break;
+    case SYSREG_PMCCFILTR_EL0:
+        pmu_op_start(env);
+        env->cp15.pmccfiltr_el0 = val & PMCCFILTR_EL0;
+        pmu_op_finish(env);
+        break;
     case SYSREG_OSLAR_EL1:
         env->cp15.oslsr_el1 = val & 1;
         break;
Signature · 1 line
2.30.1 (Apple Git-130)
#21 lore raw

PATCH v9 10/11 arm: tcg: Adhere to SMCCC 1.3 section 5.2

In reply to Alexander Graf

The SMCCC 1.3 spec section 5.2 says

The Unknown SMC Function Identifier is a sign-extended value of (-1) that is returned in the R0, W0 or X0 registers. An implementation must return this error code when it receives:

* An SMC or HVC call with an unknown Function Identifier
* An SMC or HVC call for a removed Function Identifier
* An SMC64/HVC64 call from AArch32 state

To comply with these statements, let's always return -1 when we encounter an unknown HVC or SMC call.

---

v8 -> v9:

- Remove Windows specifics and just comply with SMCCC spec

---
 target/arm/psci.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)
target/arm/psci.c +2 -24
index 6709e28013..bee4aa8825 100644
@@ -35,7 +35,6 @@ bool arm_is_psci_call(ARMCPU *cpu, int excp_type)
      * to EL2 or to EL3).
      */
     CPUARMState *env = &cpu->env;
-    uint64_t param = is_a64(env) ? env->xregs[0] : env->regs[0];
 
     switch (excp_type) {
     case EXCP_HVC:
@@ -52,27 +51,7 @@ bool arm_is_psci_call(ARMCPU *cpu, int excp_type)
         return false;
     }
 
-    switch (param) {
-    case QEMU_PSCI_0_2_FN_PSCI_VERSION:
-    case QEMU_PSCI_0_2_FN_MIGRATE_INFO_TYPE:
-    case QEMU_PSCI_0_2_FN_AFFINITY_INFO:
-    case QEMU_PSCI_0_2_FN64_AFFINITY_INFO:
-    case QEMU_PSCI_0_2_FN_SYSTEM_RESET:
-    case QEMU_PSCI_0_2_FN_SYSTEM_OFF:
-    case QEMU_PSCI_0_1_FN_CPU_ON:
-    case QEMU_PSCI_0_2_FN_CPU_ON:
-    case QEMU_PSCI_0_2_FN64_CPU_ON:
-    case QEMU_PSCI_0_1_FN_CPU_OFF:
-    case QEMU_PSCI_0_2_FN_CPU_OFF:
-    case QEMU_PSCI_0_1_FN_CPU_SUSPEND:
-    case QEMU_PSCI_0_2_FN_CPU_SUSPEND:
-    case QEMU_PSCI_0_2_FN64_CPU_SUSPEND:
-    case QEMU_PSCI_0_1_FN_MIGRATE:
-    case QEMU_PSCI_0_2_FN_MIGRATE:
-        return true;
-    default:
-        return false;
-    }
+    return true;
 }
 
 void arm_handle_psci_call(ARMCPU *cpu)
@@ -194,10 +173,9 @@ void arm_handle_psci_call(ARMCPU *cpu)
         break;
     case QEMU_PSCI_0_1_FN_MIGRATE:
     case QEMU_PSCI_0_2_FN_MIGRATE:
+    default:
         ret = QEMU_PSCI_RET_NOT_SUPPORTED;
         break;
-    default:
-        g_assert_not_reached();
     }
 
 err:
Signature · 1 line
2.30.1 (Apple Git-130)
#22 lore raw

Re: [PATCH v9 10/11] arm: tcg: Adhere to SMCCC 1.3 section 5.2

Quoted 7 lines · Alexander Graf

The SMCCC 1.3 spec section 5.2 says

The Unknown SMC Function Identifier is a sign-extended value of (-1) that is returned in the R0, W0 or X0 registers. An implementation must return this error code when it receives:

Quoted 8 lines

* An SMC or HVC call with an unknown Function Identifier
* An SMC or HVC call for a removed Function Identifier
* An SMC64/HVC64 call from AArch32 state

To comply with these statements, let's always return -1 when we encounter an unknown HVC or SMC call.

Thanks for tracking down the spec requirements.

I agree with the code changes, but the comment at the top of arm_is_psci_call() also needs to be updated, as it currently says that we check r0/x0.

-- PMM

#23 lore raw

PATCH v9 11/11 hvf: arm: Adhere to SMCCC 1.3 section 5.2

In reply to Alexander Graf

The SMCCC 1.3 spec section 5.2 says

The Unknown SMC Function Identifier is a sign-extended value of (-1) that is returned in the R0, W0 or X0 registers. An implementation must return this error code when it receives:

* An SMC or HVC call with an unknown Function Identifier
* An SMC or HVC call for a removed Function Identifier
* An SMC64/HVC64 call from AArch32 state

To comply with these statements, let's always return -1 when we encounter an unknown HVC or SMC call.

---

v7 -> v8:

- fix checkpatch

v8 -> v9:

- Remove Windows specifics and just comply with SMCCC spec

---
 target/arm/hvf/hvf.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
target/arm/hvf/hvf.c +5 -2
index b62cfa3976..6a7ccfa91e 100644
@@ -1177,7 +1177,8 @@ int hvf_vcpu_exec(CPUState *cpu)
         cpu_synchronize_state(cpu);
         if (hvf_handle_psci_call(cpu)) {
             trace_hvf_unknown_hvf(env->xregs[0]);
-            hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
+            /* SMCCC 1.3 section 5.2 says every unknown HVC call returns -1 */
+            env->xregs[0] = -1;
         }
         break;
     case EC_AA64_SMC:
@@ -1186,7 +1187,9 @@ int hvf_vcpu_exec(CPUState *cpu)
             advance_pc = true;
         } else {
             trace_hvf_unknown_smc(env->xregs[0]);
-            hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
+            /* SMCCC 1.3 section 5.2 says every unknown SMC call returns -1 */
+            env->xregs[0] = -1;
+            advance_pc = true;
         }
         break;
     default:
Signature · 1 line
2.30.1 (Apple Git-130)
#24 lore raw

Re: [PATCH v9 11/11] hvf: arm: Adhere to SMCCC 1.3 section 5.2

Quoted 44 lines · Alexander Graf

The SMCCC 1.3 spec section 5.2 says

The Unknown SMC Function Identifier is a sign-extended value of (-1) that is returned in the R0, W0 or X0 registers. An implementation must return this error code when it receives:

* An SMC or HVC call with an unknown Function Identifier
* An SMC or HVC call for a removed Function Identifier
* An SMC64/HVC64 call from AArch32 state

To comply with these statements, let's always return -1 when we encounter an unknown HVC or SMC call.

---

v7 -> v8:

- fix checkpatch

v8 -> v9:

- Remove Windows specifics and just comply with SMCCC spec

---
 target/arm/hvf/hvf.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
target/arm/hvf/hvf.c +2 -1
index b62cfa3976..6a7ccfa91e 100644
@@ -1177,7 +1177,8 @@ int hvf_vcpu_exec(CPUState *cpu)
         cpu_synchronize_state(cpu);
         if (hvf_handle_psci_call(cpu)) {
             trace_hvf_unknown_hvf(env->xregs[0]);
-            hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
+            /* SMCCC 1.3 section 5.2 says every unknown HVC call returns -1 */
+            env->xregs[0] = -1;
         }
         break;
     case EC_AA64_SMC:

target/arm/hvf/hvf.c int hvf_vcpu_exec(CPUState *cpu) · line 1195

Quoted 10 lines
target/arm/hvf/hvf.c +3 -1
@@ -1186,7 +1187,9 @@ int hvf_vcpu_exec(CPUState *cpu)
             advance_pc = true;
         } else {
             trace_hvf_unknown_smc(env->xregs[0]);
-            hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
+            /* SMCCC 1.3 section 5.2 says every unknown SMC call returns -1 */
+            env->xregs[0] = -1;
+            advance_pc = true;
         }
         break;
     default:

This should be squashed into whatever earlier patch added this code.

thanks
-- PMM