HVF: Add support for platform vGIC and nested virtualisation
v20 cover HVF: Add support for platform vGIC and nested virtualisation
Link to branch: https://github.com/mediouni-m/qemu hvf-irqchip-and-nested (tag for this submission: hvf-irqchip-and-nested-v20)
This series adds support for nested virtualisation when using HVF on arm64 Macs.
The first two patches are from the SME enablement series and are present for the series to be buildable on its own.
It has two parts:
- Apple vGICv3 support and necessary infrastructure changes for it
- Nested virtualisation support. Note that the nested virtualisation implementation shipping as of macOS 26.3 is nVHE only (but it _does_ use VNCR as shipped).
Known issues:
- when nested virt is enabled, no UI response within EDK2 and a permanent wait. Workaround: -boot menu=on,splash-time=0.
Apple Feedback Assistant item: FB21649319
When the VM is running at EL2 at the very moment the virtual timer fires:HV_EXIT_REASON_VTIMER_ACTIVATED doesn’t fire (when not using the provided vGIC)
- using a GICv2 doesn’t require having transition notifiers which Hypervisor.framework doesn’t have…)
and when using the provided vGIC, the interrupt never gets delivered back to the guest
Linux as a guest OS is fine with this… but the reference ArmVirtQemu edk2 build always uses the virtual timer even when running EFI at EL2, so it gets broken unless this patch is applied to edk2:
diff of ArmVirtPkg/ArmVirt.dsc.inc:
- ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf + ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf^M
Changelog:
v1->v2:
Oops. I did a mistake when preparing my patches.
- Add hvf_arm_el2_enable(_) call to virt_set_virt
- Fix nested virt support check to add HVF
v2->v3:
- LORC_EL1 patch was merged separately, remove from this series.
- fix LPIs when kernel-irqchip disabled and using TCG
- remove spurious if case in vGIC supported version detection (inapplicable now)
- Add hvf_enabled() check in combination with hvf kernel-irqchip checks
- cleanly fail on attempt to use the platform vGIC together with ITS
v3->v4:
- GIC state save improvements, including saving the opaque Apple-specific state
- Saving HVF system register state when using the vGIC and/or EL2
v5:
- oops, fixed up save/restore to be functional
- misc changes otherwise
v6:
- Addressing review comments
v7:
- Address review comments, adapt around Qemu changes and bugfixes.
v8:
- Rebase, and misc fixes
v9:
- Misc fixes from WHPX review comments
- Split enablement commit for EL2 into its own separate commit
v10:
- A bit of changes across the board
- move HVF irqchip save/restore into irqchip code
- block nested virt support when kernel-irqchip=off with a GICv2 as we don't implement an emulated physical timer yet.
v11:
- fixups for the save/restore Apple GIC state patch
- block the same registers as the revert in 28b0ed32b32c7e5094cf2f1ec9c0645c65fad2aa for "hvf: sync registers used at EL2"
- drop patch that warns instead of aborts on mismatch
v12:
- Have the SME2 series at the start of this.
- Adaptation for the SME2 series.
v13:
- include "fix SME capabilities reporting" patch instead of it being standalone
- include "remove hvf_arm.h include" patch at the beginning of the series
v14:
- Turns out that the HVF SME2 patches broke the build for pretty much anything non-macOS, and didn't address that properly in v13
- Addressed some checkpatch nits
v15:
- Pick new revision of SME2 patches
- separate disable nested virt when SME on patch
v16/17:
- Availability checks as needed except for the vGIC code, where they're just skipped instead as availability is checked elsewhere.
- Some tiny cleanups
- v17: one more (optional to take) cleanup commit
v18:
- Some tiny nits here and there but that's about it.
- Drop some patches on top as CI isn't ready for them yet
v19:
- change hvf_nested_virt_enable(bool) from a macro to a function call
v20:
- Only enable kernel-irqchip=on when running with -M virt-11.1 or later
- Enable nested virt to work with kernel-irqchip=off when using a GICv2
Mohamed Mediouni (15):
hw/intc: Add hvf vGIC interrupt controller support hw/intc: arm_gicv3_hvf: save/restore Apple GIC state accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC target/arm: hvf: instantiate GIC early
hw/arm, target/arm: nested virtualisation on HVF
hvf: only call hvf_sync_vtimer() when running without the platform
vGIC
hvf: gate ARM_FEATURE_PMU register emulation when using the Apple vGIC
hvf: arm: allow exposing minimal PMU when running with nested virt on target/arm: hvf: add asserts for code paths not leveraged when using
the vGIC
hvf: sync registers used at EL2
target/arm: hvf: pass through CNTHCTL_EL2 and MDCCINT_EL1
hvf: arm: disable SME when nested virt is active
hvf: arm: physical timer emulation
hvf: enable nested virtualisation support
hvf: arm: enable vGIC by default for virt-11.1 and later
accel/hvf/hvf-all.c | 62 +++ accel/stubs/hvf-stub.c | 11 + hw/arm/virt.c | 53 +- hw/intc/arm_gicv3_common.c | 4 + hw/intc/arm_gicv3_hvf.c | 828 +++++++++++++++++++++++++++++ hw/intc/arm_gicv3_hvf_stub.c | 25 + hw/intc/meson.build | 2 + include/hw/arm/virt.h | 2 + include/hw/core/boards.h | 1 + include/hw/intc/arm_gicv3_common.h | 4 + include/system/hvf.h | 8 + include/system/hvf_int.h | 1 + system/vl.c | 2 + target/arm/hvf/hvf.c | 208 +++++++- target/arm/hvf/sysreg.c.inc | 44 ++ target/arm/hvf_arm.h | 5 + 16 files changed, 1234 insertions(+), 26 deletions(-) create mode 100644 hw/intc/arm_gicv3_hvf.c create mode 100644 hw/intc/arm_gicv3_hvf_stub.c
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 1/15 hw/intc: Add hvf vGIC interrupt controller support
This opens up the door to nested virtualisation support.
--- hw/intc/arm_gicv3_hvf.c | 741 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 1 + 3 files changed, 743 insertions(+) create mode 100644 hw/intc/arm_gicv3_hvf.c
hw/intc/arm_gicv3_hvf.c new file +741 -0
@@ -0,0 +1,741 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* ARM Generic Interrupt Controller using HVF platform support +* +* Copyright (c) 2025 Mohamed Mediouni +* Based on vGICv3 KVM code by Pavel Fedin +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/intc/arm_gicv3_common.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "system/runstate.h" +#include "system/hvf.h" +#include "system/hvf_int.h" +#include "hvf_arm.h" +#include "gicv3_internal.h" +#include "vgic_common.h" +#include "qom/object.h" +#include "target/arm/cpregs.h" +#include <Hypervisor/Hypervisor.h> + +/* For the GIC, override the check outright, as availability is checked elsewhere. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" + +struct HVFARMGICv3Class { +ARMGICv3CommonClass parent_class; +DeviceRealize parent_realize; +ResettablePhases parent_phases; +}; + +typedef struct HVFARMGICv3Class HVFARMGICv3Class ; + +/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ +DECLARE_OBJ_CHECKERS (GICv3State, HVFARMGICv3Class, +HVF_GICV3 ,TYPE_HVF_GICV3 ); + +/* +* Loop through each distributor IRQ related register; since bits +* corresponding to SPIs and PPIs are RAZ/WI when affinity routing +* is enabled, we skip those. +*/ +#define for_each_dist_irq_reg (_irq, _max, _field_width) \ + for (_irq = GIC_INTERNAL; _irq < _max; _irq += (32 / _field_width)) + +/* +* Wrap calls to the vGIC APIs to assert_hvf_ok() +* as a macro to keep the code clean. +*/ +#define hv_gic_get_distributor_reg (offset, reg) \ + assert_hvf_ok(hv_gic_get_distributor_reg(offset, reg)) + +#define hv_gic_set_distributor_reg (offset, reg) \ + assert_hvf_ok(hv_gic_set_distributor_reg(offset, reg)) + +#define hv_gic_get_redistributor_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_set_redistributor_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_get_icc_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_icc_reg(vcpu, reg, value)) + +#define hv_gic_set_icc_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_icc_reg(vcpu, reg, value)) + +#define hv_gic_get_ich_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_ich_reg(vcpu, reg, value)) + +#define hv_gic_set_ich_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_ich_reg(vcpu, reg, value)) + +static void hvf_dist_get_priority (GICv3State *s,hv_gic_distributor_reg_t offset + ,uint8_t *bmp) +{ +uint64_t reg; +uint32_t *field; +int irq; + field = (uint32_t *)(bmp); + +for_each_dist_irq_reg (irq, s->num_irq,8 ) { +hv_gic_get_distributor_reg (offset, ®); + *field = reg; + offset +=4 ; + field++; + } +} + +static void hvf_dist_put_priority (GICv3State *s,hv_gic_distributor_reg_t offset + ,uint8_t *bmp) +{ +uint32_t reg, *field; +int irq; + field = (uint32_t *)(bmp); + +for_each_dist_irq_reg (irq, s->num_irq,8 ) { + reg = *field; +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + field++; + } +} + +static void hvf_dist_get_edge_trigger (GICv3State *s,hv_gic_distributor_reg_t offset, +uint32_t *bmp) +{ +uint64_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,2 ) { +hv_gic_get_distributor_reg (offset, ®); + reg =half_unshuffle32 (reg >>1 ); +if (irq %32 !=0 ) { + reg = (reg <<16 ); + } + *gic_bmp_ptr32 (bmp, irq) |= reg; + offset +=4 ; + } +} + +static void hvf_dist_put_edge_trigger (GICv3State *s,hv_gic_distributor_reg_t offset, +uint32_t *bmp) +{ +uint32_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,2 ) { + reg = *gic_bmp_ptr32 (bmp, irq); +if (irq %32 !=0 ) { + reg = (reg &0xffff0000 ) >>16 ; + }else { + reg = reg &0xffff ; + } + reg =half_shuffle32 (reg) <<1 ; +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + } +} + +/* Read a bitmap register group from the kernel VGIC. */ +static void hvf_dist_getbmp (GICv3State *s,hv_gic_distributor_reg_t offset,uint32_t *bmp) +{ +uint64_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,1 ) { + +hv_gic_get_distributor_reg (offset, ®); + *gic_bmp_ptr32 (bmp, irq) = reg; + offset +=4 ; + } +} + +static void hvf_dist_putbmp (GICv3State *s,hv_gic_distributor_reg_t offset, +hv_gic_distributor_reg_t clroffset,uint32_t *bmp) +{ +uint32_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,1 ) { +/* +* If this bitmap is a set/clear register pair, first write to the +* clear-reg to clear all bits before using the set-reg to write +* the 1 bits. +*/ +if (clroffset !=0 ) { + reg =0 ; +hv_gic_set_distributor_reg (clroffset, reg); + clroffset +=4 ; + } + reg = *gic_bmp_ptr32 (bmp, irq); +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + } +} + +static void hvf_gicv3_check (GICv3State *s) +{ +uint64_t reg; +uint32_t num_irq; + +/* Sanity checking s->num_irq */ +hv_gic_get_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_TYPER , ®); + num_irq = ((reg &0x1f ) +1 ) *32 ; + +if (num_irq < s->num_irq) { +error_report ("Model requests %u IRQs, but HVF supports max %u" , + s->num_irq, num_irq); +abort (); + } +} + +static void hvf_gicv3_put_cpu_el2 (CPUState *cpu_state,run_on_cpu_data arg) +{ +int num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_VMCR_EL2 , c->ich_vmcr_el2); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_HCR_EL2 , c->ich_hcr_el2); + +for (int i =0 ; i <GICV3_LR_MAX ; i++) { +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_LR0_EL2 , c->ich_lr_el2[i]); + } + + num_pri_bits = c->vpribits; + +switch (num_pri_bits) { +case 7 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +3 , + c->ich_apr[GICV3_G0 ][3 ]); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +2 , + c->ich_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +1 , + c->ich_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 , + c->ich_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +3 , + c->ich_apr[GICV3_G1NS ][3 ]); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +2 , + c->ich_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +1 , + c->ich_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 , + c->ich_apr[GICV3_G1NS ][0 ]); + } +} + +static void hvf_gicv3_put_cpu (CPUState *cpu_state,run_on_cpu_data arg) +{ +uint32_t reg; +uint64_t reg64; +int i, num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + + reg = c->gicr_waker; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , reg); + + reg = c->gicr_igroupr0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICENABLER0 , reg); + reg = c->gicr_ienabler0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISENABLER0 , reg); + +/* Restore config before pending so we treat level/edge correctly */ + reg =half_shuffle32 (c->edge_trigger >>16 ) <<1 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR1 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICPENDR0 , reg); + reg = c->gicr_ipendr0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISPENDR0 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICACTIVER0 , reg); + reg = c->gicr_iactiver0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISACTIVER0 , reg); + +for (i =0 ; i <GIC_INTERNAL ; i +=4 ) { + reg = c->gicr_ipriorityr[i] | + (c->gicr_ipriorityr[i +1 ] <<8 ) | + (c->gicr_ipriorityr[i +2 ] <<16 ) | + (c->gicr_ipriorityr[i +3 ] <<24 ); +hv_gic_set_redistributor_reg (vcpu, +HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, reg); + } + +/* CPU interface state */ +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_SRE_EL1 , c->icc_sre_el1); + +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_CTLR_EL1 , + c->icc_ctlr_el1[GICV3_NS ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN0_EL1 , + c->icc_igrpen[GICV3_G0 ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN1_EL1 , + c->icc_igrpen[GICV3_G1NS ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_PMR_EL1 , c->icc_pmr_el1); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_BPR0_EL1 , c->icc_bpr[GICV3_G0 ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_BPR1_EL1 , c->icc_bpr[GICV3_G1NS ]); + + num_pri_bits = ((c->icc_ctlr_el1[GICV3_NS ] & +ICC_CTLR_EL1_PRIBITS_MASK ) >> +ICC_CTLR_EL1_PRIBITS_SHIFT ) +1 ; + +switch (num_pri_bits) { +case 7 : + reg64 = c->icc_apr[GICV3_G0 ][3 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +3 , reg64); + reg64 = c->icc_apr[GICV3_G0 ][2 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +2 , reg64); +/* fall through */ +case 6 : + reg64 = c->icc_apr[GICV3_G0 ][1 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +1 , reg64); +/* fall through */ +default : + reg64 = c->icc_apr[GICV3_G0 ][0 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 , reg64); + } + +switch (num_pri_bits) { +case 7 : + reg64 = c->icc_apr[GICV3_G1NS ][3 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +3 , reg64); + reg64 = c->icc_apr[GICV3_G1NS ][2 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +2 , reg64); +/* fall through */ +case 6 : + reg64 = c->icc_apr[GICV3_G1NS ][1 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +1 , reg64); +/* fall through */ +default : + reg64 = c->icc_apr[GICV3_G1NS ][0 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 , reg64); + } + +/* Registers beyond this point are with nested virt only */ +if (c->gic->maint_irq) { +hvf_gicv3_put_cpu_el2 (cpu_state, arg); + } +} + +static void hvf_gicv3_put (GICv3State *s) +{ +uint32_t reg; +int ncpu, i; + +hvf_gicv3_check (s); + + reg = s->gicd_ctlr; +hv_gic_set_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_CTLR , reg); + +/* per-CPU state */ + +for (ncpu =0 ; ncpu < s->num_cpu; ncpu++) { +run_on_cpu_data data; + data.host_ptr = &s->cpu[ncpu]; +run_on_cpu (s->cpu[ncpu].cpu, hvf_gicv3_put_cpu, data); + } + +/* s->enable bitmap -> GICD_ISENABLERn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0 + ,HV_GIC_DISTRIBUTOR_REG_GICD_ICENABLER0 , s->enabled); + +/* s->group bitmap -> GICD_IGROUPRn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0 + ,0 , s->group); + +/* Restore targets before pending to ensure the pending state is set on +* the appropriate CPU interfaces in the kernel +*/ + +/* s->gicd_irouter[irq] -> GICD_IROUTERn */ +for (i =GIC_INTERNAL ; i < s->num_irq; i++) { +uint32_t offset =HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + (8 * i) + - (8 *GIC_INTERNAL ); +hv_gic_set_distributor_reg (offset, s->gicd_irouter[i]); + } + +/* +* s->trigger bitmap -> GICD_ICFGRn +* (restore configuration registers before pending IRQs so we treat +* level/edge correctly) +*/ +hvf_dist_put_edge_trigger (s,HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0 , s->edge_trigger); + +/* s->pending bitmap -> GICD_ISPENDRn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0 , +HV_GIC_DISTRIBUTOR_REG_GICD_ICPENDR0 , s->pending); + +/* s->active bitmap -> GICD_ISACTIVERn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0 , +HV_GIC_DISTRIBUTOR_REG_GICD_ICACTIVER0 , s->active); + +/* s->gicd_ipriority[] -> GICD_IPRIORITYRn */ +hvf_dist_put_priority (s,HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0 , s->gicd_ipriority); +} + +static void hvf_gicv3_get_cpu_el2 (CPUState *cpu_state,run_on_cpu_data arg) +{ +int num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_VMCR_EL2 , &c->ich_vmcr_el2); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_HCR_EL2 , &c->ich_hcr_el2); + +for (int i =0 ; i <GICV3_LR_MAX ; i++) { +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_LR0_EL2 , &c->ich_lr_el2[i]); + } + + num_pri_bits = c->vpribits; + +switch (num_pri_bits) { +case 7 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +3 , + &c->ich_apr[GICV3_G0 ][3 ]); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +2 , + &c->ich_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +1 , + &c->ich_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 , + &c->ich_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +3 , + &c->ich_apr[GICV3_G1NS ][3 ]); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +2 , + &c->ich_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +1 , + &c->ich_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 , + &c->ich_apr[GICV3_G1NS ][0 ]); + } +} + +static void hvf_gicv3_get_cpu (CPUState *cpu_state,run_on_cpu_data arg) +{ +uint64_t reg; +int i, num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , + ®); + c->gicr_igroupr0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISENABLER0 , + ®); + c->gicr_ienabler0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR1 , + ®); + c->edge_trigger =half_unshuffle32 (reg >>1 ) <<16 ; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISPENDR0 , + ®); + c->gicr_ipendr0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISACTIVER0 , + ®); + c->gicr_iactiver0 = reg; + +for (i =0 ; i <GIC_INTERNAL ; i +=4 ) { +hv_gic_get_redistributor_reg ( + vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, ®); + c->gicr_ipriorityr[i] =extract32 (reg,0 ,8 ); + c->gicr_ipriorityr[i +1 ] =extract32 (reg,8 ,8 ); + c->gicr_ipriorityr[i +2 ] =extract32 (reg,16 ,8 ); + c->gicr_ipriorityr[i +3 ] =extract32 (reg,24 ,8 ); + } + +/* CPU interface */ +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_SRE_EL1 , &c->icc_sre_el1); + +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_CTLR_EL1 , + &c->icc_ctlr_el1[GICV3_NS ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN0_EL1 , + &c->icc_igrpen[GICV3_G0 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN1_EL1 , + &c->icc_igrpen[GICV3_G1NS ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_PMR_EL1 , &c->icc_pmr_el1); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_BPR0_EL1 , &c->icc_bpr[GICV3_G0 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_BPR1_EL1 , &c->icc_bpr[GICV3_G1NS ]); + num_pri_bits = ((c->icc_ctlr_el1[GICV3_NS ] &ICC_CTLR_EL1_PRIBITS_MASK ) >> +ICC_CTLR_EL1_PRIBITS_SHIFT ) + +1 ; + +switch (num_pri_bits) { +case 7 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +3 , + &c->icc_apr[GICV3_G0 ][3 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +2 , + &c->icc_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +1 , + &c->icc_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 , + &c->icc_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +3 , + &c->icc_apr[GICV3_G1NS ][3 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +2 , + &c->icc_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +1 , + &c->icc_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 , + &c->icc_apr[GICV3_G1NS ][0 ]); + } + +/* Registers beyond this point are with nested virt only */ +if (c->gic->maint_irq) { +hvf_gicv3_get_cpu_el2 (cpu_state, arg); + } +} + +static void hvf_gicv3_get (GICv3State *s) +{ +uint64_t reg; +int ncpu, i; + +hvf_gicv3_check (s); + +hv_gic_get_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_CTLR , ®); + s->gicd_ctlr = reg; + +/* Redistributor state (one per CPU) */ + +for (ncpu =0 ; ncpu < s->num_cpu; ncpu++) { +run_on_cpu_data data; + data.host_ptr = &s->cpu[ncpu]; +run_on_cpu (s->cpu[ncpu].cpu, hvf_gicv3_get_cpu, data); + } + +/* GICD_IGROUPRn -> s->group bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0 , s->group); + +/* GICD_ISENABLERn -> s->enabled bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0 , s->enabled); + +/* GICD_ISPENDRn -> s->pending bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0 , s->pending); + +/* GICD_ISACTIVERn -> s->active bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0 , s->active); + +/* GICD_ICFGRn -> s->trigger bitmap */ +hvf_dist_get_edge_trigger (s,HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0 + , s->edge_trigger); + +/* GICD_IPRIORITYRn -> s->gicd_ipriority[] */ +hvf_dist_get_priority (s,HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0 + , s->gicd_ipriority); + +/* GICD_IROUTERn -> s->gicd_irouter[irq] */ +for (i =GIC_INTERNAL ; i < s->num_irq; i++) { +uint32_t offset =HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + + (8 * i) - (8 *GIC_INTERNAL ); +hv_gic_get_distributor_reg (offset, &s->gicd_irouter[i]); + } +} + +static void hvf_gicv3_set_irq (void *opaque,int irq,int level) +{ +GICv3State *s = opaque; +if (irq > s->num_irq) { +return ; + } +hv_gic_set_spi (GIC_INTERNAL + irq, !!level); +} + +static void hvf_gicv3_icc_reset (CPUARMState *env,const ARMCPRegInfo *ri) +{ +GICv3CPUState *c; + + c = env->gicv3state; + c->icc_pmr_el1 =0 ; +/* +* Architecturally the reset value of the ICC_BPR registers +* is UNKNOWN. We set them all to 0 here; when the kernel +* uses these values to program the ICH_VMCR_EL2 fields that +* determine the guest-visible ICC_BPR register values, the +* hardware's "writing a value less than the minimum sets +* the field to the minimum value" behaviour will result in +* them effectively resetting to the correct minimum value +* for the host GIC. +*/ + c->icc_bpr[GICV3_G0 ] =0 ; + c->icc_bpr[GICV3_G1 ] =0 ; + c->icc_bpr[GICV3_G1NS ] =0 ; + + c->icc_sre_el1 =0x7 ; +memset (c->icc_apr,0 ,sizeof (c->icc_apr)); +memset (c->icc_igrpen,0 ,sizeof (c->icc_igrpen)); +} + +static void hvf_gicv3_reset_hold (Object *obj,ResetType type) +{ +GICv3State *s =ARM_GICV3_COMMON (obj); +HVFARMGICv3Class *kgc =HVF_GICV3_GET_CLASS (s); + +if (kgc->parent_phases.hold) { + kgc->parent_phases.hold (obj, type); + } + +hvf_gicv3_put (s); +} + + +/* +* CPU interface registers of GIC needs to be reset on CPU reset. +* For the calling arm_gicv3_icc_reset() on CPU reset, we register +* below ARMCPRegInfo. As we reset the whole cpu interface under single +* register reset, we define only one register of CPU interface instead +* of defining all the registers. +*/ +static const ARMCPRegInfo gicv3_cpuif_reginfo[] = { + { .name ="ICC_CTLR_EL1" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =0 , .crn =12 , .crm =12 , .opc2 =4 , +/* +* If ARM_CP_NOP is used, resetfn is not called, +* So ARM_CP_NO_RAW is appropriate type. +*/ + .type =ARM_CP_NO_RAW , + .access =PL1_RW , + .readfn = arm_cp_read_zero, + .writefn = arm_cp_write_ignore, +/* +* We hang the whole cpu interface reset routine off here +* rather than parcelling it out into one little function +* per register +*/ + .resetfn = hvf_gicv3_icc_reset, + }, +}; + +static void hvf_gicv3_realize (DeviceState *dev,Error **errp) +{ +ERRP_GUARD (); +GICv3State *s =HVF_GICV3 (dev); +HVFARMGICv3Class *kgc =HVF_GICV3_GET_CLASS (s); +int i; + + kgc->parent_realize (dev, errp); +if (*errp) { +return ; + } + +if (s->revision !=3 ) { +error_setg (errp,"unsupported GIC revision %d for platform GIC" , + s->revision); + } + +if (s->security_extn) { +error_setg (errp,"the platform vGICv3 does not implement the " +"security extensions" ); +return ; + } + +if (s->nmi_support) { +error_setg (errp,"NMI is not supported with the platform GIC" ); +return ; + } + +if (s->nb_redist_regions >1 ) { +error_setg (errp,"Multiple VGICv3 redistributor regions are not " +"supported by HVF" ); +error_append_hint (errp,"A maximum of %d VCPUs can be used" , + s->redist_region_count[0 ]); +return ; + } + +gicv3_init_irqs_and_mmio (s, hvf_gicv3_set_irq,NULL ); + +for (i =0 ; i < s->num_cpu; i++) { +ARMCPU *cpu =ARM_CPU (qemu_get_cpu (i)); + +define_arm_cp_regs (cpu, gicv3_cpuif_reginfo); + } + +if (s->maint_irq && s->maint_irq !=HV_GIC_INT_MAINTENANCE ) { +error_setg (errp,"vGIC maintenance IRQ mismatch with the hardcoded one in HVF." ); +return ; + } +} + +static void hvf_gicv3_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass); +ARMGICv3CommonClass *agcc =ARM_GICV3_COMMON_CLASS (klass); +HVFARMGICv3Class *kgc =HVF_GICV3_CLASS (klass); + + agcc->pre_save = hvf_gicv3_get; + agcc->post_load = hvf_gicv3_put; + +device_class_set_parent_realize (dc, hvf_gicv3_realize, + &kgc->parent_realize); +resettable_class_set_parent_phases (rc,NULL , hvf_gicv3_reset_hold,NULL , + &kgc->parent_phases); +} + +static const TypeInfo hvf_arm_gicv3_info = { + .name =TYPE_HVF_GICV3 , + .parent =TYPE_ARM_GICV3_COMMON , + .instance_size =sizeof (GICv3State), + .class_init = hvf_gicv3_class_init, + .class_size =sizeof (HVFARMGICv3Class), +}; + +static void hvf_gicv3_register_types (void ) +{ +type_register_static (&hvf_arm_gicv3_info); +} + +type_init(hvf_gicv3_register_types) + +#pragma clang diagnostic pop
hw/intc/meson.build +1 -0
@@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
include/hw/intc/arm_gicv3_common.h +1 -0
@@ -315,6 +315,7 @@ DECLARE_OBJ_CHECKERS(GICv3State, ARMGICv3CommonClass,/* Types for GICv3 kernel-irqchip */ #define TYPE_WHPX_GICV3 "whpx-arm-gicv3" +#define TYPE_HVF_GICV3 "hvf-arm-gicv3"struct ARMGICv3CommonClass {/*< private >*/
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 01/15] hw/intc: Add hvf vGIC interrupt controller support
Quoted 5 lines · Mohamed Mediouni
This opens up the door to nested virtualisation support.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
Not familiar with nested virt, but I took a look through the code and overall LGTM, left a few comments inline.
Feel free to add my r-b regardless of whether you address them since they are nitpicking:
Quoted 29 lines
hw/intc/arm_gicv3_hvf.c | 741 +++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 1 + 3 files changed, 743 insertions(+)create mode 100644
hw/intc/arm_gicv3_hvf.chw/intc/arm_gicv3_hvf.c new file +17
-0@@ -0,0 +1,741 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* ARM Generic Interrupt Controller using HVF platform support +* +* Copyright (c) 2025 Mohamed Mediouni +* Based on vGICv3 KVM code by Pavel Fedin +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/intc/arm_gicv3_common.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "system/runstate.h" +#include "system/hvf.h" +#include "system/hvf_int.h"
hw/intc/arm_gicv3_hvf.c line 27
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+#include "hvf_arm.h" +#include "gicv3_internal.h" +#include "vgic_common.h" +#include "qom/object.h" +#include "target/arm/cpregs.h" +#include <Hypervisor/Hypervisor.h> + +/* For the GIC, override the check outright, as availability is checked elsewhere. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability"
Question: is this necessary/the only way or just a quick workaround?
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+ +struct HVFARMGICv3Class { +ARMGICv3CommonClass parent_class; +DeviceRealize parent_realize; +ResettablePhases parent_phases; +}; + +typedef struct HVFARMGICv3Class HVFARMGICv3Class ; + +/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */
hw/intc/arm_gicv3_hvf.c line 47
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+DECLARE_OBJ_CHECKERS (GICv3State, HVFARMGICv3Class, +HVF_GICV3 ,TYPE_HVF_GICV3 ); + +/* +* Loop through each distributor IRQ related register; since bits +* corresponding to SPIs and PPIs are RAZ/WI when affinity routing +* is enabled, we skip those. +*/ +#define for_each_dist_irq_reg (_irq, _max, _field_width) \ + for (_irq = GIC_INTERNAL; _irq < _max; _irq += (32 / _field_width))
Nit: _max and _field_width should be enclosed in parentheses since this is a macro
hw/intc/arm_gicv3_hvf.c line 52
Quoted 5 lines
hw/intc/arm_gicv3_hvf.c new file +5
-0+ +/* +* Wrap calls to the vGIC APIs to assert_hvf_ok() +* as a macro to keep the code clean. +*/
Suggestion, not a request: I like seeing the assert inline when reading code instead of indirection :)
Quoted 16 lines
hw/intc/arm_gicv3_hvf.c new file +16
-0+#define hv_gic_get_distributor_reg (offset, reg) \ + assert_hvf_ok(hv_gic_get_distributor_reg(offset, reg)) + +#define hv_gic_set_distributor_reg (offset, reg) \ + assert_hvf_ok(hv_gic_set_distributor_reg(offset, reg)) + +#define hv_gic_get_redistributor_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_set_redistributor_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_redistributor_reg(vcpu, reg, value)) + +#define hv_gic_get_icc_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_icc_reg(vcpu, reg, value)) + +#define hv_gic_set_icc_reg (vcpu, reg, value) \
hw/intc/arm_gicv3_hvf.c line 78
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+ assert_hvf_ok(hv_gic_set_icc_reg(vcpu, reg, value)) + +#define hv_gic_get_ich_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_get_ich_reg(vcpu, reg, value)) + +#define hv_gic_set_ich_reg (vcpu, reg, value) \ + assert_hvf_ok(hv_gic_set_ich_reg(vcpu, reg, value)) + +static void hvf_dist_get_priority (GICv3State *s,hv_gic_distributor_reg_t offset + ,uint8_t *bmp)
Not sure if it's email formatting or code formatting, but that starting comma seems out of place (ditto in the next function)
Quoted 63 lines
hw/intc/arm_gicv3_hvf.c new file +63
-0+{ +uint64_t reg; +uint32_t *field; +int irq; + field = (uint32_t *)(bmp); + +for_each_dist_irq_reg (irq, s->num_irq,8 ) { +hv_gic_get_distributor_reg (offset, ®); + *field = reg; + offset +=4 ; + field++; + } +} + +static void hvf_dist_put_priority (GICv3State *s,hv_gic_distributor_reg_t offset + ,uint8_t *bmp) +{ +uint32_t reg, *field; +int irq; + field = (uint32_t *)(bmp); + +for_each_dist_irq_reg (irq, s->num_irq,8 ) { + reg = *field; +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + field++; + } +} + +static void hvf_dist_get_edge_trigger (GICv3State *s,hv_gic_distributor_reg_t offset, +uint32_t *bmp) +{ +uint64_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,2 ) { +hv_gic_get_distributor_reg (offset, ®); + reg =half_unshuffle32 (reg >>1 ); +if (irq %32 !=0 ) { + reg = (reg <<16 ); + } + *gic_bmp_ptr32 (bmp, irq) |= reg; + offset +=4 ; + } +} + +static void hvf_dist_put_edge_trigger (GICv3State *s,hv_gic_distributor_reg_t offset, +uint32_t *bmp) +{ +uint32_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,2 ) { + reg = *gic_bmp_ptr32 (bmp, irq); +if (irq %32 !=0 ) { + reg = (reg &0xffff0000 ) >>16 ; + }else { + reg = reg &0xffff ; + } + reg =half_shuffle32 (reg) <<1 ; +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + }
hw/intc/arm_gicv3_hvf.c line 151
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+} + +/* Read a bitmap register group from the kernel VGIC. */ +static void hvf_dist_getbmp (GICv3State *s,hv_gic_distributor_reg_t offset,uint32_t *bmp) +{ +uint64_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,1 ) { +
Stray line
Quoted 205 lines
hw/intc/arm_gicv3_hvf.c new file +205
-0+hv_gic_get_distributor_reg (offset, ®); + *gic_bmp_ptr32 (bmp, irq) = reg; + offset +=4 ; + } +} + +static void hvf_dist_putbmp (GICv3State *s,hv_gic_distributor_reg_t offset, +hv_gic_distributor_reg_t clroffset,uint32_t *bmp) +{ +uint32_t reg; +int irq; + +for_each_dist_irq_reg (irq, s->num_irq,1 ) { +/* +* If this bitmap is a set/clear register pair, first write to the +* clear-reg to clear all bits before using the set-reg to write +* the 1 bits. +*/ +if (clroffset !=0 ) { + reg =0 ; +hv_gic_set_distributor_reg (clroffset, reg); + clroffset +=4 ; + } + reg = *gic_bmp_ptr32 (bmp, irq); +hv_gic_set_distributor_reg (offset, reg); + offset +=4 ; + } +} + +static void hvf_gicv3_check (GICv3State *s) +{ +uint64_t reg; +uint32_t num_irq; + +/* Sanity checking s->num_irq */ +hv_gic_get_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_TYPER , ®); + num_irq = ((reg &0x1f ) +1 ) *32 ; + +if (num_irq < s->num_irq) { +error_report ("Model requests %u IRQs, but HVF supports max %u" , + s->num_irq, num_irq); +abort (); + } +} + +static void hvf_gicv3_put_cpu_el2 (CPUState *cpu_state,run_on_cpu_data arg) +{ +int num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_VMCR_EL2 , c->ich_vmcr_el2); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_HCR_EL2 , c->ich_hcr_el2); + +for (int i =0 ; i <GICV3_LR_MAX ; i++) { +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_LR0_EL2 , c->ich_lr_el2[i]); + } + + num_pri_bits = c->vpribits; + +switch (num_pri_bits) { +case 7 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +3 , + c->ich_apr[GICV3_G0 ][3 ]); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +2 , + c->ich_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +1 , + c->ich_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 , + c->ich_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +3 , + c->ich_apr[GICV3_G1NS ][3 ]); +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +2 , + c->ich_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +1 , + c->ich_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_set_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 , + c->ich_apr[GICV3_G1NS ][0 ]); + } +} + +static void hvf_gicv3_put_cpu (CPUState *cpu_state,run_on_cpu_data arg) +{ +uint32_t reg; +uint64_t reg64; +int i, num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + + reg = c->gicr_waker; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , reg); + + reg = c->gicr_igroupr0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICENABLER0 , reg); + reg = c->gicr_ienabler0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISENABLER0 , reg); + +/* Restore config before pending so we treat level/edge correctly */ + reg =half_shuffle32 (c->edge_trigger >>16 ) <<1 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR1 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICPENDR0 , reg); + reg = c->gicr_ipendr0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISPENDR0 , reg); + + reg = ~0 ; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICACTIVER0 , reg); + reg = c->gicr_iactiver0; +hv_gic_set_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISACTIVER0 , reg); + +for (i =0 ; i <GIC_INTERNAL ; i +=4 ) { + reg = c->gicr_ipriorityr[i] | + (c->gicr_ipriorityr[i +1 ] <<8 ) | + (c->gicr_ipriorityr[i +2 ] <<16 ) | + (c->gicr_ipriorityr[i +3 ] <<24 ); +hv_gic_set_redistributor_reg (vcpu, +HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, reg); + } + +/* CPU interface state */ +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_SRE_EL1 , c->icc_sre_el1); + +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_CTLR_EL1 , + c->icc_ctlr_el1[GICV3_NS ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN0_EL1 , + c->icc_igrpen[GICV3_G0 ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN1_EL1 , + c->icc_igrpen[GICV3_G1NS ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_PMR_EL1 , c->icc_pmr_el1); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_BPR0_EL1 , c->icc_bpr[GICV3_G0 ]); +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_BPR1_EL1 , c->icc_bpr[GICV3_G1NS ]); + + num_pri_bits = ((c->icc_ctlr_el1[GICV3_NS ] & +ICC_CTLR_EL1_PRIBITS_MASK ) >> +ICC_CTLR_EL1_PRIBITS_SHIFT ) +1 ; + +switch (num_pri_bits) { +case 7 : + reg64 = c->icc_apr[GICV3_G0 ][3 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +3 , reg64); + reg64 = c->icc_apr[GICV3_G0 ][2 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +2 , reg64); +/* fall through */ +case 6 : + reg64 = c->icc_apr[GICV3_G0 ][1 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +1 , reg64); +/* fall through */ +default : + reg64 = c->icc_apr[GICV3_G0 ][0 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 , reg64); + } + +switch (num_pri_bits) { +case 7 : + reg64 = c->icc_apr[GICV3_G1NS ][3 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +3 , reg64); + reg64 = c->icc_apr[GICV3_G1NS ][2 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +2 , reg64); +/* fall through */ +case 6 : + reg64 = c->icc_apr[GICV3_G1NS ][1 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +1 , reg64); +/* fall through */ +default : + reg64 = c->icc_apr[GICV3_G1NS ][0 ]; +hv_gic_set_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 , reg64); + } + +/* Registers beyond this point are with nested virt only */ +if (c->gic->maint_irq) { +hvf_gicv3_put_cpu_el2 (cpu_state, arg); + } +} + +static void hvf_gicv3_put (GICv3State *s) +{ +uint32_t reg; +int ncpu, i; + +hvf_gicv3_check (s); + + reg = s->gicd_ctlr; +hv_gic_set_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_CTLR , reg); + +/* per-CPU state */
hw/intc/arm_gicv3_hvf.c line 366
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c new file +10
-0+ +for (ncpu =0 ; ncpu < s->num_cpu; ncpu++) { +run_on_cpu_data data; + data.host_ptr = &s->cpu[ncpu]; +run_on_cpu (s->cpu[ncpu].cpu, hvf_gicv3_put_cpu, data); + } + +/* s->enable bitmap -> GICD_ISENABLERn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0 + ,HV_GIC_DISTRIBUTOR_REG_GICD_ICENABLER0 , s->enabled);
stray comma again
Quoted 403 lines
hw/intc/arm_gicv3_hvf.c new file +375
-0+ +/* s->group bitmap -> GICD_IGROUPRn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0 + ,0 , s->group); + +/* Restore targets before pending to ensure the pending state is set on +* the appropriate CPU interfaces in the kernel +*/ + +/* s->gicd_irouter[irq] -> GICD_IROUTERn */ +for (i =GIC_INTERNAL ; i < s->num_irq; i++) { +uint32_t offset =HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + (8 * i) + - (8 *GIC_INTERNAL ); +hv_gic_set_distributor_reg (offset, s->gicd_irouter[i]); + } + +/* +* s->trigger bitmap -> GICD_ICFGRn +* (restore configuration registers before pending IRQs so we treat +* level/edge correctly) +*/ +hvf_dist_put_edge_trigger (s,HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0 , s->edge_trigger); + +/* s->pending bitmap -> GICD_ISPENDRn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0 , +HV_GIC_DISTRIBUTOR_REG_GICD_ICPENDR0 , s->pending); + +/* s->active bitmap -> GICD_ISACTIVERn */ +hvf_dist_putbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0 , +HV_GIC_DISTRIBUTOR_REG_GICD_ICACTIVER0 , s->active); + +/* s->gicd_ipriority[] -> GICD_IPRIORITYRn */ +hvf_dist_put_priority (s,HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0 , s->gicd_ipriority); +} + +static void hvf_gicv3_get_cpu_el2 (CPUState *cpu_state,run_on_cpu_data arg) +{ +int num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_VMCR_EL2 , &c->ich_vmcr_el2); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_HCR_EL2 , &c->ich_hcr_el2); + +for (int i =0 ; i <GICV3_LR_MAX ; i++) { +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_LR0_EL2 , &c->ich_lr_el2[i]); + } + + num_pri_bits = c->vpribits; + +switch (num_pri_bits) { +case 7 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +3 , + &c->ich_apr[GICV3_G0 ][3 ]); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +2 , + &c->ich_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 +1 , + &c->ich_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP0R0_EL2 , + &c->ich_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +3 , + &c->ich_apr[GICV3_G1NS ][3 ]); +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +2 , + &c->ich_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 +1 , + &c->ich_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_get_ich_reg (vcpu,HV_GIC_ICH_REG_AP1R0_EL2 , + &c->ich_apr[GICV3_G1NS ][0 ]); + } +} + +static void hvf_gicv3_get_cpu (CPUState *cpu_state,run_on_cpu_data arg) +{ +uint64_t reg; +int i, num_pri_bits; + +/* Redistributor state */ +GICv3CPUState *c = arg.host_ptr; +hv_vcpu_t vcpu = c->cpu->accel->fd; + +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IGROUPR0 , + ®); + c->gicr_igroupr0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISENABLER0 , + ®); + c->gicr_ienabler0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ICFGR1 , + ®); + c->edge_trigger =half_unshuffle32 (reg >>1 ) <<16 ; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISPENDR0 , + ®); + c->gicr_ipendr0 = reg; +hv_gic_get_redistributor_reg (vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_ISACTIVER0 , + ®); + c->gicr_iactiver0 = reg; + +for (i =0 ; i <GIC_INTERNAL ; i +=4 ) { +hv_gic_get_redistributor_reg ( + vcpu,HV_GIC_REDISTRIBUTOR_REG_GICR_IPRIORITYR0 + i, ®); + c->gicr_ipriorityr[i] =extract32 (reg,0 ,8 ); + c->gicr_ipriorityr[i +1 ] =extract32 (reg,8 ,8 ); + c->gicr_ipriorityr[i +2 ] =extract32 (reg,16 ,8 ); + c->gicr_ipriorityr[i +3 ] =extract32 (reg,24 ,8 ); + } + +/* CPU interface */ +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_SRE_EL1 , &c->icc_sre_el1); + +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_CTLR_EL1 , + &c->icc_ctlr_el1[GICV3_NS ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN0_EL1 , + &c->icc_igrpen[GICV3_G0 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_IGRPEN1_EL1 , + &c->icc_igrpen[GICV3_G1NS ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_PMR_EL1 , &c->icc_pmr_el1); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_BPR0_EL1 , &c->icc_bpr[GICV3_G0 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_BPR1_EL1 , &c->icc_bpr[GICV3_G1NS ]); + num_pri_bits = ((c->icc_ctlr_el1[GICV3_NS ] &ICC_CTLR_EL1_PRIBITS_MASK ) >> +ICC_CTLR_EL1_PRIBITS_SHIFT ) + +1 ; + +switch (num_pri_bits) { +case 7 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +3 , + &c->icc_apr[GICV3_G0 ][3 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +2 , + &c->icc_apr[GICV3_G0 ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 +1 , + &c->icc_apr[GICV3_G0 ][1 ]); +/* fall through */ +default : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP0R0_EL1 , + &c->icc_apr[GICV3_G0 ][0 ]); + } + +switch (num_pri_bits) { +case 7 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +3 , + &c->icc_apr[GICV3_G1NS ][3 ]); +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +2 , + &c->icc_apr[GICV3_G1NS ][2 ]); +/* fall through */ +case 6 : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 +1 , + &c->icc_apr[GICV3_G1NS ][1 ]); +/* fall through */ +default : +hv_gic_get_icc_reg (vcpu,HV_GIC_ICC_REG_AP1R0_EL1 , + &c->icc_apr[GICV3_G1NS ][0 ]); + } + +/* Registers beyond this point are with nested virt only */ +if (c->gic->maint_irq) { +hvf_gicv3_get_cpu_el2 (cpu_state, arg); + } +} + +static void hvf_gicv3_get (GICv3State *s) +{ +uint64_t reg; +int ncpu, i; + +hvf_gicv3_check (s); + +hv_gic_get_distributor_reg (HV_GIC_DISTRIBUTOR_REG_GICD_CTLR , ®); + s->gicd_ctlr = reg; + +/* Redistributor state (one per CPU) */ + +for (ncpu =0 ; ncpu < s->num_cpu; ncpu++) { +run_on_cpu_data data; + data.host_ptr = &s->cpu[ncpu]; +run_on_cpu (s->cpu[ncpu].cpu, hvf_gicv3_get_cpu, data); + } + +/* GICD_IGROUPRn -> s->group bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_IGROUPR0 , s->group); + +/* GICD_ISENABLERn -> s->enabled bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISENABLER0 , s->enabled); + +/* GICD_ISPENDRn -> s->pending bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISPENDR0 , s->pending); + +/* GICD_ISACTIVERn -> s->active bitmap */ +hvf_dist_getbmp (s,HV_GIC_DISTRIBUTOR_REG_GICD_ISACTIVER0 , s->active); + +/* GICD_ICFGRn -> s->trigger bitmap */ +hvf_dist_get_edge_trigger (s,HV_GIC_DISTRIBUTOR_REG_GICD_ICFGR0 + , s->edge_trigger); + +/* GICD_IPRIORITYRn -> s->gicd_ipriority[] */ +hvf_dist_get_priority (s,HV_GIC_DISTRIBUTOR_REG_GICD_IPRIORITYR0 + , s->gicd_ipriority); + +/* GICD_IROUTERn -> s->gicd_irouter[irq] */ +for (i =GIC_INTERNAL ; i < s->num_irq; i++) { +uint32_t offset =HV_GIC_DISTRIBUTOR_REG_GICD_IROUTER32 + + (8 * i) - (8 *GIC_INTERNAL ); +hv_gic_get_distributor_reg (offset, &s->gicd_irouter[i]); + } +} + +static void hvf_gicv3_set_irq (void *opaque,int irq,int level) +{ +GICv3State *s = opaque; +if (irq > s->num_irq) { +return ; + } +hv_gic_set_spi (GIC_INTERNAL + irq, !!level); +} + +static void hvf_gicv3_icc_reset (CPUARMState *env,const ARMCPRegInfo *ri) +{ +GICv3CPUState *c; + + c = env->gicv3state; + c->icc_pmr_el1 =0 ; +/* +* Architecturally the reset value of the ICC_BPR registers +* is UNKNOWN. We set them all to 0 here; when the kernel +* uses these values to program the ICH_VMCR_EL2 fields that +* determine the guest-visible ICC_BPR register values, the +* hardware's "writing a value less than the minimum sets +* the field to the minimum value" behaviour will result in +* them effectively resetting to the correct minimum value +* for the host GIC. +*/ + c->icc_bpr[GICV3_G0 ] =0 ; + c->icc_bpr[GICV3_G1 ] =0 ; + c->icc_bpr[GICV3_G1NS ] =0 ; + + c->icc_sre_el1 =0x7 ; +memset (c->icc_apr,0 ,sizeof (c->icc_apr)); +memset (c->icc_igrpen,0 ,sizeof (c->icc_igrpen)); +} + +static void hvf_gicv3_reset_hold (Object *obj,ResetType type) +{ +GICv3State *s =ARM_GICV3_COMMON (obj); +HVFARMGICv3Class *kgc =HVF_GICV3_GET_CLASS (s); + +if (kgc->parent_phases.hold) { + kgc->parent_phases.hold (obj, type); + } + +hvf_gicv3_put (s); +} + + +/* +* CPU interface registers of GIC needs to be reset on CPU reset. +* For the calling arm_gicv3_icc_reset() on CPU reset, we register +* below ARMCPRegInfo. As we reset the whole cpu interface under single +* register reset, we define only one register of CPU interface instead +* of defining all the registers. +*/ +static const ARMCPRegInfo gicv3_cpuif_reginfo[] = { + { .name ="ICC_CTLR_EL1" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =0 , .crn =12 , .crm =12 , .opc2 =4 , +/* +* If ARM_CP_NOP is used, resetfn is not called, +* So ARM_CP_NO_RAW is appropriate type. +*/ + .type =ARM_CP_NO_RAW , + .access =PL1_RW , + .readfn = arm_cp_read_zero, + .writefn = arm_cp_write_ignore, +/* +* We hang the whole cpu interface reset routine off here +* rather than parcelling it out into one little function +* per register +*/ + .resetfn = hvf_gicv3_icc_reset, + }, +}; + +static void hvf_gicv3_realize (DeviceState *dev,Error **errp) +{ +ERRP_GUARD (); +GICv3State *s =HVF_GICV3 (dev); +HVFARMGICv3Class *kgc =HVF_GICV3_GET_CLASS (s); +int i; + + kgc->parent_realize (dev, errp); +if (*errp) { +return ; + } + +if (s->revision !=3 ) { +error_setg (errp,"unsupported GIC revision %d for platform GIC" , + s->revision); + } + +if (s->security_extn) { +error_setg (errp,"the platform vGICv3 does not implement the " +"security extensions" ); +return ; + } + +if (s->nmi_support) { +error_setg (errp,"NMI is not supported with the platform GIC" ); +return ; + } + +if (s->nb_redist_regions >1 ) { +error_setg (errp,"Multiple VGICv3 redistributor regions are not " +"supported by HVF" ); +error_append_hint (errp,"A maximum of %d VCPUs can be used" , + s->redist_region_count[0 ]); +return ; + } + +gicv3_init_irqs_and_mmio (s, hvf_gicv3_set_irq,NULL ); + +for (i =0 ; i < s->num_cpu; i++) { +ARMCPU *cpu =ARM_CPU (qemu_get_cpu (i)); + +define_arm_cp_regs (cpu, gicv3_cpuif_reginfo); + } + +if (s->maint_irq && s->maint_irq !=HV_GIC_INT_MAINTENANCE ) { +error_setg (errp,"vGIC maintenance IRQ mismatch with the hardcoded one in HVF." ); +return ; + } +} + +static void hvf_gicv3_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass); +ARMGICv3CommonClass *agcc =ARM_GICV3_COMMON_CLASS (klass); +HVFARMGICv3Class *kgc =HVF_GICV3_CLASS (klass); + + agcc->pre_save = hvf_gicv3_get; + agcc->post_load = hvf_gicv3_put; + +device_class_set_parent_realize (dc, hvf_gicv3_realize, + &kgc->parent_realize); +resettable_class_set_parent_phases (rc,NULL , hvf_gicv3_reset_hold,NULL , + &kgc->parent_phases); +} + +static const TypeInfo hvf_arm_gicv3_info = { + .name =TYPE_HVF_GICV3 , + .parent =TYPE_ARM_GICV3_COMMON , + .instance_size =sizeof (GICv3State), + .class_init = hvf_gicv3_class_init, + .class_size =sizeof (HVFARMGICv3Class), +}; + +static void hvf_gicv3_register_types (void ) +{ +type_register_static (&hvf_arm_gicv3_info); +} + +type_init(hvf_gicv3_register_types) + +#pragma clang diagnostic pophw/intc/meson.build +1
-0@@ -42,6 +42,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))include/hw/intc/arm_gicv3_common.h +1
-0@@ -315,6 +315,7 @@ DECLARE_OBJ_CHECKERS(GICv3State, ARMGICv3CommonClass,/* Types for GICv3 kernel-irqchip */ #define TYPE_WHPX_GICV3 "whpx-arm-gicv3" +#define TYPE_HVF_GICV3 "hvf-arm-gicv3"struct ARMGICv3CommonClass {/*< private >*/ Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 2/15 hw/intc: arm_gicv3_hvf: save/restore Apple GIC state
In reply to Mohamed MediouniOn HVF, some of the GIC state is in an opaque Apple-provided structure.
Save/restore that state to be able to save/restore VMs that use the hardware GIC.
--- hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_hvf.c | 95 ++++++++++++++++++++++++++++-- hw/intc/arm_gicv3_hvf_stub.c | 25 ++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 hw/intc/arm_gicv3_hvf_stub.c
hw/intc/arm_gicv3_common.c +1 -0
@@ -305,6 +305,7 @@ static const VMStateDescription vmstate_gicv3 = { .subsections = (const VMStateDescription * const []) { &vmstate_gicv3_gicd_no_migration_shift_bug, &vmstate_gicv3_gicd_nmi, + &vmstate_gicv3_hvf,NULL } };
hw/intc/arm_gicv3_hvf.c +91 -4
125 lines not on this page · raw message
hw/intc/arm_gicv3_hvf_stub.c new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* ARM Generic Interrupt Controller using HVF platform support stub +* +* Copyright (c) 2026 Mohamed Mediouni +* +*/ +#include "qemu/osdep.h" +#include "hw/intc/arm_gicv3_common.h" +#include "migration/vmstate.h" +#include "qemu/typedefs.h" + +static bool needed_never (void *opaque) +{ +return false; +} + +const VMStateDescription vmstate_gicv3_hvf = { + .name ="arm_gicv3/hvf_gic_state" , + .version_id =1 , + .minimum_version_id =1 , + .needed = needed_never, + .version_id =1 , + .minimum_version_id =1 , +};
hw/intc/meson.build +1 -0
@@ -43,6 +43,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files('arm_gicv3_hvf_stub.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
include/hw/intc/arm_gicv3_common.h +3 -0
@@ -339,4 +339,7 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_handler handler,*/ const char *gicv3_class_name (void ); +/* HVF vGIC-specific state: stubbed out on a build with HVF disabled */ +extern const VMStateDescription vmstate_gicv3_hvf; +#endif
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 02/15] hw/intc: arm_gicv3_hvf: save/restore Apple GIC state
Quoted 56 lines · Mohamed Mediouni
On HVF, some of the GIC state is in an opaque Apple-provided structure.
Save/restore that state to be able to save/restore VMs that use the hardware GIC.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_hvf.c | 95 ++++++++++++++++++++++++++++-- hw/intc/arm_gicv3_hvf_stub.c | 25 ++++++++ hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_common.h | 3 + 5 files changed, 121 insertions(+), 4 deletions(-)create mode 100644
hw/intc/arm_gicv3_hvf_stub.chw/intc/arm_gicv3_common.c +1
-0@@ -305,6 +305,7 @@ static const VMStateDescription vmstate_gicv3 = { .subsections = (const VMStateDescription * const []) { &vmstate_gicv3_gicd_no_migration_shift_bug, &vmstate_gicv3_gicd_nmi, + &vmstate_gicv3_hvf,NULL } };hw/intc/arm_gicv3_hvf.c +8
-2@@ -13,6 +13,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "system/runstate.h" +#include "migration/vmstate.h" #include "system/hvf.h" #include "system/hvf_int.h" #include "hvf_arm.h" @@ -34,8 +35,13 @@ struct HVFARMGICv3Class {typedef struct HVFARMGICv3Class HVFARMGICv3Class ; -/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ -DECLARE_OBJ_CHECKERS (GICv3State, HVFARMGICv3Class, +typedef struct HVFGICv3State { +GICv3State gicv3_state; +uint32_t size; +void *state; +}HVFGICv3State ; + +DECLARE_OBJ_CHECKERS (HVFGICv3State, HVFARMGICv3Class,HVF_GICV3 ,TYPE_HVF_GICV3 );/*
hw/intc/arm_gicv3_hvf.c static const ARMCPRegInfo gicv3_cpuif_reginfo[] = { · line 669
Quoted 5 lines
hw/intc/arm_gicv3_hvf.c +1
-1@@ -660,7 +666,7 @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {static void hvf_gicv3_realize (DeviceState *dev,Error **errp) {ERRP_GUARD (); -GICv3State *s =HVF_GICV3 (dev); +GICv3State *s = (GICv3State *)HVF_GICV3 (dev);
Nit: GICv3State *s = &HVF_GICV3(dev)->gicv3_state;
reads better and is checked
Quoted 26 lines
hw/intc/arm_gicv3_hvf.c +19
-0HVFARMGICv3Class *kgc =HVF_GICV3_GET_CLASS (s);int i;@@ -707,6 +713,87 @@ static void hvf_gicv3_realize(DeviceState *dev, Error **errp) } } +/* +* HVF doesn't have a way to save the RDIST pending tables +* to guest memory, only to an opaque data structure. +*/ +static bool gicv3_is_hvf (void *opaque) +{ +return hvf_enabled () &&hvf_irqchip_in_kernel (); +} + +static int hvf_gic_opaque_state_save (void *opaque) +{ +HVFGICv3State *gic = opaque; +hv_gic_state_t gic_state; +hv_return_t err; +size_t size; + + gic_state =hv_gic_state_create (); +if (gic_state ==NULL ) { +error_report ("hvf: vgic: failed to create hv_gic_state_create." );
hw/intc/arm_gicv3_hvf.c static void hvf_gicv3_realize(DeviceState *dev, Error **errp) · line 744
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c +10
-0+return 1 ; + } + err =hv_gic_state_get_size (gic_state, &size); + gic->size = size; +if (err !=HV_SUCCESS ) { +error_report ("hvf: vgic: failed to get GIC state size." ); +os_release (gic_state); +return 1 ; + } + gic->state =g_malloc (gic->size);
nit: use g_malloc0
Otherwise
Quoted 123 lines
hw/intc/arm_gicv3_hvf.c +53
-1+ err =hv_gic_state_get_data (gic_state, gic->state); +if (err !=HV_SUCCESS ) { +error_report ("hvf: vgic: failed to get GIC state." ); +os_release (gic_state); +return 1 ; + } + +os_release (gic_state); +return 0 ; +} + +static int hvf_gic_opaque_state_free (void *opaque) +{ +HVFGICv3State *gic = opaque; +free (gic->state); +return 0 ; +} + +static int hvf_gic_opaque_state_restore (void *opaque,int version_id) +{ +HVFGICv3State *gic = opaque; +hv_return_t err; +if (!gic->size) { +return 0 ; + } + err =hv_gic_set_state (gic->state, gic->size); +if (err !=HV_SUCCESS ) { +error_report ("hvf: vgic: failed to restore GIC state." ); +return 1 ; + } +return 0 ; +} + +const VMStateDescription vmstate_gicv3_hvf = { + .name ="arm_gicv3/hvf_gic_state" , + .version_id =1 , + .minimum_version_id =1 , + .needed = gicv3_is_hvf, + .pre_save = hvf_gic_opaque_state_save, + .post_save = hvf_gic_opaque_state_free, + .post_load = hvf_gic_opaque_state_restore, + .version_id =1 , + .minimum_version_id =1 , + .fields = (const VMStateField []) { +VMSTATE_UINT32 (size, HVFGICv3State), +VMSTATE_VBUFFER_ALLOC_UINT32 (state, + HVFGICv3State,0 ,0 , + size), +VMSTATE_END_OF_LIST () + }, +}; +static void hvf_gicv3_class_init (ObjectClass *klass,const void *data) {DeviceClass *dc =DEVICE_CLASS (klass);@@ -726,7 +813,7 @@ static void hvf_gicv3_class_init(ObjectClass *klass, const void *data)static const TypeInfo hvf_arm_gicv3_info = { .name =TYPE_HVF_GICV3 , .parent =TYPE_ARM_GICV3_COMMON , - .instance_size =sizeof (GICv3State), + .instance_size =sizeof (HVFGICv3State), .class_init = hvf_gicv3_class_init, .class_size =sizeof (HVFARMGICv3Class), };hw/intc/arm_gicv3_hvf_stub.c new file +25
-0@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* ARM Generic Interrupt Controller using HVF platform support stub +* +* Copyright (c) 2026 Mohamed Mediouni +* +*/ +#include "qemu/osdep.h" +#include "hw/intc/arm_gicv3_common.h" +#include "migration/vmstate.h" +#include "qemu/typedefs.h" + +static bool needed_never (void *opaque) +{ +return false; +} + +const VMStateDescription vmstate_gicv3_hvf = { + .name ="arm_gicv3/hvf_gic_state" , + .version_id =1 , + .minimum_version_id =1 , + .needed = needed_never, + .version_id =1 , + .minimum_version_id =1 , +};hw/intc/meson.build +1
-0@@ -43,6 +43,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) +specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files('arm_gicv3_hvf_stub.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))include/hw/intc/arm_gicv3_common.h +3
-0@@ -339,4 +339,7 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_handler handler,*/ const char *gicv3_class_name (void ); +/* HVF vGIC-specific state: stubbed out on a build with HVF disabled */ +extern const VMStateDescription vmstate_gicv3_hvf; +#endif Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 02/15] hw/intc: arm_gicv3_hvf: save/restore Apple GIC state
Quoted 31 lines · Manos Pitsidianakis
Quoted 30 lines · Mohamed Mediouni
On HVF, some of the GIC state is in an opaque Apple-provided structure.
Save/restore that state to be able to save/restore VMs that use the hardware GIC.
Signed-off-by Mohamed Mediouni <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_hvf.c | 95 ++++++++++++++++++++++++++++-- hw/intc/arm_gicv3_hvf_stub.c | 25 ++++++++ hw/intc/meson.build | 1 +include/hw/intc/arm_gicv3_common.h| 3 +5 files changed, 121 insertions(+), 4 deletions(-)create mode 100644
hw/intc/arm_gicv3_hvf_stub.chw/intc/arm_gicv3_hvf.c +1
-0@@ -13,6 +13,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "system/runstate.h" +#include "migration/vmstate.h" #include "system/hvf.h" #include "system/hvf_int.h" #include "hvf_arm.h" @@ -34,8 +35,13 @@ struct HVFARMGICv3Class {
Quoted 6 lines
hw/intc/arm_gicv3_hvf.c struct HVFARMGICv3Class { · line 39
Quoted 6 lines
hw/intc/arm_gicv3_hvf.c +2
-2typedef struct HVFARMGICv3Class HVFARMGICv3Class ; -/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ -DECLARE_OBJ_CHECKERS(GICv3State, HVFARMGICv3Class, +typedef struct HVFGICv3State { + GICv3State gicv3_state;
s/gicv3_state/parent_obj/
Quoted 7 lines
Quoted 7 lines
hw/intc/arm_gicv3_hvf.c +5
-0+ uint32_t size; + void *state; +} HVFGICv3State; + +DECLARE_OBJ_CHECKERS (HVFGICv3State, HVFARMGICv3Class, HVF_GICV3, TYPE_HVF_GICV3);
Quoted 10 lines
hw/intc/arm_gicv3_hvf.c static const ARMCPRegInfo gicv3_cpuif_reginfo[] = { · line 669
Quoted 7 lines
hw/intc/arm_gicv3_hvf.c +1
-1/* @@ -660,7 +666,7 @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {static void hvf_gicv3_realize (DeviceState *dev,Error **errp) { ERRP_GUARD(); - GICv3State *s = HVF_GICV3(dev); + GICv3State *s = (GICv3State *)HVF_GICV3(dev);Nit: GICv3State *s = &HVF_GICV3(dev)->gicv3_state; reads better and is checked
No need to change the line at all.
Quoted 8 lines
Quoted 8 lines
hw/intc/arm_gicv3_hvf.c +0
-0HVFARMGICv3Class *kgc = HVF_GICV3_GET_CLASS(s); int i;@@ -707,6 +713,87 @@ static void hvf_gicv3_realize(DeviceState *dev, Error **errp) } }
PATCH v20 3/15 accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC
In reply to Mohamed MediouniMisc changes needed for HVF vGIC enablement.
Note: x86_64 macOS exposes interrupt controller virtualisation since macOS 12. Keeping an #ifdef here in case we end up supporting that...
However, given that x86_64 macOS is on its way out, it'll probably (?) not be supported in Qemu.
--- accel/hvf/hvf-all.c | 46 ++++++++++++++++++++++++++++++++++++++ accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 23 +++++++++++++++---- hw/intc/arm_gicv3_common.c | 3 +++ include/system/hvf.h | 3 +++ system/vl.c | 2 ++ 6 files changed, 74 insertions(+), 4 deletions(-)
accel/hvf/hvf-all.c +46 -0
@@ -10,6 +10,8 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qapi/error.h" +#include "qapi/qapi-visit-common.h" #include "accel/accel-ops.h" #include "exec/cpu-common.h" #include "system/address-spaces.h"
@@ -21,6 +23,7 @@#include "trace.h" bool hvf_allowed; +bool hvf_kernel_irqchip;const char *hvf_return_string (hv_return_t ret) {
@@ -216,6 +219,43 @@ static int hvf_gdbstub_sstep_flags(AccelState *as)return SSTEP_ENABLE |SSTEP_NOIRQ ; } +static void hvf_set_kernel_irqchip (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +OnOffSplit mode; +if (!visit_type_OnOffSplit (v, name, &mode, errp)) { +return ; + } + +switch (mode) { +case ON_OFF_SPLIT_ON : +#ifdef HOST_X86_64 +/* macOS 12 onwards exposes an HVF virtual APIC. */ +error_setg (errp,"HVF: kernel irqchip is not currently implemented for x86." ); +break ; +#else + hvf_kernel_irqchip = true; +break ; +#endif + +case ON_OFF_SPLIT_OFF : + hvf_kernel_irqchip = false; +break ; + +case ON_OFF_SPLIT_SPLIT : +error_setg (errp,"HVF: split irqchip is not supported on HVF." ); +break ; + +default : +/* +* The value was checked in visit_type_OnOffSplit() above. If +* we get here, then something is wrong in QEMU. +*/ +abort (); + } +} +static void hvf_accel_class_init (ObjectClass *oc,const void *data) {AccelClass *ac =ACCEL_CLASS (oc);
@@ -223,6 +263,12 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = hvf_accel_init; ac->allowed = &hvf_allowed; ac->gdbstub_supported_sstep_flags = hvf_gdbstub_sstep_flags; + hvf_kernel_irqchip = false; +object_class_property_add (oc,"kernel-irqchip" ,"on|off|split" , +NULL , hvf_set_kernel_irqchip, +NULL ,NULL ); +object_class_property_set_description (oc,"kernel-irqchip" , +"Configure HVF irqchip" ); }static const TypeInfo hvf_accel_type = {
accel/stubs/hvf-stub.c +1 -0
@@ -10,3 +10,4 @@#include "system/hvf.h" bool hvf_allowed; +bool hvf_kernel_irqchip;
hw/arm/virt.c +19 -4
@@ -837,7 +837,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)* interrupts; there are always 32 of the former (mandated by GIC spec). */ qdev_prop_set_uint32 (vms->gic,"num-irq" ,NUM_IRQS +32 ); -if (!kvm_irqchip_in_kernel ()) { +if (!kvm_irqchip_in_kernel () && !hvf_irqchip_in_kernel ()) {qdev_prop_set_bit (vms->gic,"has-security-extensions" , vms->secure); }
@@ -860,7 +860,8 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)qdev_prop_set_array (vms->gic,"redist-region-count" , redist_region_count); -if (!kvm_irqchip_in_kernel ()) { +if (!kvm_irqchip_in_kernel () && + !(hvf_enabled () &&hvf_irqchip_in_kernel ())) {if (vms->tcg_its) {object_property_set_link (OBJECT (vms->gic),"sysmem" ,OBJECT (mem), &error_fatal);
@@ -871,7 +872,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) ARCH_GIC_MAINT_IRQ); } }else { -if (!kvm_irqchip_in_kernel ()) { +if (!kvm_irqchip_in_kernel () && !hvf_irqchip_in_kernel ()) {qdev_prop_set_bit (vms->gic,"has-virtualization-extensions" , vms->virt); }
@@ -2118,7 +2119,15 @@ static void finalize_gic_version(VirtMachineState *vms) accel_name ="KVM with kernel-irqchip=off" ; }else if (whpx_enabled ()) { gics_supported |=VIRT_GIC_VERSION_3_MASK ; - }else if (tcg_enabled () ||hvf_enabled () ||qtest_enabled ()) { + }else if (hvf_enabled ()) { +if (!hvf_irqchip_in_kernel ()) { + gics_supported |=VIRT_GIC_VERSION_2_MASK ; + } +/* Hypervisor.framework doesn't expose EL2<->1 transition notifiers */ +if (!(!hvf_irqchip_in_kernel () && vms->virt)) { + gics_supported |=VIRT_GIC_VERSION_3_MASK ; + } + }else if (tcg_enabled () ||qtest_enabled ()) { gics_supported |=VIRT_GIC_VERSION_2_MASK ;if (module_object_class_by_name ("arm-gicv3" )) { gics_supported |=VIRT_GIC_VERSION_3_MASK ;
@@ -2160,6 +2169,8 @@ static void finalize_msi_controller(VirtMachineState *vms) vms->msi_controller =VIRT_MSI_CTRL_GICV2M ; }else if (whpx_enabled ()) { vms->msi_controller =VIRT_MSI_CTRL_GICV2M ; + }else if (hvf_enabled () &&hvf_irqchip_in_kernel ()) { + vms->msi_controller =VIRT_MSI_CTRL_GICV2M ; }else { vms->msi_controller =VIRT_MSI_CTRL_ITS ; }
@@ -2179,6 +2190,10 @@ static void finalize_msi_controller(VirtMachineState *vms)error_report ("ITS not supported on WHPX." );exit (1 ); } +if (hvf_enabled () &&hvf_irqchip_in_kernel ()) { +error_report ("ITS not supported on HVF when using the hardware vGIC." ); +exit (1 ); + } }assert (vms->msi_controller !=VIRT_MSI_CTRL_AUTO );
hw/intc/arm_gicv3_common.c +3 -0
@@ -33,6 +33,7 @@#include "hw/arm/linux-boot-if.h" #include "system/kvm.h" #include "system/whpx.h" +#include "system/hvf.h" static void gicv3_gicd_no_migration_shift_bug_post_load (GICv3State *cs)
@@ -659,6 +660,8 @@ const char *gicv3_class_name(void)return "kvm-arm-gicv3" ; }else if (whpx_enabled ()) {return TYPE_WHPX_GICV3 ; + }else if (hvf_enabled () &&hvf_irqchip_in_kernel ()) { +return TYPE_HVF_GICV3 ; }else {if (kvm_enabled ()) {error_report ("Userspace GICv3 is not supported with KVM" );
include/system/hvf.h +3 -0
@@ -26,8 +26,11 @@#ifdef CONFIG_HVF_IS_POSSIBLE extern bool hvf_allowed;#define hvf_enabled () (hvf_allowed) +extern bool hvf_kernel_irqchip; +#define hvf_irqchip_in_kernel () (hvf_kernel_irqchip)#else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled () 0 +#define hvf_irqchip_in_kernel () 0#endif /* !CONFIG_HVF_IS_POSSIBLE */ #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf")
system/vl.c +2 -0
@@ -1780,6 +1780,8 @@ static void qemu_apply_legacy_machine_options(QDict *qdict) false);object_register_sugar_prop (ACCEL_CLASS_NAME ("whpx" ),"kernel-irqchip" , value, false); +object_register_sugar_prop (ACCEL_CLASS_NAME ("hvf" ),"kernel-irqchip" , value, + false);qdict_del (qdict,"kernel-irqchip" ); }
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 03/15] accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC
Quoted 23 lines · Mohamed Mediouni
Misc changes needed for HVF vGIC enablement.
Note:
x86_64macOS exposes interrupt controller virtualisation since macOS 12. Keeping an #ifdef here in case we end up supporting that...However, given that
x86_64macOS is on its way out, it'll probably (?) not be supported in Qemu.Signed-off-by Mohamed Mediouni <[email protected]>--- accel/hvf/hvf-all.c | 46 ++++++++++++++++++++++++++++++++++++++ accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 23 +++++++++++++++---- hw/intc/arm_gicv3_common.c | 3 +++ include/system/hvf.h | 3 +++ system/vl.c | 2 ++ 6 files changed, 74 insertions(+), 4 deletions(-)accel/stubs/hvf-stub.c +0
-0
accel/stubs/hvf-stub.c line 13
Quoted 4 lines
accel/stubs/hvf-stub.c +1
-0@@ -10,3 +10,4 @@#include "system/hvf.h" bool hvf_allowed; +bool hvf_kernel_irqchip;
This (along with hvf_nested_virt andhvf_kernel_irqchip_override you add later)
should go in HVFState.
Re: [PATCH v20 03/15] accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC
Quoted 20 lines · Philippe Mathieu-Daudé
Quoted 13 lines · Mohamed Mediouni
Misc changes needed for HVF vGIC enablement.
Note:x86_64macOS exposes interrupt controller virtualisation since macOS 12. Keeping an #ifdef here in case we end up supporting that...
However, given thatx86_64macOS is on its way out, it'll probably (?) not be supported in Qemu.Signed-off-by Mohamed Mediouni <[email protected]>--- accel/hvf/hvf-all.c | 46 ++++++++++++++++++++++++++++++++++++++ accel/stubs/hvf-stub.c | 1 + hw/arm/virt.c | 23 +++++++++++++++---- hw/intc/arm_gicv3_common.c | 3 +++ include/system/hvf.h | 3 +++ system/vl.c | 2 ++ 6 files changed, 74 insertions(+), 4 deletions(-)
Quoted 12 lines
accel/stubs/hvf-stub.c line 12
Quoted 8 lines
accel/stubs/hvf-stub.c +1
-0@@ -10,3 +10,4 @@#include "system/hvf.h" bool hvf_allowed; +bool hvf_kernel_irqchip;This (along with
hvf_nested_virtandhvf_kernel_irqchip_overrideyou add later)
should go in HVFState.
Hi,
Putting it in HVFState makes the existing*_irqchip_in_kernel() pattern as a macro
that’s used by other accelerators not work.
For the hvf_kernel_irqchip_override will do
in a future revision, but for the others not
sure it makes that much sense.
PATCH v20 4/15 target/arm: hvf: instantiate GIC early
In reply to Mohamed MediouniWhile figuring out a better spot for it, put it in hv_arch_vm_create().
After hv_vcpu_create is documented as too late, and deferring vCPU initialization isn't enough either.
--- target/arm/hvf/hvf.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
target/arm/hvf/hvf.c +22 -0
@@ -1230,6 +1230,28 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) chosen_ipa_bit_size = pa_range; ret =hv_vm_create (config); +if (hvf_irqchip_in_kernel ()) { + if (__builtin_available(macOS 15.0, *)) { +/* +* Instantiate GIC. +* This must be done prior to the creation of any vCPU +* but past hv_vm_create() +*/ +hv_gic_config_t cfg =hv_gic_config_create (); +hv_gic_config_set_distributor_base (cfg,0x08000000 ); +hv_gic_config_set_redistributor_base (cfg,0x080A0000 ); + ret =hv_gic_create (cfg); +if (ret !=HV_SUCCESS ) { +error_report ("error creating platform VGIC" ); + goto cleanup; + } +os_release (cfg); + }else { +error_report ("HVF: Unsupported OS for platform vGIC." ); + ret =HV_UNSUPPORTED ; + goto cleanup; + } + } cleanup:os_release (config);
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 5/15 hw/arm, target/arm: nested virtualisation on HVF
In reply to Mohamed Mediouni--- accel/hvf/hvf-all.c | 5 +++++ accel/stubs/hvf-stub.c | 10 ++++++++++ hw/arm/virt.c | 5 +++++ include/system/hvf.h | 5 +++++ target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 65 insertions(+), 2 deletions(-)
accel/hvf/hvf-all.c +5 -0
@@ -24,6 +24,11 @@bool hvf_allowed;bool hvf_kernel_irqchip; +bool hvf_nested_virt; + +void hvf_nested_virt_enable (bool nested_virt) { + hvf_nested_virt = nested_virt; +}const char *hvf_return_string (hv_return_t ret) {
accel/stubs/hvf-stub.c +10 -0
@@ -11,3 +11,13 @@bool hvf_allowed;bool hvf_kernel_irqchip; +bool hvf_nested_virt; + +void hvf_nested_virt_enable (bool nested_virt) { +/* +* This is called unconditionally from hw/arm/virt.c +* because we don't know if HVF is going to be used +* as that step of initialisation happens later. +* As such, do nothing here instead of marking as unreachable. +*/ +}
hw/arm/virt.c +5 -0
@@ -2661,6 +2661,11 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)VirtMachineState *vms =VIRT_MACHINE (obj); vms->virt = value; +/* +* At this point, HVF is not initialised yet. +* However, it needs to know if nested virt is enabled at init time. +*/ +hvf_nested_virt_enable (value); }static bool virt_get_highmem (Object *obj,Error **errp)
include/system/hvf.h +5 -0
@@ -28,11 +28,16 @@ extern bool hvf_allowed;#define hvf_enabled () (hvf_allowed)extern bool hvf_kernel_irqchip;#define hvf_irqchip_in_kernel () (hvf_kernel_irqchip) +extern bool hvf_nested_virt; +#define hvf_nested_virt_enabled () (hvf_nested_virt)#else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled () 0#define hvf_irqchip_in_kernel () 0 +#define hvf_nested_virt_enabled () 0#endif /* !CONFIG_HVF_IS_POSSIBLE */ +void hvf_nested_virt_enable (bool nested_virt); +#define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf")typedef struct HVFState HVFState ;
target/arm/hvf/hvf.c +40 -2
84 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 05/15] hw/arm, target/arm: nested virtualisation on HVF
Quoted 2 lines · Mohamed Mediouni
Signed-off-by Mohamed Mediouni <[email protected]>---
Suggestion: change commit subject/message to something like "Add nested virt enabled checks"
Quoted 177 lines
accel/hvf/hvf-all.c | 5 +++++ accel/stubs/hvf-stub.c | 10 ++++++++++ hw/arm/virt.c | 5 +++++ include/system/hvf.h | 5 +++++ target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 65 insertions(+), 2 deletions(-)accel/hvf/hvf-all.c +5
-0@@ -24,6 +24,11 @@bool hvf_allowed;bool hvf_kernel_irqchip; +bool hvf_nested_virt; + +void hvf_nested_virt_enable (bool nested_virt) { + hvf_nested_virt = nested_virt; +}const char *hvf_return_string (hv_return_t ret) {accel/stubs/hvf-stub.c +10
-0@@ -11,3 +11,13 @@bool hvf_allowed;bool hvf_kernel_irqchip; +bool hvf_nested_virt; + +void hvf_nested_virt_enable (bool nested_virt) { +/* +* This is called unconditionally from hw/arm/virt.c +* because we don't know if HVF is going to be used +* as that step of initialisation happens later. +* As such, do nothing here instead of marking as unreachable. +*/ +}hw/arm/virt.c +5
-0@@ -2661,6 +2661,11 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)VirtMachineState *vms =VIRT_MACHINE (obj); vms->virt = value; +/* +* At this point, HVF is not initialised yet. +* However, it needs to know if nested virt is enabled at init time. +*/ +hvf_nested_virt_enable (value); }static bool virt_get_highmem (Object *obj,Error **errp)include/system/hvf.h +5
-0@@ -28,11 +28,16 @@ extern bool hvf_allowed;#define hvf_enabled () (hvf_allowed)extern bool hvf_kernel_irqchip;#define hvf_irqchip_in_kernel () (hvf_kernel_irqchip) +extern bool hvf_nested_virt; +#define hvf_nested_virt_enabled () (hvf_nested_virt)#else /* !CONFIG_HVF_IS_POSSIBLE */ #define hvf_enabled () 0#define hvf_irqchip_in_kernel () 0 +#define hvf_nested_virt_enabled () 0#endif /* !CONFIG_HVF_IS_POSSIBLE */ +void hvf_nested_virt_enable (bool nested_virt); +#define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf")typedef struct HVFState HVFState ;target/arm/hvf/hvf.c +40
-2@@ -27,6 +27,7 @@#include "system/memory.h" #include "hw/core/boards.h" #include "hw/core/irq.h" +#include "hw/arm/virt.h" #include "qemu/main-loop.h" #include "system/cpus.h" #include "arm-powerctl.h" @@ -1103,6 +1104,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) (1ULL <<ARM_FEATURE_PMU ) | (1ULL <<ARM_FEATURE_GENERIC_TIMER ); +if (hvf_nested_virt_enabled ()) { + ahcf->features |=1ULL <<ARM_FEATURE_EL2 ; + } +for (i =0 ; i <ARRAY_SIZE (regs); i++) { r |=hv_vcpu_config_get_feature_reg (config, regs[i].reg, &host_isar.idregs[regs[i].index]);@@ -1218,6 +1223,19 @@ void hvf_arch_vcpu_destroy(CPUState *cpu)assert_hvf_ok (ret); } +static bool hvf_arm_el2_supported (void ) +{ +bool is_nested_virt_supported; + if (__builtin_available(macOS 15.0, *)) { +hv_return_t ret =hv_vm_config_get_el2_supported (&is_nested_virt_supported); +assert_hvf_ok (ret); + }else { +return false; + } +return is_nested_virt_supported; +} + +hv_return_t hvf_arch_vm_create (MachineState *ms,uint32_t pa_range) {hv_return_t ret;@@ -1229,6 +1247,20 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) } chosen_ipa_bit_size = pa_range; + if (__builtin_available(macOS 15.0, *)) { +if (hvf_nested_virt_enabled ()) { +if (!hvf_arm_el2_supported ()) { +error_report ("Nested virtualization not supported on this system." ); + goto cleanup; + } + ret =hv_vm_config_set_el2_enabled (config, true); +if (ret !=HV_SUCCESS ) { +error_report ("Failed to enable nested virtualization." ); + goto cleanup; + } + } + } + ret =hv_vm_create (config);if (hvf_irqchip_in_kernel ()) { if (__builtin_available(macOS 15.0, *)) {@@ -1420,6 +1452,13 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu)assert (ret ==QEMU_ARM_POWERCTL_RET_SUCCESS ); } +static int hvf_psci_get_target_el (void ) +{ +if (hvf_nested_virt_enabled ()) { +return 2 ; + } +return 1 ; +}/* * Handle a PSCI call. * @@ -1441,7 +1480,6 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)CPUState *target_cpu_state;ARMCPU *target_cpu;target_ulong entry; -int target_el =1 ;int32_t ret =0 ; trace_arm_psci_call(param[0], param[1], param[2], param[3],@@ -1495,7 +1533,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret) entry = param[2 ]; context_id = param[3 ]; ret =arm_set_cpu_on (mpidr, entry, context_id, - target_el, target_aarch64); +hvf_psci_get_target_el (), target_aarch64);break ;case QEMU_PSCI_0_1_FN_CPU_OFF :case QEMU_PSCI_0_2_FN_CPU_OFF :Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 6/15 hvf: only call hvf_sync_vtimer() when running without the platform vGIC
In reply to Mohamed MediouniWhen running with the Apple vGIC, the EL1 vtimer is handled by the platform.
--- target/arm/hvf/hvf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/arm/hvf/hvf.c +3 -1
@@ -2368,7 +2368,9 @@ static int hvf_handle_vmexit(CPUState *cpu, hv_vcpu_exit_t *exit)switch (exit->reason) {case HV_EXIT_REASON_EXCEPTION : -hvf_sync_vtimer (cpu); +if (!hvf_irqchip_in_kernel ()) { +hvf_sync_vtimer (cpu); + } ret =hvf_handle_exception (cpu, &exit->exception);break ;case HV_EXIT_REASON_VTIMER_ACTIVATED :
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 7/15 hvf: gate ARM_FEATURE_PMU register emulation when using the Apple vGIC
In reply to Mohamed MediouniFrom Apple documentation:
Quoted 10 lines
When EL2 is disabled, PMU register accesses trigger "Trapped MSR, MRS, or System Instruction" exceptions. When this happens, hv_vcpu_run() returns, and the hv_vcpu_exit_t object contains the information about this exception.
When EL2 is enabled, the handling of PMU register accesses is determined by the PMUVer field of ID_AA64DFR0_EL1 register.
If the PMUVer field value is zero or is invalid, PMU register accesses generate "Undefined" exceptions, which are sent to the guest.
If the PMUVer field value is non-zero and valid, PMU register accesses are emulated by the framework. The ID_AA64DFR0_EL1 register can be modified via hv_vcpu_set_sys_reg API.
However, despite what that documentation says this is actually gated on using the Apple vGIC instead of nested virtualisation per se. Apple introduced both at the same time.
--- target/arm/hvf/hvf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/arm/hvf/hvf.c +2 -2
@@ -1601,7 +1601,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)ARMCPU *arm_cpu =ARM_CPU (cpu);CPUARMState *env = &arm_cpu->env; -if (arm_feature (env,ARM_FEATURE_PMU )) { +if (!hvf_irqchip_in_kernel () &&arm_feature (env,ARM_FEATURE_PMU )) {switch (reg) {case SYSREG_PMCR_EL0 : *val = env->cp15.c9_pmcr;
@@ -1862,7 +1862,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)SYSREG_OP2 (reg), val); -if (arm_feature (env,ARM_FEATURE_PMU )) { +if (!hvf_irqchip_in_kernel () &&arm_feature (env,ARM_FEATURE_PMU )) {switch (reg) {case SYSREG_PMCCNTR_EL0 :pmu_op_start (env);
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 07/15] hvf: gate ARM_FEATURE_PMU register emulation when using the Apple vGIC
Quoted 13 lines · Mohamed Mediouni
From Apple documentation:
Quoted 10 lines
When EL2 is disabled, PMU register accesses trigger "Trapped MSR, MRS, or System Instruction" exceptions. When this happens, hv_vcpu_run() returns, and the hv_vcpu_exit_t object contains the information about this exception.
When EL2 is enabled, the handling of PMU register accesses is determined by the PMUVer field of ID_AA64DFR0_EL1 register.
If the PMUVer field value is zero or is invalid, PMU register accesses generate "Undefined" exceptions, which are sent to the guest.
If the PMUVer field value is non-zero and valid, PMU register accesses are emulated by the framework. The ID_AA64DFR0_EL1 register can be modified via hv_vcpu_set_sys_reg API.
Quoted 5 lines
However, despite what that documentation says this is actually gated on using the Apple vGIC instead of nested virtualisation per se. Apple introduced both at the same time.
Signed-off-by Mohamed Mediouni <[email protected]>---
Quoted 29 lines
target/arm/hvf/hvf.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)target/arm/hvf/hvf.c +2
-2@@ -1601,7 +1601,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)ARMCPU *arm_cpu =ARM_CPU (cpu);CPUARMState *env = &arm_cpu->env; -if (arm_feature (env,ARM_FEATURE_PMU )) { +if (!hvf_irqchip_in_kernel () &&arm_feature (env,ARM_FEATURE_PMU )) {switch (reg) {case SYSREG_PMCR_EL0 : *val = env->cp15.c9_pmcr;@@ -1862,7 +1862,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)SYSREG_OP2 (reg), val); -if (arm_feature (env,ARM_FEATURE_PMU )) { +if (!hvf_irqchip_in_kernel () &&arm_feature (env,ARM_FEATURE_PMU )) {switch (reg) {case SYSREG_PMCCNTR_EL0 :pmu_op_start (env);Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 8/15 hvf: arm: allow exposing minimal PMU when running with nested virt on
In reply to Mohamed MediouniWhen running with the Apple vGIC, a minimum PMU is exposed by Hypervisor.framework if a valid PMUVer register value is set. That PMU isn't exposed otherwise.
--- target/arm/hvf/hvf.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
target/arm/hvf/hvf.c +19 -0
@@ -1145,6 +1145,25 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)clamp_id_aa64mmfr0_parange_to_ipa_size (&host_isar); +/* +* Windows wants at least the PMU's cycles counter to be available. +* +* With kernel-irqchip=off, we "emulate" the cycles counter +* in reference to time in QEMU. Having that, even with +* ID_AA64DFR0_EL1.PMUVer = 0 is enough to make Windows happy. +* +* As it's a very inaccurate implementation with its only purpose +* being making Windows boot, expose ID_AA64DFR0_EL1.PMUVer = 0 +* when kernel-irqchip=off. +* +* When kernel-irqchip=on *and* ID_AA64DFR0_EL1.PMUVer = 1, +* the OS provides its own PMU emulation, which is currently +* a cycles counter only emulation. +*/ +if (hvf_irqchip_in_kernel ()) { +FIELD_DP64_IDREG (&host_isar,ID_AA64DFR0 ,PMUVER ,0x1 ); + } + ahcf->isar = host_isar;/*
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 08/15] hvf: arm: allow exposing minimal PMU when running with nested virt on
Quoted 7 lines · Mohamed Mediouni
When running with the Apple vGIC, a minimum PMU is exposed by Hypervisor.framework if a valid PMUVer register value is set. That PMU isn't exposed otherwise.
Signed-off-by Mohamed Mediouni <[email protected]>--- target/arm/hvf/hvf.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
PATCH v20 9/15 target/arm: hvf: add asserts for code paths not leveraged when using the vGIC
In reply to Mohamed MediouniWhen using the vGIC, timers are directly handled by the platform. No vmexits ought to happen in that case. Abort if reaching those code paths.
--- target/arm/hvf/hvf.c | 3 +++ 1 file changed, 3 insertions(+)
target/arm/hvf/hvf.c +3 -0
@@ -1696,6 +1696,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)case SYSREG_ICC_SGI1R_EL1 :case SYSREG_ICC_SRE_EL1 :case SYSREG_ICC_CTLR_EL1 : +assert (!hvf_irqchip_in_kernel ());/* Call the TCG sysreg handler. This is only safe for GICv3 regs. */ if (hvf_sysreg_read_cp (cpu,"GICv3" , reg, val)) {return 0 ;
@@ -1986,6 +1987,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)case SYSREG_ICC_SGI0R_EL1 :case SYSREG_ICC_SGI1R_EL1 :case SYSREG_ICC_SRE_EL1 : +assert (!hvf_irqchip_in_kernel ());/* Call the TCG sysreg handler. This is only safe for GICv3 regs. */ if (hvf_sysreg_write_cp (cpu,"GICv3" , reg, val)) {return 0 ;
@@ -2393,6 +2395,7 @@ static int hvf_handle_vmexit(CPUState *cpu, hv_vcpu_exit_t *exit) ret =hvf_handle_exception (cpu, &exit->exception);break ;case HV_EXIT_REASON_VTIMER_ACTIVATED : +assert (!hvf_irqchip_in_kernel ());qemu_set_irq (arm_cpu->gt_timer_outputs[GTIMER_VIRT ],1 ); cpu->accel->vtimer_masked = true;break ;
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 10/15 hvf: sync registers used at EL2
In reply to Mohamed MediouniWhen starting up the VM at EL2, more sysregs are available. Sync the state of those.
In addition, sync the state of the EL1 physical timer when the vGIC is used, even if running at EL1. However, no OS running at EL1 is expected to use those registers.
--- target/arm/hvf/hvf.c | 61 +++++++++++++++++++++++++++++++++---- target/arm/hvf/sysreg.c.inc | 44 ++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 6 deletions(-)
target/arm/hvf/hvf.c +55 -6
@@ -467,37 +467,75 @@ static const struct hvf_reg_match hvf_sme2_preg_match[] = {* * SME2 registers are guarded by a runtime availability attribute instead of a * compile-time def, so verify those at runtime in hvf_arch_init_vcpu() below. +* +* Nested virt registers are handled via a runtime check, so override the guarded +* availability check done by Clang. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" +#define DEF_SYSREG (HVF_ID , ...) \ QEMU_BUILD_BUG_ON(HVF_ID != KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS__)));#define DEF_SYSREG_15_02 (...) +#define DEF_SYSREG_EL2 (HVF_ID , ...) \ + QEMU_BUILD_BUG_ON(HVF_ID != KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS__))); + +#define DEF_SYSREG_VGIC (HVF_ID , ...) \ + QEMU_BUILD_BUG_ON(HVF_ID != KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS__))); + +#define DEF_SYSREG_VGIC_EL2 (HVF_ID , ...) \ + QEMU_BUILD_BUG_ON(HVF_ID != KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS__))); +#include "sysreg.c.inc" #undef DEF_SYSREG#undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2 -#define DEF_SYSREG (HVF_ID , op0, op1, crn, crm, op2) HVF_ID, +#define DEF_SYSREG (HVF_ID , op0, op1, crn, crm, op2) {HVF_ID},#define DEF_SYSREG_15_02 (...) +#define DEF_SYSREG_EL2 (HVF_ID , op0, op1, crn, crm, op2) {HVF_ID, .el2 = true}, +#define DEF_SYSREG_VGIC (HVF_ID , op0, op1, crn, crm, op2) {HVF_ID, .vgic = true}, +#define DEF_SYSREG_VGIC_EL2 (HVF_ID , op0, op1, crn, crm, op2) {HVF_ID, true, true}, + +struct hvf_sreg { +hv_sys_reg_t sreg; +bool vgic; +bool el2; +}; -static const hv_sys_reg_t hvf_sreg_list[] = { +static struct hvf_sreg hvf_sreg_list[] = { #include "sysreg.c.inc" };#undef DEF_SYSREG#undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2 + +#pragma clang diagnostic pop#define DEF_SYSREG (...) -#define DEF_SYSREG_15_02 (HVF_ID , op0, op1, crn, crm, op2) HVF_ID, +#define DEF_SYSREG_15_02 (HVF_ID , op0, op1, crn, crm, op2) {HVF_ID}, +#define DEF_SYSREG_EL2 (...) +#define DEF_SYSREG_VGIC (...) +#define DEF_SYSREG_VGIC_EL2 (...) API_AVAILABLE(macos(15.2)) -static const hv_sys_reg_t hvf_sreg_list_sme2[] = { +static struct hvf_sreg hvf_sreg_list_sme2[] = { #include "sysreg.c.inc" };#undef DEF_SYSREG#undef DEF_SYSREG_15_02 +#undef DEF_SYSREG_EL2 +#undef DEF_SYSREG_VGIC +#undef DEF_SYSREG_VGIC_EL2/* * For FEAT_SME2 migration, we need to store PSTATE.{SM,ZA} bits which are
@@ -1335,6 +1373,9 @@ int hvf_arch_init_vcpu(CPUState *cpu)#define DEF_SYSREG_15_02 (HVF_ID , ...) \ g_assert(HVF_ID == KVMID_TO_HVF(KVMID_AA64_SYS_REG64(__VA_ARGS__)));#define DEF_SYSREG (...) +#define DEF_SYSREG_EL2 (...) +#define DEF_SYSREG_VGIC (...) +#define DEF_SYSREG_VGIC_EL2 (...)#include "sysreg.c.inc"
@@ -1362,11 +1403,19 @@ int hvf_arch_init_vcpu(CPUState *cpu)/* Populate cp list for all known sysregs */ for (i =0 ; i <ARRAY_SIZE (hvf_sreg_list); i++) { -hv_sys_reg_t hvf_id = hvf_sreg_list[i]; +hv_sys_reg_t hvf_id = hvf_sreg_list[i].sreg;uint64_t kvm_id =HVF_TO_KVMID (hvf_id);uint32_t key =kvm_to_cpreg_id (kvm_id);const ARMCPRegInfo *ri =get_arm_cp_reginfo (arm_cpu->cp_regs, key); +if (hvf_sreg_list[i].vgic && !hvf_irqchip_in_kernel ()) { +continue ; + } + +if (hvf_sreg_list[i].el2 && !hvf_nested_virt_enabled ()) { +continue ; + } +if (ri) {assert (!(ri->type &ARM_CP_NO_RAW )); arm_cpu->cpreg_indexes[sregs_cnt++] = kvm_id;
@@ -1375,7 +1424,7 @@ int hvf_arch_init_vcpu(CPUState *cpu) if (__builtin_available(macOS 15.2, *)) {if (hvf_arm_sme2_supported ()) {for (i =0 ; i <ARRAY_SIZE (hvf_sreg_list_sme2); i++) { -hv_sys_reg_t hvf_id = hvf_sreg_list_sme2[i]; +hv_sys_reg_t hvf_id = hvf_sreg_list_sme2[i].sreg;uint64_t kvm_id =HVF_TO_KVMID (hvf_id);uint32_t key =kvm_to_cpreg_id (kvm_id);const ARMCPRegInfo *ri =get_arm_cp_reginfo (arm_cpu->cp_regs, key);
target/arm/hvf/sysreg.c.inc +44 -0
47 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 11/15 target/arm: hvf: pass through CNTHCTL_EL2 and MDCCINT_EL1
In reply to Mohamed MediouniHVF traps accesses to CNTHCTL_EL2. For nested guests, HVF traps accesses to MDCCINT_EL1. Pass through those accesses to the Hypervisor.framework library.
--- target/arm/hvf/hvf.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
target/arm/hvf/hvf.c +20 -0
@@ -296,6 +296,10 @@ void hvf_arm_init_debug(void)#define SYSREG_DBGWVR15_EL1 SYSREG(2, 0, 0, 15, 6)#define SYSREG_DBGWCR15_EL1 SYSREG(2, 0, 0, 15, 7) +/* EL2 registers */ +#define SYSREG_CNTHCTL_EL2 SYSREG(3, 4, 14, 1, 0) +#define SYSREG_MDCCINT_EL1 SYSREG(2, 0, 0, 2, 0) +#define WFX_IS_WFE (1 << 0)#define TMR_CTL_ENABLE (1 << 0)
@@ -1719,6 +1723,14 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)case SYSREG_OSDLR_EL1 :/* Dummy register */ return 0 ; +case SYSREG_CNTHCTL_EL2 : + if (__builtin_available(macOS 15.0, *)) { +assert_hvf_ok (hv_vcpu_get_sys_reg (cpu->accel->fd,HV_SYS_REG_CNTHCTL_EL2 , val)); + } +return 0 ; +case SYSREG_MDCCINT_EL1 : +assert_hvf_ok (hv_vcpu_get_sys_reg (cpu->accel->fd,HV_SYS_REG_MDCCINT_EL1 , val)); +return 0 ;case SYSREG_ICC_AP0R0_EL1 :case SYSREG_ICC_AP0R1_EL1 :case SYSREG_ICC_AP0R2_EL1 :
@@ -2007,6 +2019,14 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)case SYSREG_OSDLR_EL1 :/* Dummy register */ return 0 ; +case SYSREG_CNTHCTL_EL2 : + if (__builtin_available(macOS 15.0, *)) { +assert_hvf_ok (hv_vcpu_set_sys_reg (cpu->accel->fd,HV_SYS_REG_CNTHCTL_EL2 , val)); + } +return 0 ; +case SYSREG_MDCCINT_EL1 : +assert_hvf_ok (hv_vcpu_set_sys_reg (cpu->accel->fd,HV_SYS_REG_MDCCINT_EL1 , val)); +return 0 ;case SYSREG_LORC_EL1 :/* Dummy register */ return 0 ;
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 12/15 hvf: arm: disable SME when nested virt is active
In reply to Mohamed MediouniCurrently, Apple doesn't support the nested virtualisation + SME combination.
--- target/arm/hvf/hvf.c | 5 +++++ target/arm/hvf_arm.h | 5 +++++ 2 files changed, 10 insertions(+)
target/arm/hvf/hvf.c +5 -0
@@ -1206,6 +1206,11 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)FIELD_DP64_IDREG (&host_isar,ID_AA64DFR0 ,PMUVER ,0x1 ); } +if (hvf_nested_virt_enabled ()) { +/* SME is not implemented with nested virt on the Apple side */ +FIELD_DP64_IDREG (&host_isar,ID_AA64PFR1 ,SME ,0 ); + } + ahcf->isar = host_isar;/*
target/arm/hvf_arm.h +5 -0
@@ -11,6 +11,7 @@#ifndef QEMU_HVF_ARM_H #define QEMU_HVF_ARM_H +#include "system/hvf.h" #include "target/arm/cpu-qom.h" /**
@@ -35,6 +36,10 @@ void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu); if (__builtin_available(macOS 15.2, *)) {size_t svl_bytes;hv_return_t result =hv_sme_config_get_max_svl_bytes (&svl_bytes); +/* Nested virt not supported together with SME right now. */ +if (hvf_nested_virt_enabled ()) { +return false; + }if (result ==HV_UNSUPPORTED ) {return false; }
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 13/15 hvf: arm: physical timer emulation
In reply to Mohamed MediouniEnable this through leveraging TCG's physical timer emulation. This allows nested virtualisation to work with a kernel-irqchip=off + GICv2.
--- target/arm/hvf/hvf.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
target/arm/hvf/hvf.c +19 -9
@@ -189,7 +189,9 @@ void hvf_arm_init_debug(void)#define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4)#define SYSREG_LORC_EL1 SYSREG(3, 0, 10, 4, 3)#define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) +#define SYSREG_CNTP_TVAL_EL0 SYSREG(3, 3, 14, 2, 0)#define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1) +#define SYSREG_CNTP_CVAL_EL0 SYSREG(3, 3, 14, 2, 2)#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)
@@ -1719,9 +1721,15 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)switch (reg) {case SYSREG_CNTPCT_EL0 : - *val =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) / -gt_cntfrq_period_ns (arm_cpu); -return 0 ; +case SYSREG_CNTP_CTL_EL0 : +case SYSREG_CNTP_CVAL_EL0 : +case SYSREG_CNTP_TVAL_EL0 : +assert (!hvf_irqchip_in_kernel ()); +/* Call the TCG sysreg handler. */ +if (hvf_sysreg_read_cp (cpu,"PTimer" , reg, val)) { +return 0 ; + } +break ;case SYSREG_OSLSR_EL1 : *val = env->cp15.oslsr_el1;return 0 ;
@@ -2015,12 +2023,14 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val) env->cp15.oslsr_el1 = val &1 ;return 0 ;case SYSREG_CNTP_CTL_EL0 : -/* -* Guests should not rely on the physical counter, but macOS emits -* disable writes to it. Let it do so, but ignore the requests. -*/ -qemu_log_mask (LOG_UNIMP ,"Unsupported write to CNTP_CTL_EL0\n" ); -return 0 ; +case SYSREG_CNTP_CVAL_EL0 : +case SYSREG_CNTP_TVAL_EL0 : +assert (!hvf_irqchip_in_kernel ()); +/* Call the TCG sysreg handler. */ +if (hvf_sysreg_write_cp (cpu,"PTimer" , reg, val)) { +return 0 ; + } +break ;case SYSREG_OSDLR_EL1 :/* Dummy register */ return 0 ;
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 13/15] hvf: arm: physical timer emulation
Quoted 52 lines · Mohamed Mediouni
Enable this through leveraging TCG's physical timer emulation. This allows nested virtualisation to work with a kernel-irqchip=off + GICv2.
Signed-off-by Mohamed Mediouni <[email protected]>--- target/arm/hvf/hvf.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)target/arm/hvf/hvf.c +12
-9@@ -189,7 +189,9 @@ void hvf_arm_init_debug(void)#define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4)#define SYSREG_LORC_EL1 SYSREG(3, 0, 10, 4, 3)#define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) +#define SYSREG_CNTP_TVAL_EL0 SYSREG(3, 3, 14, 2, 0)#define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1) +#define SYSREG_CNTP_CVAL_EL0 SYSREG(3, 3, 14, 2, 2)#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)@@ -1719,9 +1721,15 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val)switch (reg) {case SYSREG_CNTPCT_EL0 : - *val =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) / -gt_cntfrq_period_ns (arm_cpu); -return 0 ; +case SYSREG_CNTP_CTL_EL0 : +case SYSREG_CNTP_CVAL_EL0 : +case SYSREG_CNTP_TVAL_EL0 : +assert (!hvf_irqchip_in_kernel ()); +/* Call the TCG sysreg handler. */ +if (hvf_sysreg_read_cp (cpu,"PTimer" , reg, val)) { +return 0 ; + } +break ;case SYSREG_OSLSR_EL1 : *val = env->cp15.oslsr_el1;return 0 ;@@ -2015,12 +2023,14 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val) env->cp15.oslsr_el1 = val &1 ;return 0 ;case SYSREG_CNTP_CTL_EL0 : -/* -* Guests should not rely on the physical counter, but macOS emits -* disable writes to it. Let it do so, but ignore the requests. -*/ -qemu_log_mask (LOG_UNIMP ,"Unsupported write to CNTP_CTL_EL0\n" ); -return 0 ; +case SYSREG_CNTP_CVAL_EL0 :
target/arm/hvf/hvf.c static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val) · line 2036
Quoted 10 lines
target/arm/hvf/hvf.c +7
-0+case SYSREG_CNTP_TVAL_EL0 : +assert (!hvf_irqchip_in_kernel ()); +/* Call the TCG sysreg handler. */ +if (hvf_sysreg_write_cp (cpu,"PTimer" , reg, val)) { +return 0 ; + } +break ;case SYSREG_OSDLR_EL1 :/* Dummy register */ return 0 ;
Modulo the hvf_irqchip_in_kernel check, this reminds me of
https://lore.kernel.org/qemu-devel/[email protected]/
;)
PATCH v20 14/15 hvf: enable nested virtualisation support
In reply to Mohamed Mediouni--- hw/arm/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/arm/virt.c +2 -1
@@ -2393,7 +2393,8 @@ static void machvirt_init(MachineState *machine)exit (1 ); } -if (vms->virt && !kvm_enabled () && !tcg_enabled () && !qtest_enabled ()) { +if (vms->virt && !kvm_enabled () && !tcg_enabled () + && !hvf_enabled () && !qtest_enabled ()) {error_report ("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU" ,current_accel_name ());
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 14/15] hvf: enable nested virtualisation support
Quoted 2 lines · Mohamed Mediouni
Signed-off-by Mohamed Mediouni <[email protected]>---
Quoted 21 lines
hw/arm/virt.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)hw/arm/virt.c +2
-1@@ -2393,7 +2393,8 @@ static void machvirt_init(MachineState *machine)exit (1 ); } -if (vms->virt && !kvm_enabled () && !tcg_enabled () && !qtest_enabled ()) { +if (vms->virt && !kvm_enabled () && !tcg_enabled () + && !hvf_enabled () && !qtest_enabled ()) {error_report ("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU" ,current_accel_name ());Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v20 15/15 hvf: arm: enable vGIC by default for virt-11.1 and later
In reply to Mohamed MediouniSave states are incompatible between kernel-irqchip=on and off on HVF due to opaque vGIC state.
--- accel/hvf/hvf-all.c | 11 +++++++++++ hw/arm/virt.c | 22 +++++++++++++++++++++- include/hw/arm/virt.h | 2 ++ include/hw/core/boards.h | 1 + include/system/hvf_int.h | 1 + 5 files changed, 36 insertions(+), 1 deletion(-)
accel/hvf/hvf-all.c +11 -0
@@ -25,6 +25,7 @@bool hvf_allowed;bool hvf_kernel_irqchip;bool hvf_nested_virt; +bool hvf_kernel_irqchip_override;void hvf_nested_virt_enable (bool nested_virt) { hvf_nested_virt = nested_virt;
@@ -203,6 +204,13 @@ static int hvf_accel_init(AccelState *as, MachineState *ms) } } +if (mc->get_kernel_irqchip_default) { +bool kernel_irqchip_default = mc->get_kernel_irqchip_default (ms); +if (!hvf_kernel_irqchip_override) { + hvf_kernel_irqchip = kernel_irqchip_default; + } + } + ret =hvf_arch_vm_create (ms, (uint32_t )pa_range);if (ret ==HV_DENIED ) { error_report("Could not access HVF. Is the executable signed"
@@ -229,6 +237,8 @@ static void hvf_set_kernel_irqchip(Object *obj, Visitor *v, Error **errp) {OnOffSplit mode; + + hvf_kernel_irqchip_override = true;if (!visit_type_OnOffSplit (v, name, &mode, errp)) {return ; }
@@ -268,6 +278,7 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = hvf_accel_init; ac->allowed = &hvf_allowed; ac->gdbstub_supported_sstep_flags = hvf_gdbstub_sstep_flags; + hvf_kernel_irqchip_override = false; hvf_kernel_irqchip = false; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, hvf_set_kernel_irqchip,
hw/arm/virt.c +21 -1
@@ -3443,6 +3443,16 @@ static int virt_get_physical_address_range(MachineState *ms,return requested_ipa_size; } +static bool get_kernel_irqchip_default (const MachineState *ms) { +VirtMachineState *vms =VIRT_MACHINE (ms); +VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +if (hvf_allowed) { +return !vmc->hvf_no_kernel_irqchip_default; + }else { +return true; + } +} +static const char *virt_get_default_cpu_type (const MachineState *ms) { return tcg_enabled() ? ARM_CPU_TYPE_NAME("cortex-a15")
@@ -3509,6 +3519,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->get_physical_address_range = virt_get_physical_address_range; + mc->get_kernel_irqchip_default = get_kernel_irqchip_default;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; hc->pre_plug = virt_machine_device_pre_plug_cb;
@@ -3740,10 +3751,19 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +static void virt_machine_11_0_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_11_1_options (mc); + + vmc->hvf_no_kernel_irqchip_default = true; } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) +DEFINE_VIRT_MACHINE(11, 0)static void virt_machine_10_2_options (MachineClass *mc) {
include/hw/arm/virt.h +2 -0
@@ -135,6 +135,8 @@ struct VirtMachineClass {bool no_tcg_lpa2;bool no_ns_el2_virt_timer_irq;bool no_nested_smmu; +/* HVF specific: support for kernel-irqchip=on introduced in QEMU 11.1 */ +bool hvf_no_kernel_irqchip_default; };struct VirtMachineState {
include/hw/core/boards.h +1 -0
@@ -279,6 +279,7 @@ struct MachineClass {int (*kvm_type)(MachineState *machine,const char *arg);int (*get_physical_address_range)(MachineState *machine,int default_ipa_size,int max_ipa_size); +bool (*get_kernel_irqchip_default) (const MachineState *machine);BlockInterfaceType block_default_type;int units_per_default_bus;
include/system/hvf_int.h +1 -0
@@ -112,4 +112,5 @@ bool hvf_arch_cpu_realize(CPUState *cpu, Error **errp);uint32_t hvf_arch_get_default_ipa_bit_size (void );uint32_t hvf_arch_get_max_ipa_bit_size (void ); +extern bool hvf_kernel_irqchip_override;#endif
Signature · 1 line
2.50.1 (Apple Git-155)
Re: [PATCH v20 15/15] hvf: arm: enable vGIC by default for virt-11.1 and later
Quoted 4 lines · Mohamed Mediouni
Save states are incompatible between kernel-irqchip=on and off on HVF due to opaque vGIC state.
Signed-off-by Mohamed Mediouni <[email protected]>---
Quoted 139 lines
accel/hvf/hvf-all.c | 11 +++++++++++ hw/arm/virt.c | 22 +++++++++++++++++++++- include/hw/arm/virt.h | 2 ++ include/hw/core/boards.h | 1 + include/system/hvf_int.h | 1 + 5 files changed, 36 insertions(+), 1 deletion(-)accel/hvf/hvf-all.c +11
-0@@ -25,6 +25,7 @@bool hvf_allowed;bool hvf_kernel_irqchip;bool hvf_nested_virt; +bool hvf_kernel_irqchip_override;void hvf_nested_virt_enable (bool nested_virt) { hvf_nested_virt = nested_virt;@@ -203,6 +204,13 @@ static int hvf_accel_init(AccelState *as, MachineState *ms) } } +if (mc->get_kernel_irqchip_default) { +bool kernel_irqchip_default = mc->get_kernel_irqchip_default (ms); +if (!hvf_kernel_irqchip_override) { + hvf_kernel_irqchip = kernel_irqchip_default; + } + } + ret =hvf_arch_vm_create (ms, (uint32_t )pa_range);if (ret ==HV_DENIED ) { error_report("Could not access HVF. Is the executable signed"@@ -229,6 +237,8 @@ static void hvf_set_kernel_irqchip(Object *obj, Visitor *v, Error **errp) {OnOffSplit mode; + + hvf_kernel_irqchip_override = true;if (!visit_type_OnOffSplit (v, name, &mode, errp)) {return ; }@@ -268,6 +278,7 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = hvf_accel_init; ac->allowed = &hvf_allowed; ac->gdbstub_supported_sstep_flags = hvf_gdbstub_sstep_flags; + hvf_kernel_irqchip_override = false; hvf_kernel_irqchip = false; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, hvf_set_kernel_irqchip,hw/arm/virt.c +21
-1@@ -3443,6 +3443,16 @@ static int virt_get_physical_address_range(MachineState *ms,return requested_ipa_size; } +static bool get_kernel_irqchip_default (const MachineState *ms) { +VirtMachineState *vms =VIRT_MACHINE (ms); +VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); +if (hvf_allowed) { +return !vmc->hvf_no_kernel_irqchip_default; + }else { +return true; + } +} +static const char *virt_get_default_cpu_type (const MachineState *ms) { return tcg_enabled() ? ARM_CPU_TYPE_NAME("cortex-a15")@@ -3509,6 +3519,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->get_physical_address_range = virt_get_physical_address_range; + mc->get_kernel_irqchip_default = get_kernel_irqchip_default;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; hc->pre_plug = virt_machine_device_pre_plug_cb;@@ -3740,10 +3751,19 @@ static void machvirt_machine_init(void) }type_init (machvirt_machine_init); +static void virt_machine_11_1_options (MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) +static void virt_machine_11_0_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_11_1_options (mc); + + vmc->hvf_no_kernel_irqchip_default = true; } -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) +DEFINE_VIRT_MACHINE(11, 0)static void virt_machine_10_2_options (MachineClass *mc) {include/hw/arm/virt.h +2
-0@@ -135,6 +135,8 @@ struct VirtMachineClass {bool no_tcg_lpa2;bool no_ns_el2_virt_timer_irq;bool no_nested_smmu; +/* HVF specific: support for kernel-irqchip=on introduced in QEMU 11.1 */ +bool hvf_no_kernel_irqchip_default; };struct VirtMachineState {include/hw/core/boards.h +1
-0@@ -279,6 +279,7 @@ struct MachineClass {int (*kvm_type)(MachineState *machine,const char *arg);int (*get_physical_address_range)(MachineState *machine,int default_ipa_size,int max_ipa_size); +bool (*get_kernel_irqchip_default) (const MachineState *machine);BlockInterfaceType block_default_type;int units_per_default_bus;include/system/hvf_int.h +1
-0@@ -112,4 +112,5 @@ bool hvf_arch_cpu_realize(CPUState *cpu, Error **errp);uint32_t hvf_arch_get_default_ipa_bit_size (void );uint32_t hvf_arch_get_max_ipa_bit_size (void ); +extern bool hvf_kernel_irqchip_override;#endif Signature · 1 line
2.50.1 (Apple Git-155)