target/arm: Add vSPE support to KVM guest
cover target/arm: Add vSPE support to KVM guest
This series add support for SPE(Statistical Profiling Extension)[1] in KVM guest. It's based on Andrew Murray's kernel KVM patches V2[2], and has been tested to ensure that guest can use SPE with valid data. E.g.
In host:
$ ./qemu-system-aarch64 \
-cpu host -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \
-kernel ./Image-new \
-initrd /boot/initrd.img-5.6.0-rc2+ \
-append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\
-drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \
-device virtio-blk-device,drive=hd0 \In guest:
$ perf record -e arm_spe/ts_enable=1,pa_enable=1,pct_enable=1/ \
dd if=/dev/zero of=/dev/null count=1000
$ perf report --dump-raw-trace > spe_buf.txtThe spe_buf.txt should contain similar data as below:
. ... ARM SPE data: size 135944 bytes
. 00000000: b0 f4 d3 29 10 00 80 ff a0 PC 0xff80001029d3f4 el1 ns=1 . 00000009: 99 0b 00 LAT 11 ISSUE . 0000000c: 98 0d 00 LAT 13 TOT . 0000000f: 52 16 00 EV RETIRED L1D-ACCESS TLB-ACCESS . 00000012: 49 00 LD . 00000014: b2 d0 40 d8 70 00 00 ff 00 VA 0xff000070d840d0 . 0000001d: 9a 01 00 LAT 1 XLAT . 00000020: 00 00 00 PAD . 00000023: 71 a5 1f b3 20 14 00 00 00 TS 86447955877 . 0000002c: b0 7c f9 29 10 00 80 ff a0 PC 0xff80001029f97c el1 ns=1 . 00000035: 99 02 00 LAT 2 ISSUE . 00000038: 98 03 00 LAT 3 TOT . 0000003b: 52 02 00 EV RETIRED . 0000003e: 48 00 INSN-OTHER . 00000040: 00 00 00 PAD . 00000043: 71 ef 1f b3 20 14 00 00 00 TS 86447955951 . 0000004c: b0 f0 e9 29 10 00 80 ff a0 PC 0xff80001029e9f0 el1 ns=1 . 00000055: 99 02 00 LAT 2 ISSUE . 00000058: 98 03 00 LAT 3 TOT . 0000005b: 52 02 00 EV RETIRED
If you want to disable the vSPE support, you can use the 'spe=off' cpu property:
./qemu-system-aarch64 \
-cpu host,spe=off -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \
-kernel ./Image-new \
-initrd /boot/initrd.img-5.6.0-rc2+ \
-append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\
-drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \
-device virtio-blk-device,drive=hd0 \Note:
(1) Since the kernel patches are still under review, some of the macros in the header files may be changed after merging. We may need to update them accordingly.
(2) These patches only add vSPE support in KVM mode, for TCG mode, I'm not sure whether we need to support it.
(3) Just followed the 'pmu' property, we only allow this feature to be removed from CPUs which enable it by default. But since the SPE is an optional feature extension for Armv8.2, I think a better way may be to disable it by default, and only enable it when the host cpu do have the feature.
[1]https://community.arm.com/developer/ip-products/processors/b/processors-ip-blog/
posts/statistical-profiling-extension-for-armv8-a
[2]https://www.spinics.net/lists/arm-kernel/msg776228.html
Haibo Xu (7):
update Linux headers with new vSPE macros target/arm/kvm: spe: Add helper to detect SPE when using KVM target/arm/cpu: spe: Add an option to turn on/off vSPE support target/arm/kvm: spe: Unify device attr operatioin helper target/arm/kvm: spe: Add device init and set_irq operations hw/arm/virt: spe: Add SPE fdt binding for virt machine target/arm/cpu: spe: Enable spe to work with host cpu
hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 ++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + linux-headers/asm-arm64/kvm.h | 4 +++ linux-headers/linux/kvm.h | 2 ++ target/arm/cpu.c | 34 +++++++++++++++++++++++++ target/arm/cpu.h | 5 ++++ target/arm/kvm.c | 11 ++++++++ target/arm/kvm64.c | 48 ++++++++++++++++++++++++++++++++--- target/arm/kvm_arm.h | 18 +++++++++++++ 11 files changed, 166 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/7 update Linux headers with new vSPE macros
--- linux-headers/asm-arm64/kvm.h | 4 ++++ linux-headers/linux/kvm.h | 2 ++ 2 files changed, 6 insertions(+)
linux-headers/asm-arm64/kvm.h +4 -0
@@ -106,6 +106,7 @@ struct kvm_regs {#define KVM_ARM_VCPU_SVE 4/* enable SVE for this CPU */ #define KVM_ARM_VCPU_PTRAUTH_ADDRESS 5/* VCPU uses address authentication */ #define KVM_ARM_VCPU_PTRAUTH_GENERIC 6/* VCPU uses generic authentication */ +#define KVM_ARM_VCPU_SPE_V1 7/* Support guest SPEv1 */ struct kvm_vcpu_init {__u32 target;
@@ -334,6 +335,9 @@ struct kvm_vcpu_events {#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1#define KVM_ARM_VCPU_PVTIME_CTRL 2#define KVM_ARM_VCPU_PVTIME_IPA 0 +#define KVM_ARM_VCPU_SPE_V1_CTRL 3 +#define KVM_ARM_VCPU_SPE_V1_IRQ 0 +#define KVM_ARM_VCPU_SPE_V1_INIT 1/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_VCPU2_SHIFT 28
linux-headers/linux/kvm.h +2 -0
@@ -1031,6 +1031,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_SECURE_GUEST 181#define KVM_CAP_HALT_POLL 182#define KVM_CAP_ASYNC_PF_INT 183 +#define KVM_CAP_ARM_SPE_V1 184#ifdef KVM_CAP_IRQ_ROUTING
@@ -1671,6 +1672,7 @@ struct kvm_assigned_msix_entry {#define KVM_ARM_DEV_EL1_VTIMER (1 << 0)#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)#define KVM_ARM_DEV_PMU (1 << 2) +#define KVM_ARM_DEV_SPE (1 << 3)struct kvm_hyperv_eventfd {__u32 conn_id;
Signature · 1 line
2.17.1
PATCH 2/7 target/arm/kvm: spe: Add helper to detect SPE when using KVM
In reply to Haibo Xu--- target/arm/kvm.c | 5 +++++ target/arm/kvm_arm.h | 13 +++++++++++++ 2 files changed, 18 insertions(+)
target/arm/kvm.c +5 -0
@@ -214,6 +214,11 @@ bool kvm_arm_pmu_supported(void)return kvm_check_extension (kvm_state,KVM_CAP_ARM_PMU_V3 ); } +bool kvm_arm_spe_supported (void ) +{ +return kvm_check_extension (kvm_state,KVM_CAP_ARM_SPE_V1 ); +} +int kvm_arm_get_max_vm_ipa_size (MachineState *ms) {KVMState *s =KVM_STATE (ms->accelerator);
target/arm/kvm_arm.h +13 -0
@@ -283,6 +283,14 @@ bool kvm_arm_aarch32_supported(void);*/ bool kvm_arm_pmu_supported (void ); +/** +* kvm_arm_spe_supported: +* +* Returns: true if the KVM VCPU can enable its SPE +* and false otherwise. +*/ +bool kvm_arm_spe_supported (void ); +/** * kvm_arm_sve_supported: *
@@ -366,6 +374,11 @@ static inline bool kvm_arm_pmu_supported(void)return false; } +static inline bool kvm_arm_spe_supported (void ) +{ +return false; +} +static inline bool kvm_arm_sve_supported (void ) {return false;
Signature · 1 line
2.17.1
Re: [PATCH 2/7] target/arm/kvm: spe: Add helper to detect SPE when using KVM
Quoted 5 lines · Haibo Xu
Signed-off-by Haibo Xu <[email protected]>--- target/arm/kvm.c | 5 +++++ target/arm/kvm_arm.h | 13 +++++++++++++ 2 files changed, 18 insertions(+)
r~
PATCH 3/7 target/arm/cpu: spe: Add an option to turn on/off vSPE support
In reply to Haibo XuAdds a spe=[on/off] option to enable/disable vSPE support in guest vCPU. Note this option is only available for "-cpu host" with KVM mode, and default value is on.
--- target/arm/cpu.c | 28 ++++++++++++++++++++++++++++ target/arm/cpu.h | 3 +++ 2 files changed, 31 insertions(+)
target/arm/cpu.c +28 -0
@@ -1122,6 +1122,29 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool arm_get_spe (Object *obj,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +return cpu->has_spe; +} + +static void arm_set_spe (Object *obj,bool value,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +if (value) { +if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE ); + } + cpu->has_spe = value; +} +unsigned int gt_cntfrq_period_ns (ARMCPU *cpu) {/*
@@ -1195,6 +1218,11 @@ void arm_cpu_post_init(Object *obj)object_property_add_bool (obj,"pmu" , arm_get_pmu, arm_set_pmu); } +if (arm_feature (&cpu->env,ARM_FEATURE_SPE )) { + cpu->has_spe = true; +object_property_add_bool (obj,"spe" , arm_get_spe, arm_set_spe); + } +/* * Allow user to turn off VFP and Neon support, but only for TCG -- * KVM does not currently allow us to lie to the guest about its
target/arm/cpu.h +3 -0
@@ -822,6 +822,8 @@ struct ARMCPU {bool has_el3;/* CPU has PMU (Performance Monitor Unit) */ bool has_pmu; +/* CPU has SPE (Statistical Profiling Extension) */ +bool has_spe;/* CPU has VFP */ bool has_vfp;/* CPU has Neon */
@@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */ };static inline int arm_feature (CPUARMState *env,int feature)
Signature · 1 line
2.17.1
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
Hi Haibo,
Quoted 45 lines · Haibo Xu
Adds a spe=[on/off] option to enable/disable vSPE support in guest vCPU. Note this option is only available for "-cpu host" with KVM mode, and default value is on.
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 28 ++++++++++++++++++++++++++++ target/arm/cpu.h | 3 +++ 2 files changed, 31 insertions(+)target/arm/cpu.c +23
-0@@ -1122,6 +1122,29 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool arm_get_spe (Object *obj,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +return cpu->has_spe; +} + +static void arm_set_spe (Object *obj,bool value,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +if (value) { +if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE ); + } + cpu->has_spe = value; +} +unsigned int gt_cntfrq_period_ns (ARMCPU *cpu) {/*
target/arm/cpu.c void arm_cpu_post_init(Object *obj) · line 1222
Quoted 5 lines
target/arm/cpu.c +2
-0@@ -1195,6 +1218,11 @@ void arm_cpu_post_init(Object *obj)object_property_add_bool (obj,"pmu" , arm_get_pmu, arm_set_pmu); } +if (arm_feature (&cpu->env,ARM_FEATURE_SPE )) { + cpu->has_spe = true;
Being a profiling feature, are you sure you want it to be ON by default?
I'd expect the opposite, either being turned on via command line at startup or by a management layer at runtime, when someone is ready to record the perf events and analyze them.
Quoted 28 lines
target/arm/cpu.c +3
-0+object_property_add_bool (obj,"spe" , arm_get_spe, arm_set_spe); + } +/* * Allow user to turn off VFP and Neon support, but only for TCG -- * KVM does not currently allow us to lie to the guest about its target/arm/cpu.h +3
-0@@ -822,6 +822,8 @@ struct ARMCPU {bool has_el3;/* CPU has PMU (Performance Monitor Unit) */ bool has_pmu; +/* CPU has SPE (Statistical Profiling Extension) */ +bool has_spe;/* CPU has VFP */ bool has_vfp;/* CPU has Neon */ @@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */ };static inline int arm_feature (CPUARMState *env,int feature)
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
Quoted 52 lines · Philippe Mathieu-Daudé
Hi Haibo,
Quoted 48 lines · Haibo Xu
Adds a spe=[on/off] option to enable/disable vSPE support in guest vCPU. Note this option is only available for "-cpu host" with KVM mode, and default value is on.
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 28 ++++++++++++++++++++++++++++ target/arm/cpu.h | 3 +++ 2 files changed, 31 insertions(+)target/arm/cpu.c +23
-0@@ -1122,6 +1122,29 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool arm_get_spe (Object *obj,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +return cpu->has_spe; +} + +static void arm_set_spe (Object *obj,bool value,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +if (value) { +if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE ); + } + cpu->has_spe = value; +} +unsigned int gt_cntfrq_period_ns (ARMCPU *cpu) {/* @@ -1195,6 +1218,11 @@ void arm_cpu_post_init(Object *obj)object_property_add_bool (obj,"pmu" , arm_get_pmu, arm_set_pmu); }
Quoted 9 lines
target/arm/cpu.c void arm_cpu_post_init(Object *obj) · line 1222
Quoted 2 lines
target/arm/cpu.c +2
-0+if (arm_feature (&cpu->env,ARM_FEATURE_SPE )) { + cpu->has_spe = true;Being a profiling feature, are you sure you want it to be ON by default?
I'd expect the opposite, either being turned on via command line at startup or by a management layer at runtime, when someone is ready to record the perf events and analyze them.
I'm not sure whether it's proper to follow the 'pmu' setting here which has it on by default.
To be honest, I also prefer to turn it off by default(Please refer to the comments in the cover letter).
Quoted 29 lines
Quoted 28 lines
target/arm/cpu.c +3
-0+object_property_add_bool (obj,"spe" , arm_get_spe, arm_set_spe); + } +/* * Allow user to turn off VFP and Neon support, but only for TCG -- * KVM does not currently allow us to lie to the guest about its target/arm/cpu.h +3
-0@@ -822,6 +822,8 @@ struct ARMCPU {bool has_el3;/* CPU has PMU (Performance Monitor Unit) */ bool has_pmu; +/* CPU has SPE (Statistical Profiling Extension) */ +bool has_spe;/* CPU has VFP */ bool has_vfp;/* CPU has Neon */ @@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */ };static inline int arm_feature (CPUARMState *env,int feature)
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
Quoted 8 lines · Haibo Xu
Quoted 7 lines · Philippe Mathieu-Daudé
Hi Haibo,
Quoted 3 lines · Haibo Xu
Adds a spe=[on/off] option to enable/disable vSPE support in guest vCPU. Note this option is only available for "-cpu host" with KVM mode, and default value is on.
You are right, we don't know whether if the feature is announced to the guest, the guest will use the SPE registers, so similarly to PMU have it default ON if available.
Quoted 90 lines
Quoted 45 lines
Quoted 45 lines
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 28 ++++++++++++++++++++++++++++ target/arm/cpu.h | 3 +++ 2 files changed, 31 insertions(+)target/arm/cpu.c +23
-0@@ -1122,6 +1122,29 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool arm_get_spe (Object *obj,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +return cpu->has_spe; +} + +static void arm_set_spe (Object *obj,bool value,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +if (value) { +if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE ); + } + cpu->has_spe = value; +} +unsigned int gt_cntfrq_period_ns (ARMCPU *cpu) {/* @@ -1195,6 +1218,11 @@ void arm_cpu_post_init(Object *obj)object_property_add_bool (obj,"pmu" , arm_get_pmu, arm_set_pmu); }Quoted 9 lines
target/arm/cpu.c void arm_cpu_post_init(Object *obj) · line 1222
Quoted 2 lines
target/arm/cpu.c +2
-0+if (arm_feature (&cpu->env,ARM_FEATURE_SPE )) { + cpu->has_spe = true;Being a profiling feature, are you sure you want it to be ON by default?
I'd expect the opposite, either being turned on via command line at startup or by a management layer at runtime, when someone is ready to record the perf events and analyze them.
I'm not sure whether it's proper to follow the 'pmu' setting here which has it on by default.
To be honest, I also prefer to turn it off by default(Please refer to the comments in the cover letter).Quoted 29 lines
Quoted 28 lines
target/arm/cpu.c +3
-0+object_property_add_bool (obj,"spe" , arm_get_spe, arm_set_spe); + } +/* * Allow user to turn off VFP and Neon support, but only for TCG -- * KVM does not currently allow us to lie to the guest about its target/arm/cpu.h +3
-0@@ -822,6 +822,8 @@ struct ARMCPU {bool has_el3;/* CPU has PMU (Performance Monitor Unit) */ bool has_pmu; +/* CPU has SPE (Statistical Profiling Extension) */ +bool has_spe;/* CPU has VFP */ bool has_vfp;/* CPU has Neon */ @@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */ };static inline int arm_feature (CPUARMState *env,int feature)
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
In reply to Haibo XuQuoted 27 lines · Haibo Xu
Adds a spe=[on/off] option to enable/disable vSPE support in guest vCPU. Note this option is only available for "-cpu host" with KVM mode, and default value is on.
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 28 ++++++++++++++++++++++++++++ target/arm/cpu.h | 3 +++ 2 files changed, 31 insertions(+)target/arm/cpu.c +9
-0@@ -1122,6 +1122,29 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool arm_get_spe (Object *obj,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +return cpu->has_spe; +} + +static void arm_set_spe (Object *obj,bool value,Error **errp) +{
target/arm/cpu.c static void arm_set_pmu(Object *obj, bool value, Error **errp) · line 1143
Quoted 10 lines
target/arm/cpu.c +10
-0+ARMCPU *cpu =ARM_CPU (obj); + +if (value) { +if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE );
See below, we should be using ID register bits instead.
Quoted 8 lines
target/arm/cpu.c +4
-0+ } + cpu->has_spe = value; +} +unsigned int gt_cntfrq_period_ns (ARMCPU *cpu) {/*
target/arm/cpu.c void arm_cpu_post_init(Object *obj) · line 1223
Quoted 6 lines
target/arm/cpu.c +3
-0@@ -1195,6 +1218,11 @@ void arm_cpu_post_init(Object *obj)object_property_add_bool (obj,"pmu" , arm_get_pmu, arm_set_pmu); } +if (arm_feature (&cpu->env,ARM_FEATURE_SPE )) { + cpu->has_spe = true; +object_property_add_bool (obj,"spe" , arm_get_spe, arm_set_spe);
The property should be available even when the host doesn't support the feature. How else can one migrate from a host where the feature is available, but disabled, to a host that doesn't support the feature?
Quoted 19 lines
target/arm/cpu.c +2
-0+ } +/* * Allow user to turn off VFP and Neon support, but only for TCG -- * KVM does not currently allow us to lie to the guest about its target/arm/cpu.h +2
-0@@ -822,6 +822,8 @@ struct ARMCPU {bool has_el3;/* CPU has PMU (Performance Monitor Unit) */ bool has_pmu; +/* CPU has SPE (Statistical Profiling Extension) */ +bool has_spe;/* CPU has VFP */ bool has_vfp;/* CPU has Neon */
target/arm/cpu.h enum arm_features { · line 1964
Quoted 4 lines
target/arm/cpu.h +1
-0@@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */
We shouldn't need to add this feature bit. SPE should have an ID register bit to use instead.
Quoted 7 lines
target/arm/cpu.h +0
-0};static inline int arm_feature (CPUARMState *env,int feature)Signature · 1 line
2.17.1
Thanks,
drew
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
Quoted 8 lines · Andrew Jones
target/arm/cpu.h enum arm_features { · line 1964
Quoted 5 lines
target/arm/cpu.h +1
-0@@ -1959,6 +1961,7 @@ enum arm_features {ARM_FEATURE_VBAR ,/* has cp15 VBAR */ ARM_FEATURE_M_SECURITY ,/* M profile Security Extension */ ARM_FEATURE_M_MAIN ,/* M profile Main Extension */ + ARM_FEATURE_SPE, /* has SPE support */We shouldn't need to add this feature bit. SPE should have an ID register bit to use instead.
Yes indeed: ID_AA64DFR0_EL1.PMSVer.
r~
Re: [PATCH 3/7] target/arm/cpu: spe: Add an option to turn on/off vSPE support
In reply to Haibo XuQuoted 5 lines · Haibo Xu
target/arm/cpu.c +5
-0+static void arm_set_spe (Object *obj,bool value,Error **errp) +{ +ARMCPU *cpu =ARM_CPU (obj); + +if (value) {
target/arm/cpu.c static void arm_set_pmu(Object *obj, bool value, Error **errp) · line 1146
Quoted 10 lines
target/arm/cpu.c +10
-0+if (kvm_enabled () && !kvm_arm_spe_supported ()) { +error_setg (errp,"'spe' feature not supported by KVM on this host" ); +return ; + } +set_feature (&cpu->env,ARM_FEATURE_SPE ); + }else { +unset_feature (&cpu->env,ARM_FEATURE_SPE ); + } + cpu->has_spe = value; +}
I think you want to simply set cpu->has_spe here, and leave the adjustment of ID_AA64DFR0 to a finalize routine. Because there are multiple values that PMSVer can take.
Once the get/set routines are only setting a flag on ARMCPU, you can use a simpler property interface:
static Property arm_cpu_spe_property =
DEFINE_PROP_BOOL("spe", ARMCPU, has_spe, true);qdev_property_add_static(DEVICE(obj), &arm_cpu_spe_property);
The finalize routine would be called from arm_cpu_finalize_features(), much like the existing arm_cpu_sve_finalize().
Since you're only registering the spe property when the selected cpu supports spe, the finalize routine only needs to set PMSVer to 0 to turn it off, preserving the initial enabled value of 1 or 2.
r~
PATCH 4/7 target/arm/kvm: spe: Unify device attr operatioin helper
In reply to Haibo XuRename kvm_arm_pmu_set_attr() to kvm_arm_dev_set_attr(), So both the vPMU and vSPE device can share the same API.
--- target/arm/kvm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
target/arm/kvm64.c +3 -3
@@ -398,7 +398,7 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)return NULL ; } -static bool kvm_arm_pmu_set_attr (CPUState *cs,struct kvm_device_attr *attr) +static bool kvm_arm_dev_set_attr (CPUState *cs,struct kvm_device_attr *attr) {int err;
@@ -427,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to init PMU" );abort (); }
@@ -444,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to set irq for PMU" );abort (); }
Signature · 1 line
2.17.1
Re: [PATCH 4/7] target/arm/kvm: spe: Unify device attr operatioin helper
Quoted 1 line · Haibo Xu
Rename
kvm_arm_pmu_set_attr()tokvm_arm_dev_set_attr(),
Maybe rename kvm_arm_device_set_attr() to match the structure name?
Quoted 3 lines
So both the vPMU and vSPE device can share the same API.
Signed-off-by Haibo Xu <[email protected]>
Regardless, with the typo "operation" in patch subject fixed:
Quoted 36 lines
--- target/arm/kvm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)target/arm/kvm64.c +3
-3@@ -398,7 +398,7 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)return NULL ; } -static bool kvm_arm_pmu_set_attr (CPUState *cs,struct kvm_device_attr *attr) +static bool kvm_arm_dev_set_attr (CPUState *cs,struct kvm_device_attr *attr) {int err;@@ -427,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to init PMU" );abort (); }@@ -444,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to set irq for PMU" );abort (); }
Re: [PATCH 4/7] target/arm/kvm: spe: Unify device attr operatioin helper
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 1 line · Haibo Xu
Rename
kvm_arm_pmu_set_attr()tokvm_arm_dev_set_attr(),Maybe rename
kvm_arm_device_set_attr()to match the structure name?
Thanks for the review! I will update it in the next version.
Quoted 44 lines
Quoted 3 lines
So both the vPMU and vSPE device can share the same API.
Signed-off-by Haibo Xu <[email protected]>Regardless, with the typo "operation" in patch subject fixed:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Quoted 36 lines
--- target/arm/kvm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)target/arm/kvm64.c +3
-3@@ -398,7 +398,7 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)return NULL ; } -static bool kvm_arm_pmu_set_attr (CPUState *cs,struct kvm_device_attr *attr) +static bool kvm_arm_dev_set_attr (CPUState *cs,struct kvm_device_attr *attr) {int err;@@ -427,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to init PMU" );abort (); }@@ -444,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to set irq for PMU" );abort (); }
Re: [PATCH 4/7] target/arm/kvm: spe: Unify device attr operatioin helper
Quoted 10 lines · Haibo Xu
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 1 line · Haibo Xu
Rename
kvm_arm_pmu_set_attr()tokvm_arm_dev_set_attr(),Maybe rename
kvm_arm_device_set_attr()to match the structure name?Thanks for the review! I will update it in the next version.
I've already renamed it to kvm_arm_set_device_attr() in [1]. Also, it's not enough to just rename the function. The error messages the function may generate have "PMU" embedded in them.
[1] https://www.mail-archive.com/[email protected]/msg727590.html
Thanks,
drew
Quoted 46 lines
Quoted 45 lines
Quoted 4 lines
So both the vPMU and vSPE device can share the same API.
Signed-off-by Haibo Xu <[email protected]>Regardless, with the typo "operation" in patch subject fixed:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Quoted 36 lines
--- target/arm/kvm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)target/arm/kvm64.c +3
-3@@ -398,7 +398,7 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)return NULL ; } -static bool kvm_arm_pmu_set_attr (CPUState *cs,struct kvm_device_attr *attr) +static bool kvm_arm_dev_set_attr (CPUState *cs,struct kvm_device_attr *attr) {int err;@@ -427,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to init PMU" );abort (); }@@ -444,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to set irq for PMU" );abort (); }
Re: [PATCH 4/7] target/arm/kvm: spe: Unify device attr operatioin helper
Quoted 13 lines · Andrew Jones
Quoted 10 lines · Haibo Xu
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 1 line · Haibo Xu
Rename
kvm_arm_pmu_set_attr()tokvm_arm_dev_set_attr(),Maybe rename
kvm_arm_device_set_attr()to match the structure name?Thanks for the review! I will update it in the next version.
Quoted 9 lines
I've already renamed it to
kvm_arm_set_device_attr()in [1]. Also, it's not enough to just rename the function. The error messages the function may generate have "PMU" embedded in them.[1] https://www.mail-archive.com/[email protected]/msg727590.html
Thanks,
drew
Thanks for your review, Andrew!
Will rebase on your patches in the next version.
Quoted 47 lines
Quoted 46 lines
Quoted 45 lines
Quoted 4 lines
So both the vPMU and vSPE device can share the same API.
Signed-off-by Haibo Xu <[email protected]>Regardless, with the typo "operation" in patch subject fixed:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Quoted 36 lines
--- target/arm/kvm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)target/arm/kvm64.c +3
-3@@ -398,7 +398,7 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr)return NULL ; } -static bool kvm_arm_pmu_set_attr (CPUState *cs,struct kvm_device_attr *attr) +static bool kvm_arm_dev_set_attr (CPUState *cs,struct kvm_device_attr *attr) {int err;@@ -427,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to init PMU" );abort (); }@@ -444,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)if (!ARM_CPU (cs)->has_pmu) {return ; } -if (!kvm_arm_pmu_set_attr (cs, &attr)) { +if (!kvm_arm_dev_set_attr (cs, &attr)) {error_report ("failed to set irq for PMU" );abort (); }
PATCH 5/7 target/arm/kvm: spe: Add device init and set_irq operations
In reply to Haibo Xu--- target/arm/kvm64.c | 33 +++++++++++++++++++++++++++++++++ target/arm/kvm_arm.h | 5 +++++ 2 files changed, 38 insertions(+)
target/arm/kvm64.c +33 -0
@@ -450,6 +450,39 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq) } } +void kvm_arm_spe_init (CPUState *cs) +{ +struct kvm_device_attr attr = { + .group =KVM_ARM_VCPU_SPE_V1_CTRL , + .attr =KVM_ARM_VCPU_SPE_V1_INIT , + }; + +if (!ARM_CPU (cs)->has_spe) { +return ; + } +if (!kvm_arm_dev_set_attr (cs, &attr)) { +error_report ("failed to init SPE" ); +abort (); + } +} + +void kvm_arm_spe_set_irq (CPUState *cs,int irq) +{ +struct kvm_device_attr attr = { + .group =KVM_ARM_VCPU_SPE_V1_CTRL , + .addr = (intptr_t )&irq, + .attr =KVM_ARM_VCPU_SPE_V1_IRQ , + }; + +if (!ARM_CPU (cs)->has_spe) { +return ; + } +if (!kvm_arm_dev_set_attr (cs, &attr)) { +error_report ("failed to set irq for SPE" ); +abort (); + } +} +static int read_sys_reg32 (int fd,uint32_t *pret,uint64_t id) {uint64_t ret;
target/arm/kvm_arm.h +5 -0
@@ -348,6 +348,8 @@ int kvm_arm_vgic_probe(void);void kvm_arm_pmu_set_irq (CPUState *cs,int irq);void kvm_arm_pmu_init (CPUState *cs); +void kvm_arm_spe_set_irq (CPUState *cs,int irq); +void kvm_arm_spe_init (CPUState *cs);int kvm_arm_set_irq (int cpu,int irqtype,int irq,int level);#else
@@ -397,6 +399,9 @@ static inline int kvm_arm_vgic_probe(void)static inline void kvm_arm_pmu_set_irq (CPUState *cs,int irq) {}static inline void kvm_arm_pmu_init (CPUState *cs) {} +static inline void kvm_arm_spe_set_irq (CPUState *cs,int irq) {} +static inline void kvm_arm_spe_init (CPUState *cs) {} +static inline void kvm_arm_sve_get_vls (CPUState *cs,unsigned long *map) {}static inline void kvm_arm_get_virtual_time (CPUState *cs) {}
Signature · 1 line
2.17.1
PATCH 6/7 hw/arm/virt: spe: Add SPE fdt binding for virt machine
In reply to Haibo XuAdd a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
--- hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + target/arm/cpu.c | 2 ++ target/arm/cpu.h | 2 ++ target/arm/kvm.c | 6 ++++++ 7 files changed, 57 insertions(+)
hw/arm/virt-acpi-build.c +3 -0
@@ -666,6 +666,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)if (arm_feature (&armcpu->env,ARM_FEATURE_PMU )) { gicc->performance_interrupt =cpu_to_le32 (PPI (VIRTUAL_PMU_IRQ )); } +if (arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { + gicc->spe_interrupt =cpu_to_le32 (PPI (VIRTUAL_SPE_IRQ )); + }if (vms->virt) { gicc->vgic_interrupt =cpu_to_le32 (PPI (ARCH_GIC_MAINT_IRQ )); }
hw/arm/virt.c +42 -0
60 lines not on this page · raw message
include/hw/acpi/acpi-defs.h +1 -0
@@ -302,6 +302,7 @@ struct AcpiMadtGenericCpuInterface {uint32_t vgic_interrupt;uint64_t gicr_base_address;uint64_t arm_mpidr; +uint16_t spe_interrupt;/* ACPI 6.3 */ }QEMU_PACKED ;typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ;
include/hw/arm/virt.h +1 -0
@@ -49,6 +49,7 @@#define ARCH_TIMER_NS_EL1_IRQ 14#define ARCH_TIMER_NS_EL2_IRQ 10 +#define VIRTUAL_SPE_IRQ 5#define VIRTUAL_PMU_IRQ 7#define PPI (irq) ((irq) + 16)
target/arm/cpu.c +2 -0
@@ -1038,6 +1038,8 @@ static void arm_cpu_initfn(Object *obj) "gicv3-maintenance-interrupt", 1);qdev_init_gpio_out_named (DEVICE (cpu), &cpu->pmu_interrupt,"pmu-interrupt" ,1 ); +qdev_init_gpio_out_named (DEVICE (cpu), &cpu->spe_interrupt, +"spe-interrupt" ,1 );#endif /* DTB consumers generally don't in fact care what the 'compatible'
target/arm/cpu.h +2 -0
@@ -790,6 +790,8 @@ struct ARMCPU {qemu_irq gicv3_maintenance_interrupt;/* GPIO output for the PMU interrupt */ qemu_irq pmu_interrupt; +/* GPIO output for the SPE interrupt */ +qemu_irq spe_interrupt;/* MemoryRegion to use for secure physical accesses */ MemoryRegion *secure_memory;
target/arm/kvm.c +6 -0
@@ -820,6 +820,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) switched_level &= ~KVM_ARM_DEV_PMU ; } +if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +if (switched_level) {qemu_log_mask (LOG_UNIMP ,"%s: unhandled in-kernel device IRQ %x\n" , __func__, switched_level);
Signature · 1 line
2.17.1
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
Quoted 2 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Any reason PPI 5 was selected?
Quoted 59 lines
Signed-off-by Haibo Xu <[email protected]>--- hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + target/arm/cpu.c | 2 ++ target/arm/cpu.h | 2 ++ target/arm/kvm.c | 6 ++++++ 7 files changed, 57 insertions(+)hw/arm/virt-acpi-build.c +3
-0@@ -666,6 +666,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)if (arm_feature (&armcpu->env,ARM_FEATURE_PMU )) { gicc->performance_interrupt =cpu_to_le32 (PPI (VIRTUAL_PMU_IRQ )); } +if (arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { + gicc->spe_interrupt =cpu_to_le32 (PPI (VIRTUAL_SPE_IRQ )); + }if (vms->virt) { gicc->vgic_interrupt =cpu_to_le32 (PPI (ARCH_GIC_MAINT_IRQ )); }hw/arm/virt.c +25
-0@@ -555,6 +555,42 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms) } } +static void fdt_add_spe_nodes (const VirtMachineState *vms) +{ +CPUState *cpu; +ARMCPU *armcpu; +uint32_t irqflags =GIC_FDT_IRQ_FLAGS_LEVEL_HI ; + +CPU_FOREACH (cpu) { + armcpu =ARM_CPU (cpu); +if (!arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { +return ; + } +if (kvm_enabled ()) { +if (kvm_irqchip_in_kernel ()) { +kvm_arm_spe_set_irq (cpu,PPI (VIRTUAL_SPE_IRQ )); + } +kvm_arm_spe_init (cpu); + } + } + +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) { + irqflags =deposit32 (irqflags,GIC_FDT_IRQ_PPI_CPU_START , +GIC_FDT_IRQ_PPI_CPU_WIDTH , + (1 << vms->smp_cpus) -1 ); + } +
hw/arm/virt.c static void fdt_add_pmu_nodes(const VirtMachineState *vms) · line 592
Quoted 10 lines
hw/arm/virt.c +10
-0+ armcpu =ARM_CPU (qemu_get_cpu (0 )); +qemu_fdt_add_subnode (vms->fdt,"/spe" ); +if (arm_feature (&armcpu->env,ARM_FEATURE_V8 )) { +const char compat[] ="arm,statistical-profiling-extension-v1" ; +qemu_fdt_setprop (vms->fdt,"/spe" ,"compatible" , + compat,sizeof (compat)); +qemu_fdt_setprop_cells (vms->fdt,"/spe" ,"interrupts" , +GIC_FDT_IRQ_TYPE_PPI ,VIRTUAL_SPE_IRQ , irqflags); + } +}
Please look at [1]. I've refactored fdt_add_pmu_nodes(), so it no longer makes a good pattern for this function.
[1] https://www.mail-archive.com/[email protected]/msg727588.html
Quoted 16 lines
hw/arm/virt.c +5
-0+static inline DeviceState *create_acpi_ged (VirtMachineState *vms) {DeviceState *dev;@@ -727,6 +763,10 @@ static void create_gic(VirtMachineState *vms)qdev_get_gpio_in (vms->gic, ppibase + VIRTUAL_PMU_IRQ)); +qdev_connect_gpio_out_named (cpudev,"spe-interrupt" ,0 , +qdev_get_gpio_in (vms->gic, ppibase + +VIRTUAL_SPE_IRQ )); +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ ));sysbus_connect_irq (gicbusdev, i + smp_cpus,qdev_get_gpio_in (cpudev,ARM_CPU_FIQ ));
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1959
Quoted 5 lines
hw/arm/virt.c +2
-0@@ -1915,6 +1955,8 @@ static void machvirt_init(MachineState *machine)fdt_add_pmu_nodes (vms); +fdt_add_spe_nodes (vms); +
You didn't add any compat code, which means all virt machine types are now getting an SPE FDT node, ACPI table change, and, most importantly, PPI 5 has gone from unallocated to allocated. We definitely need compat code.
Quoted 58 lines
hw/arm/virt.c +0
-0create_uart (vms,VIRT_UART , sysmem,serial_hd (0 ));if (vms->secure) {include/hw/acpi/acpi-defs.h +1
-0@@ -302,6 +302,7 @@ struct AcpiMadtGenericCpuInterface {uint32_t vgic_interrupt;uint64_t gicr_base_address;uint64_t arm_mpidr; +uint16_t spe_interrupt;/* ACPI 6.3 */ }QEMU_PACKED ;typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ;include/hw/arm/virt.h +1
-0@@ -49,6 +49,7 @@#define ARCH_TIMER_NS_EL1_IRQ 14#define ARCH_TIMER_NS_EL2_IRQ 10 +#define VIRTUAL_SPE_IRQ 5#define VIRTUAL_PMU_IRQ 7#define PPI (irq) ((irq) + 16)target/arm/cpu.c +2
-0@@ -1038,6 +1038,8 @@ static void arm_cpu_initfn(Object *obj) "gicv3-maintenance-interrupt", 1);qdev_init_gpio_out_named (DEVICE (cpu), &cpu->pmu_interrupt,"pmu-interrupt" ,1 ); +qdev_init_gpio_out_named (DEVICE (cpu), &cpu->spe_interrupt, +"spe-interrupt" ,1 );#endif /* DTB consumers generally don't in fact care what the 'compatible' target/arm/cpu.h +2
-0@@ -790,6 +790,8 @@ struct ARMCPU {qemu_irq gicv3_maintenance_interrupt;/* GPIO output for the PMU interrupt */ qemu_irq pmu_interrupt; +/* GPIO output for the SPE interrupt */ +qemu_irq spe_interrupt;/* MemoryRegion to use for secure physical accesses */ MemoryRegion *secure_memory;target/arm/kvm.c +0
-0
target/arm/kvm.c MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) · line 828
Quoted 9 lines
target/arm/kvm.c +6
-0@@ -820,6 +820,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) switched_level &= ~KVM_ARM_DEV_PMU ; } +if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +
Did you test with a userspace irqchip?
Quoted 7 lines
target/arm/kvm.c +0
-0if (switched_level) {qemu_log_mask (LOG_UNIMP ,"%s: unhandled in-kernel device IRQ %x\n" , __func__, switched_level);Signature · 1 line
2.17.1
Thanks,
drew
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
Quoted 7 lines · Andrew Jones
Quoted 2 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Any reason PPI 5 was selected?
No special reason to choose PPI 5. Just re-use the setting in kvmtool.
Quoted 73 lines
Quoted 59 lines
Signed-off-by Haibo Xu <[email protected]>--- hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + target/arm/cpu.c | 2 ++ target/arm/cpu.h | 2 ++ target/arm/kvm.c | 6 ++++++ 7 files changed, 57 insertions(+)hw/arm/virt-acpi-build.c +3
-0@@ -666,6 +666,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)if (arm_feature (&armcpu->env,ARM_FEATURE_PMU )) { gicc->performance_interrupt =cpu_to_le32 (PPI (VIRTUAL_PMU_IRQ )); } +if (arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { + gicc->spe_interrupt =cpu_to_le32 (PPI (VIRTUAL_SPE_IRQ )); + }if (vms->virt) { gicc->vgic_interrupt =cpu_to_le32 (PPI (ARCH_GIC_MAINT_IRQ )); }hw/arm/virt.c +25
-0@@ -555,6 +555,42 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms) } } +static void fdt_add_spe_nodes (const VirtMachineState *vms) +{ +CPUState *cpu; +ARMCPU *armcpu; +uint32_t irqflags =GIC_FDT_IRQ_FLAGS_LEVEL_HI ; + +CPU_FOREACH (cpu) { + armcpu =ARM_CPU (cpu); +if (!arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { +return ; + } +if (kvm_enabled ()) { +if (kvm_irqchip_in_kernel ()) { +kvm_arm_spe_set_irq (cpu,PPI (VIRTUAL_SPE_IRQ )); + } +kvm_arm_spe_init (cpu); + } + } + +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) { + irqflags =deposit32 (irqflags,GIC_FDT_IRQ_PPI_CPU_START , +GIC_FDT_IRQ_PPI_CPU_WIDTH , + (1 << vms->smp_cpus) -1 ); + } +hw/arm/virt.c static void fdt_add_pmu_nodes(const VirtMachineState *vms) · line 592
Quoted 10 lines
hw/arm/virt.c +10
-0+ armcpu =ARM_CPU (qemu_get_cpu (0 )); +qemu_fdt_add_subnode (vms->fdt,"/spe" ); +if (arm_feature (&armcpu->env,ARM_FEATURE_V8 )) { +const char compat[] ="arm,statistical-profiling-extension-v1" ; +qemu_fdt_setprop (vms->fdt,"/spe" ,"compatible" , + compat,sizeof (compat)); +qemu_fdt_setprop_cells (vms->fdt,"/spe" ,"interrupts" , +GIC_FDT_IRQ_TYPE_PPI ,VIRTUAL_SPE_IRQ , irqflags); + } +}Please look at [1]. I've refactored
fdt_add_pmu_nodes(), so it no longer makes a good pattern for this function.
Quoted 3 lines
[1] https://www.mail-archive.com/[email protected]/msg727588.html
Ok, I will spend some time studying your patches, and rework the related patches in the next version.
Quoted 17 lines
Quoted 17 lines
hw/arm/virt.c +5
-0+static inline DeviceState *create_acpi_ged (VirtMachineState *vms) {DeviceState *dev;@@ -727,6 +763,10 @@ static void create_gic(VirtMachineState *vms)qdev_get_gpio_in (vms->gic, ppibase + VIRTUAL_PMU_IRQ)); +qdev_connect_gpio_out_named (cpudev,"spe-interrupt" ,0 , +qdev_get_gpio_in (vms->gic, ppibase + +VIRTUAL_SPE_IRQ )); +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ ));sysbus_connect_irq (gicbusdev, i + smp_cpus,qdev_get_gpio_in (cpudev,ARM_CPU_FIQ ));@@ -1915,6 +1955,8 @@ static void machvirt_init(MachineState *machine)
Quoted 9 lines
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1959
Quoted 4 lines
hw/arm/virt.c +2
-0fdt_add_pmu_nodes (vms); +fdt_add_spe_nodes (vms); +You didn't add any compat code, which means all virt machine types are now getting an SPE FDT node, ACPI table change, and, most importantly, PPI 5 has gone from unallocated to allocated. We definitely need compat code.
So the 'compat code' here means to only add the SPE node in KVM mode?
Quoted 61 lines
Quoted 61 lines
hw/arm/virt.c +0
-0create_uart (vms,VIRT_UART , sysmem,serial_hd (0 ));if (vms->secure) {include/hw/acpi/acpi-defs.h +1
-0@@ -302,6 +302,7 @@ struct AcpiMadtGenericCpuInterface {uint32_t vgic_interrupt;uint64_t gicr_base_address;uint64_t arm_mpidr; +uint16_t spe_interrupt;/* ACPI 6.3 */ }QEMU_PACKED ;typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ;include/hw/arm/virt.h +1
-0@@ -49,6 +49,7 @@#define ARCH_TIMER_NS_EL1_IRQ 14#define ARCH_TIMER_NS_EL2_IRQ 10 +#define VIRTUAL_SPE_IRQ 5#define VIRTUAL_PMU_IRQ 7#define PPI (irq) ((irq) + 16)target/arm/cpu.c +2
-0@@ -1038,6 +1038,8 @@ static void arm_cpu_initfn(Object *obj) "gicv3-maintenance-interrupt", 1);qdev_init_gpio_out_named (DEVICE (cpu), &cpu->pmu_interrupt,"pmu-interrupt" ,1 ); +qdev_init_gpio_out_named (DEVICE (cpu), &cpu->spe_interrupt, +"spe-interrupt" ,1 );#endif /* DTB consumers generally don't in fact care what the 'compatible' target/arm/cpu.h +2
-0@@ -790,6 +790,8 @@ struct ARMCPU {qemu_irq gicv3_maintenance_interrupt;/* GPIO output for the PMU interrupt */ qemu_irq pmu_interrupt; +/* GPIO output for the SPE interrupt */ +qemu_irq spe_interrupt;/* MemoryRegion to use for secure physical accesses */ MemoryRegion *secure_memory;target/arm/kvm.c +0
-0@@ -820,6 +820,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) switched_level &= ~KVM_ARM_DEV_PMU ; }
Quoted 8 lines
target/arm/kvm.c MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) · line 828
Quoted 6 lines
target/arm/kvm.c +6
-0+if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +Did you test with a userspace irqchip?
No, I just tested with an in-kernel irqchip.
Actually, the current kernel vSPE patch doesn't support a userspace irqchip. AFAIK, the userspace irqchip support should be ready in the next kernel patch series
which will be sent out for review in the middle of September.
Quoted 12 lines
Quoted 8 lines
target/arm/kvm.c +0
-1if (switched_level) {qemu_log_mask (LOG_UNIMP ,"%s: unhandled in-kernel device IRQ %x\n" , __func__, switched_level); --2.17.1
Thanks,
drew
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
Quoted 10 lines · Haibo Xu
Quoted 7 lines · Andrew Jones
Quoted 2 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Any reason PPI 5 was selected?
No special reason to choose PPI 5. Just re-use the setting in kvmtool.
Please write in the commit message that kvmtool has already selected PPI 5 for this purpose.
Quoted 9 lines
Quoted 7 lines
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1959
Quoted 2 lines
hw/arm/virt.c +2
-0+fdt_add_spe_nodes (vms); +You didn't add any compat code, which means all virt machine types are now getting an SPE FDT node, ACPI table change, and, most importantly, PPI 5 has gone from unallocated to allocated. We definitely need compat code.
So the 'compat code' here means to only add the SPE node in KVM mode?
No, it means only add it for the 5.2 and later machine types. You'll see what I mean when you study the patchset I pointed out, which is also only for 5.2 and later machine types.
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
target/arm/kvm.c +6
-0+if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +
Quoted 7 lines
Quoted 1 line
Did you test with a userspace irqchip?
No, I just tested with an in-kernel irqchip.
Actually, the current kernel vSPE patch doesn't support a userspace irqchip. AFAIK, the userspace irqchip support should be ready in the next kernel patch series
which will be sent out for review in the middle of September.
It probably doesn't hurt to do the above hunk already, hoping it will just work when it's possible to test, but I generally prefer only adding tested code. Maybe this hunk should be a separate patch with a commit message explaining that it's untested?
Thanks,
drew
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
Quoted 7 lines · Andrew Jones
Quoted 6 lines · Haibo Xu
Quoted 5 lines · Andrew Jones
Quoted 2 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Any reason PPI 5 was selected?
No special reason to choose PPI 5. Just re-use the setting in kvmtool.
Please write in the commit message that kvmtool has already selected PPI 5 for this purpose.
Ok, will fix it.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 1959
Quoted 2 lines
hw/arm/virt.c +2
-0+fdt_add_spe_nodes (vms); +You didn't add any compat code, which means all virt machine types are
now
Quoted 1 line
Quoted 1 line
getting an SPE FDT node, ACPI table change, and, most importantly, PPI
5
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
has gone from unallocated to allocated. We definitely need compat code.
So the 'compat code' here means to only add the SPE node in KVM mode?
No, it means only add it for the 5.2 and later machine types. You'll see what I mean when you study the patchset I pointed out, which is also only for 5.2 and later machine types.
Ok, thanks for the clarification!
Quoted 13 lines
Quoted 3 lines
Quoted 3 lines
target/arm/kvm.c MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)
Quoted 3 lines
target/arm/kvm.c +3
-0+if (switched_level &KVM_ARM_DEV_SPE ) { + qemu_set_irq(cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &
KVM_ARM_DEV_SPE));Quoted 8 lines
Quoted 5 lines
target/arm/kvm.c MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) · line 828
Quoted 3 lines
target/arm/kvm.c +3
-0+ switched_level &= ~KVM_ARM_DEV_SPE ; + } +Did you test with a userspace irqchip?
No, I just tested with an in-kernel irqchip.
Actually, the current kernel vSPE patch doesn't support a userspaceirqchip.
Quoted 9 lines
Quoted 3 lines
AFAIK, the userspace irqchip support should be ready in the next kernel patch series
which will be sent out for review in the middle of September.It probably doesn't hurt to do the above hunk already, hoping it will just work when it's possible to test, but I generally prefer only adding tested code. Maybe this hunk should be a separate patch with a commit message explaining that it's untested?
Good idea! I will drop the hunk in this series, and send out a separate patch to enable it
once the kernel support is ready!
Quoted 4 lines
Thanks,
drew
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
In reply to Haibo XuHi Haibo,
Quoted 100 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Signed-off-by Haibo Xu <[email protected]>--- hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + target/arm/cpu.c | 2 ++ target/arm/cpu.h | 2 ++ target/arm/kvm.c | 6 ++++++ 7 files changed, 57 insertions(+)hw/arm/virt-acpi-build.c +3
-0@@ -666,6 +666,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)if (arm_feature (&armcpu->env,ARM_FEATURE_PMU )) { gicc->performance_interrupt =cpu_to_le32 (PPI (VIRTUAL_PMU_IRQ )); } +if (arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { + gicc->spe_interrupt =cpu_to_le32 (PPI (VIRTUAL_SPE_IRQ )); + }if (vms->virt) { gicc->vgic_interrupt =cpu_to_le32 (PPI (ARCH_GIC_MAINT_IRQ )); }hw/arm/virt.c +42
-0@@ -555,6 +555,42 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms) } } +static void fdt_add_spe_nodes (const VirtMachineState *vms) +{ +CPUState *cpu; +ARMCPU *armcpu; +uint32_t irqflags =GIC_FDT_IRQ_FLAGS_LEVEL_HI ; + +CPU_FOREACH (cpu) { + armcpu =ARM_CPU (cpu); +if (!arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { +return ; + } +if (kvm_enabled ()) { +if (kvm_irqchip_in_kernel ()) { +kvm_arm_spe_set_irq (cpu,PPI (VIRTUAL_SPE_IRQ )); + } +kvm_arm_spe_init (cpu); + } + } + +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) { + irqflags =deposit32 (irqflags,GIC_FDT_IRQ_PPI_CPU_START , +GIC_FDT_IRQ_PPI_CPU_WIDTH , + (1 << vms->smp_cpus) -1 ); + } + + armcpu =ARM_CPU (qemu_get_cpu (0 )); +qemu_fdt_add_subnode (vms->fdt,"/spe" ); +if (arm_feature (&armcpu->env,ARM_FEATURE_V8 )) { +const char compat[] ="arm,statistical-profiling-extension-v1" ; +qemu_fdt_setprop (vms->fdt,"/spe" ,"compatible" , + compat,sizeof (compat)); +qemu_fdt_setprop_cells (vms->fdt,"/spe" ,"interrupts" , +GIC_FDT_IRQ_TYPE_PPI ,VIRTUAL_SPE_IRQ , irqflags); + } +} +static inline DeviceState *create_acpi_ged (VirtMachineState *vms) {DeviceState *dev;@@ -727,6 +763,10 @@ static void create_gic(VirtMachineState *vms)qdev_get_gpio_in (vms->gic, ppibase + VIRTUAL_PMU_IRQ)); +qdev_connect_gpio_out_named (cpudev,"spe-interrupt" ,0 , +qdev_get_gpio_in (vms->gic, ppibase + +VIRTUAL_SPE_IRQ )); +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ ));sysbus_connect_irq (gicbusdev, i + smp_cpus,qdev_get_gpio_in (cpudev,ARM_CPU_FIQ ));@@ -1915,6 +1955,8 @@ static void machvirt_init(MachineState *machine)fdt_add_pmu_nodes (vms); +fdt_add_spe_nodes (vms); +create_uart (vms,VIRT_UART , sysmem,serial_hd (0 ));if (vms->secure) {include/hw/acpi/acpi-defs.h +0
-0
include/hw/acpi/acpi-defs.h struct AcpiMadtGenericCpuInterface { · line 305
Quoted 4 lines
include/hw/acpi/acpi-defs.h +1
-0@@ -302,6 +302,7 @@ struct AcpiMadtGenericCpuInterface {uint32_t vgic_interrupt;uint64_t gicr_base_address;uint64_t arm_mpidr; +uint16_t spe_interrupt;/* ACPI 6.3 */
This does not work for me.
You miss 2 uint8_t fields inbetween arm_mpdir and spe_interrupt:
Processor Power Efficiency Class and Reserved.
At the moment arm_spe_acpi_register_device() silently fails on guest side sincegicc->header.length < ACPI_MADT_GICC_SPE
Thanks
Eric
Quoted 59 lines
include/hw/acpi/acpi-defs.h +0
-0}QEMU_PACKED ;typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ;include/hw/arm/virt.h +1
-0@@ -49,6 +49,7 @@#define ARCH_TIMER_NS_EL1_IRQ 14#define ARCH_TIMER_NS_EL2_IRQ 10 +#define VIRTUAL_SPE_IRQ 5#define VIRTUAL_PMU_IRQ 7#define PPI (irq) ((irq) + 16)target/arm/cpu.c +2
-0@@ -1038,6 +1038,8 @@ static void arm_cpu_initfn(Object *obj) "gicv3-maintenance-interrupt", 1);qdev_init_gpio_out_named (DEVICE (cpu), &cpu->pmu_interrupt,"pmu-interrupt" ,1 ); +qdev_init_gpio_out_named (DEVICE (cpu), &cpu->spe_interrupt, +"spe-interrupt" ,1 );#endif /* DTB consumers generally don't in fact care what the 'compatible' target/arm/cpu.h +2
-0@@ -790,6 +790,8 @@ struct ARMCPU {qemu_irq gicv3_maintenance_interrupt;/* GPIO output for the PMU interrupt */ qemu_irq pmu_interrupt; +/* GPIO output for the SPE interrupt */ +qemu_irq spe_interrupt;/* MemoryRegion to use for secure physical accesses */ MemoryRegion *secure_memory;target/arm/kvm.c +6
-0@@ -820,6 +820,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) switched_level &= ~KVM_ARM_DEV_PMU ; } +if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +if (switched_level) {qemu_log_mask (LOG_UNIMP ,"%s: unhandled in-kernel device IRQ %x\n" , __func__, switched_level);
Re: [PATCH 6/7] hw/arm/virt: spe: Add SPE fdt binding for virt machine
Quoted 112 lines · Auger Eric
Hi Haibo,
Quoted 100 lines · Haibo Xu
Add a virtual SPE device for virt machine while using PPI 5 for SPE overflow interrupt number.
Signed-off-by Haibo Xu <[email protected]>--- hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 +++++++++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + target/arm/cpu.c | 2 ++ target/arm/cpu.h | 2 ++ target/arm/kvm.c | 6 ++++++ 7 files changed, 57 insertions(+)hw/arm/virt-acpi-build.c +3
-0@@ -666,6 +666,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)if (arm_feature (&armcpu->env,ARM_FEATURE_PMU )) { gicc->performance_interrupt =cpu_to_le32 (PPI (VIRTUAL_PMU_IRQ )); } +if (arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { + gicc->spe_interrupt =cpu_to_le32 (PPI (VIRTUAL_SPE_IRQ )); + }if (vms->virt) { gicc->vgic_interrupt =cpu_to_le32 (PPI (ARCH_GIC_MAINT_IRQ )); }hw/arm/virt.c +42
-0@@ -555,6 +555,42 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms) } } +static void fdt_add_spe_nodes (const VirtMachineState *vms) +{ +CPUState *cpu; +ARMCPU *armcpu; +uint32_t irqflags =GIC_FDT_IRQ_FLAGS_LEVEL_HI ; + +CPU_FOREACH (cpu) { + armcpu =ARM_CPU (cpu); +if (!arm_feature (&armcpu->env,ARM_FEATURE_SPE )) { +return ; + } +if (kvm_enabled ()) { +if (kvm_irqchip_in_kernel ()) { +kvm_arm_spe_set_irq (cpu,PPI (VIRTUAL_SPE_IRQ )); + } +kvm_arm_spe_init (cpu); + } + } + +if (vms->gic_version ==VIRT_GIC_VERSION_2 ) { + irqflags =deposit32 (irqflags,GIC_FDT_IRQ_PPI_CPU_START , +GIC_FDT_IRQ_PPI_CPU_WIDTH , + (1 << vms->smp_cpus) -1 ); + } + + armcpu =ARM_CPU (qemu_get_cpu (0 )); +qemu_fdt_add_subnode (vms->fdt,"/spe" ); +if (arm_feature (&armcpu->env,ARM_FEATURE_V8 )) { +const char compat[] ="arm,statistical-profiling-extension-v1" ; +qemu_fdt_setprop (vms->fdt,"/spe" ,"compatible" , + compat,sizeof (compat)); +qemu_fdt_setprop_cells (vms->fdt,"/spe" ,"interrupts" , +GIC_FDT_IRQ_TYPE_PPI ,VIRTUAL_SPE_IRQ , irqflags); + } +} +static inline DeviceState *create_acpi_ged (VirtMachineState *vms) {DeviceState *dev;@@ -727,6 +763,10 @@ static void create_gic(VirtMachineState *vms)qdev_get_gpio_in (vms->gic, ppibase + VIRTUAL_PMU_IRQ)); +qdev_connect_gpio_out_named (cpudev,"spe-interrupt" ,0 , +qdev_get_gpio_in (vms->gic, ppibase + +VIRTUAL_SPE_IRQ )); +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ ));sysbus_connect_irq (gicbusdev, i + smp_cpus,qdev_get_gpio_in (cpudev,ARM_CPU_FIQ ));@@ -1915,6 +1955,8 @@ static void machvirt_init(MachineState *machine)fdt_add_pmu_nodes (vms); +fdt_add_spe_nodes (vms); +create_uart (vms,VIRT_UART , sysmem,serial_hd (0 ));if (vms->secure) {include/hw/acpi/acpi-defs.h +0
-0include/hw/acpi/acpi-defs.h struct AcpiMadtGenericCpuInterface { · line 305
Quoted 4 lines
include/hw/acpi/acpi-defs.h +1
-0@@ -302,6 +302,7 @@ struct AcpiMadtGenericCpuInterface {uint32_t vgic_interrupt;uint64_t gicr_base_address;uint64_t arm_mpidr; +uint16_t spe_interrupt;/* ACPI 6.3 */ This does not work for me.
You miss 2uint8_tfields inbetweenarm_mpdirandspe_interrupt:
Processor Power Efficiency Class and Reserved.
Quoted 8 lines
At the moment
arm_spe_acpi_register_device()silently fails on guest side sincegicc->header.length<ACPI_MADT_GICC_SPEThanks
Eric
Thanks for pointing out this. I will fix it in the next version.
Quoted 60 lines
Quoted 59 lines
include/hw/acpi/acpi-defs.h +0
-0}QEMU_PACKED ;typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ;include/hw/arm/virt.h +1
-0@@ -49,6 +49,7 @@#define ARCH_TIMER_NS_EL1_IRQ 14#define ARCH_TIMER_NS_EL2_IRQ 10 +#define VIRTUAL_SPE_IRQ 5#define VIRTUAL_PMU_IRQ 7#define PPI (irq) ((irq) + 16)target/arm/cpu.c +2
-0@@ -1038,6 +1038,8 @@ static void arm_cpu_initfn(Object *obj) "gicv3-maintenance-interrupt", 1);qdev_init_gpio_out_named (DEVICE (cpu), &cpu->pmu_interrupt,"pmu-interrupt" ,1 ); +qdev_init_gpio_out_named (DEVICE (cpu), &cpu->spe_interrupt, +"spe-interrupt" ,1 );#endif /* DTB consumers generally don't in fact care what the 'compatible' target/arm/cpu.h +2
-0@@ -790,6 +790,8 @@ struct ARMCPU {qemu_irq gicv3_maintenance_interrupt;/* GPIO output for the PMU interrupt */ qemu_irq pmu_interrupt; +/* GPIO output for the SPE interrupt */ +qemu_irq spe_interrupt;/* MemoryRegion to use for secure physical accesses */ MemoryRegion *secure_memory;target/arm/kvm.c +6
-0@@ -820,6 +820,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) switched_level &= ~KVM_ARM_DEV_PMU ; } +if (switched_level &KVM_ARM_DEV_SPE ) { +qemu_set_irq (cpu->spe_interrupt, + !!(run->s.regs.device_irq_level &KVM_ARM_DEV_SPE )); + switched_level &= ~KVM_ARM_DEV_SPE ; + } +if (switched_level) {qemu_log_mask (LOG_UNIMP ,"%s: unhandled in-kernel device IRQ %x\n" , __func__, switched_level);
PATCH 7/7 target/arm/cpu: spe: Enable spe to work with host cpu
In reply to Haibo XuTurn on the spe cpu property by default when working with host cpu type in KVM mode, i.e. we can now do '-cpu host' to add the vSPE, and '-cpu host,spe=off' to remove it.
--- target/arm/cpu.c | 4 ++++ target/arm/kvm64.c | 9 +++++++++ 2 files changed, 13 insertions(+)
target/arm/cpu.c +4 -0
@@ -1719,6 +1719,10 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->pmceid1 =0 ; } +if (!cpu->has_spe || !kvm_enabled ()) { +unset_feature (env,ARM_FEATURE_SPE ); + } +if (!arm_feature (env,ARM_FEATURE_EL2 )) {/* Disable the hypervisor feature bits in the processor feature * registers if we don't have EL2. These are id_pfr1[15:12] and
target/arm/kvm64.c +9 -0
@@ -679,6 +679,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) features |=1ULL <<ARM_FEATURE_AARCH64 ; features |=1ULL <<ARM_FEATURE_PMU ; features |=1ULL <<ARM_FEATURE_GENERIC_TIMER ; + features |=1ULL <<ARM_FEATURE_SPE ; ahcf->features = features;
@@ -826,6 +827,14 @@ int kvm_arch_init_vcpu(CPUState *cs) }else { env->features &= ~(1ULL <<ARM_FEATURE_PMU ); } +if (!kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_SPE_V1 )) { + cpu->has_spe = false; + } +if (cpu->has_spe) { + cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SPE_V1 ; + }else { + env->features &= ~(1ULL <<ARM_FEATURE_SPE ); + }if (cpu_isar_feature (aa64_sve, cpu)) {assert (kvm_arm_sve_supported ()); cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SVE ;
Signature · 1 line
2.17.1
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 3 lines · Haibo Xu
Turn on the spe cpu property by default when working with host cpu type in KVM mode, i.e. we can now do '-cpu host' to add the vSPE, and '-cpu host,spe=off' to remove it.
-cpu max with KVM should also enable it by default
Quoted 12 lines
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 4 ++++ target/arm/kvm64.c | 9 +++++++++ 2 files changed, 13 insertions(+)target/arm/cpu.c +0
-0
target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1724
Quoted 6 lines
target/arm/cpu.c +3
-0@@ -1719,6 +1719,10 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->pmceid1 =0 ; } +if (!cpu->has_spe || !kvm_enabled ()) { +unset_feature (env,ARM_FEATURE_SPE ); + }
I don't think this should be necessary.
target/arm/kvm64.c bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) · line 682
Quoted 13 lines
target/arm/cpu.c +1
-0+if (!arm_feature (env,ARM_FEATURE_EL2 )) {/* Disable the hypervisor feature bits in the processor feature * registers if we don't have EL2. These are id_pfr1[15:12] and target/arm/kvm64.c +1
-0@@ -679,6 +679,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) features |=1ULL <<ARM_FEATURE_AARCH64 ; features |=1ULL <<ARM_FEATURE_PMU ; features |=1ULL <<ARM_FEATURE_GENERIC_TIMER ; + features |=1ULL <<ARM_FEATURE_SPE ;
No, SPE is not a feature we assume is present in v8.0 CPUs.
Quoted 5 lines
target/arm/kvm64.c +0
-0ahcf->features = features;@@ -826,6 +827,14 @@ int kvm_arch_init_vcpu(CPUState *cs) }else {
target/arm/kvm64.c int kvm_arch_init_vcpu(CPUState *cs) · line 837
Quoted 10 lines
target/arm/kvm64.c +8
-0env->features &= ~(1ULL <<ARM_FEATURE_PMU ); } +if (!kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_SPE_V1 )) { + cpu->has_spe = false; + } +if (cpu->has_spe) { + cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SPE_V1 ; + }else { + env->features &= ~(1ULL <<ARM_FEATURE_SPE ); + }
The PMU code above this isn't a good pattern to copy. The SVE code below is better. SVE uses an ID bit and doesn't do the redundant KVM cap check. It'd be nice to cleanup the PMU code (with a separate patch) and then add SPE in a better way.
Quoted 6 lines
target/arm/kvm64.c +0
-0if (cpu_isar_feature (aa64_sve, cpu)) {assert (kvm_arm_sve_supported ()); cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SVE ;Signature · 1 line
2.17.1
Thanks,
drew
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 8 lines · Andrew Jones
Quoted 3 lines · Haibo Xu
Turn on the spe cpu property by default when working with host cpu type in KVM mode, i.e. we can now do '-cpu host' to add the vSPE, and '-cpu host,spe=off' to remove it.
-cpu max with KVM should also enable it by default
Ok, will fix it!
Quoted 7 lines
Quoted 7 lines
Signed-off-by Haibo Xu <[email protected]>--- target/arm/cpu.c | 4 ++++ target/arm/kvm64.c | 9 +++++++++ 2 files changed, 13 insertions(+)
Quoted 5 lines
target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev,
Quoted 5 lines
target/arm/cpu.c +0
-0@@ -1719,6 +1719,10 @@ static void arm_cpu_realizefn(DeviceState *dev,
Error **errp)
Quoted 9 lines
target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1724
Quoted 6 lines
target/arm/cpu.c +3
-0cpu->pmceid1 =0 ; } +if (!cpu->has_spe || !kvm_enabled ()) { +unset_feature (env,ARM_FEATURE_SPE ); + }I don't think this should be necessary.
Yes, I have tried to remove this check, and the vSPE can still work correctly.
But I don't know whether there are some corner cases that trigger an error. The similar logic is added in commit 929e754d5a to enable vPMU support.
Quoted 9 lines
target/arm/kvm64.c bool
Quoted 9 lines
target/arm/cpu.c +1
-0+if (!arm_feature (env,ARM_FEATURE_EL2 )) {/* Disable the hypervisor feature bits in the processor feature * registers if we don't have EL2. These are id_pfr1[15:12] and target/arm/kvm64.c +0
-0@@ -679,6 +679,7 @@ bool
kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
Quoted 7 lines
target/arm/kvm64.c bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) · line 682
Quoted 4 lines
target/arm/kvm64.c +1
-0features |=1ULL <<ARM_FEATURE_AARCH64 ; features |=1ULL <<ARM_FEATURE_PMU ; features |=1ULL <<ARM_FEATURE_GENERIC_TIMER ; + features |=1ULL <<ARM_FEATURE_SPE ;No, SPE is not a feature we assume is present in v8.0 CPUs.
Yes, SPE is an optional feature for v8.2. How about changing to the following logic:
spe_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SPE_V1)
Quoted 1 line
0;
if (spe_supported) {
features |= 1ULL << ARM_FEATURE_SPE;
}Quoted 12 lines
Quoted 12 lines
target/arm/kvm64.c +5
-0ahcf->features = features;@@ -826,6 +827,14 @@ int kvm_arch_init_vcpu(CPUState *cs) }else { env->features &= ~(1ULL <<ARM_FEATURE_PMU ); } +if (!kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_SPE_V1 )) { + cpu->has_spe = false; + } +if (cpu->has_spe) { + cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SPE_V1 ;
Quoted 9 lines
target/arm/kvm64.c int kvm_arch_init_vcpu(CPUState *cs) · line 837
Quoted 3 lines
target/arm/kvm64.c +3
-0+ }else { + env->features &= ~(1ULL <<ARM_FEATURE_SPE ); + }The PMU code above this isn't a good pattern to copy. The SVE code below is better. SVE uses an ID bit and doesn't do the redundant KVM cap check. It'd be nice to cleanup the PMU code (with a separate patch) and then add SPE in a better way.
I noticed that Peter had sent out a mail
<https://www.mail-archive.com/[email protected]/msg727640.html> to talk about the feature-identification strategy.
So shall we adapt it to the vPMU and vSPE feature?
Quoted 10 lines
Quoted 6 lines
target/arm/kvm64.c +0
-1if (cpu_isar_feature (aa64_sve, cpu)) {assert (kvm_arm_sve_supported ()); cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SVE ; --2.17.1
Thanks,
drew
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 11 lines · Haibo Xu
Quoted 6 lines
target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1724
Quoted 3 lines
target/arm/cpu.c +3
-0+if (!cpu->has_spe || !kvm_enabled ()) { +unset_feature (env,ARM_FEATURE_SPE ); + }I don't think this should be necessary.
Yes, I have tried to remove this check, and the vSPE can still work correctly.
But I don't know whether there are some corner cases that trigger an error. The similar logic is added in commit929e754d5ato enable vPMU support.
I think the PMU logic needs a cleanup, rather than to be imitated.
Quoted 19 lines
Quoted 10 lines
target/arm/kvm64.c bool
Quoted 10 lines
target/arm/cpu.c +1
-0+if (!arm_feature (env,ARM_FEATURE_EL2 )) {/* Disable the hypervisor feature bits in the processor feature * registers if we don't have EL2. These are id_pfr1[15:12] and target/arm/kvm64.c +0
-0@@ -679,6 +679,7 @@ bool
kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)Quoted 7 lines
target/arm/kvm64.c bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) · line 682
Quoted 4 lines
target/arm/kvm64.c +1
-0features |=1ULL <<ARM_FEATURE_AARCH64 ; features |=1ULL <<ARM_FEATURE_PMU ; features |=1ULL <<ARM_FEATURE_GENERIC_TIMER ; + features |=1ULL <<ARM_FEATURE_SPE ;No, SPE is not a feature we assume is present in v8.0 CPUs.
Quoted 8 lines
Yes, SPE is an optional feature for v8.2. How about changing to the following logic:
spe_supported=ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SPE_V1)Quoted 1 line
0;
if (spe_supported) { features |= 1ULL << ARM_FEATURE_SPE; }
Yes, except you need to drop the ARM_FEATURE_SPE define and use the ID register bit instead like "sve_supported" does.
Quoted 23 lines
Quoted 13 lines
Quoted 13 lines
target/arm/kvm64.c +5
-0ahcf->features = features;@@ -826,6 +827,14 @@ int kvm_arch_init_vcpu(CPUState *cs) }else { env->features &= ~(1ULL <<ARM_FEATURE_PMU ); } +if (!kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_SPE_V1 )) { + cpu->has_spe = false; + } +if (cpu->has_spe) { + cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SPE_V1 ;Quoted 9 lines
target/arm/kvm64.c int kvm_arch_init_vcpu(CPUState *cs) · line 837
Quoted 3 lines
target/arm/kvm64.c +3
-0+ }else { + env->features &= ~(1ULL <<ARM_FEATURE_SPE ); + }The PMU code above this isn't a good pattern to copy. The SVE code below is better. SVE uses an ID bit and doesn't do the redundant KVM cap check. It'd be nice to cleanup the PMU code (with a separate patch) and then add SPE in a better way.
Quoted 4 lines
I noticed that Peter had sent out a mail
<https://www.mail-archive.com/[email protected]/msg727640.html> to talk about the feature-identification strategy.
So shall we adapt it to the vPMU and vSPE feature?
At least SPE. You'll have to double check that it makes sense to do for PMU. But, if so, then it should be done with a separate series.
Thanks,
drew
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 70 lines · Andrew Jones
Quoted 11 lines · Haibo Xu
Quoted 6 lines
target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1724
Quoted 3 lines
target/arm/cpu.c +3
-0+if (!cpu->has_spe || !kvm_enabled ()) { +unset_feature (env,ARM_FEATURE_SPE ); + }I don't think this should be necessary.
Yes, I have tried to remove this check, and the vSPE can still work correctly.
But I don't know whether there are some corner cases that trigger an error. The similar logic is added in commit929e754d5ato enable vPMU support.I think the PMU logic needs a cleanup, rather than to be imitated.
Quoted 19 lines
Quoted 10 lines
target/arm/kvm64.c bool
Quoted 10 lines
target/arm/cpu.c +1
-0+if (!arm_feature (env,ARM_FEATURE_EL2 )) {/* Disable the hypervisor feature bits in the processor feature * registers if we don't have EL2. These are id_pfr1[15:12] and target/arm/kvm64.c +0
-0@@ -679,6 +679,7 @@ bool
kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)Quoted 7 lines
target/arm/kvm64.c bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) · line 682
Quoted 4 lines
target/arm/kvm64.c +1
-0features |=1ULL <<ARM_FEATURE_AARCH64 ; features |=1ULL <<ARM_FEATURE_PMU ; features |=1ULL <<ARM_FEATURE_GENERIC_TIMER ; + features |=1ULL <<ARM_FEATURE_SPE ;No, SPE is not a feature we assume is present in v8.0 CPUs.
Quoted 8 lines
Yes, SPE is an optional feature for v8.2. How about changing to the following logic:
spe_supported=ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SPE_V1)Quoted 1 line
0;
if (spe_supported) { features |= 1ULL << ARM_FEATURE_SPE; }Yes, except you need to drop the
ARM_FEATURE_SPEdefine and use the ID register bit instead like "sve_supported" does.Quoted 23 lines
Quoted 22 lines
Quoted 6 lines
target/arm/kvm64.c +0
-0ahcf->features = features;@@ -826,6 +827,14 @@ int kvm_arch_init_vcpu(CPUState *cs) }else {target/arm/kvm64.c int kvm_arch_init_vcpu(CPUState *cs) · line 837
Quoted 10 lines
target/arm/kvm64.c +8
-0env->features &= ~(1ULL <<ARM_FEATURE_PMU ); } +if (!kvm_check_extension (cs->kvm_state,KVM_CAP_ARM_SPE_V1 )) { + cpu->has_spe = false; + } +if (cpu->has_spe) { + cpu->kvm_init_features[0 ] |=1 <<KVM_ARM_VCPU_SPE_V1 ; + }else { + env->features &= ~(1ULL <<ARM_FEATURE_SPE ); + }The PMU code above this isn't a good pattern to copy. The SVE code below is better. SVE uses an ID bit and doesn't do the redundant KVM cap check. It'd be nice to cleanup the PMU code (with a separate patch) and then add SPE in a better way.
Quoted 8 lines
Quoted 4 lines
I noticed that Peter had sent out a mail
<https://www.mail-archive.com/[email protected]/msg727640.html> to talk about the feature-identification strategy.
So shall we adapt it to the vPMU and vSPE feature?At least SPE. You'll have to double check that it makes sense to do for PMU. But, if so, then it should be done with a separate series.
Ok, will adapt the SPE support to this new feature-identification strategy first, and
investigate whether it makes sense to do so for PMU later.
Thank you very much for helping review the patch series!
Quoted 3 lines
Thanks,
drew
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
In reply to Andrew JonesQuoted 2 lines · Andrew Jones
Yes, except you need to drop the
ARM_FEATURE_SPEdefine and use the ID register bit instead like "sve_supported" does.
On a related note, I think we have a latent bug, or at least a mis-feature:
sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0;
...
/* Add feature bits that can't appear until after VCPU init. */
if (sve_supported) {
t = ahcf->isar.id_aa64pfr0;
t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1);
ahcf->isar.id_aa64pfr0 = t;
}Should it in fact be
if (!sve_supported) {
t = ahcf->isar.id_aa64pfr0;
t = FIELD_DP64(t, ID_AA64PFR0, SVE, 0);
ahcf->isar.id_aa64pfr0 = t;
}?
Forcing the value to 1 here is going to be wrong the moment we have an SVE2 enabled cpu.
Similarly, SPE has more than one "enabled" value for PMSVer.
r~
Re: [PATCH 7/7] target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 24 lines · Richard Henderson
Quoted 2 lines · Andrew Jones
Yes, except you need to drop the
ARM_FEATURE_SPEdefine and use the ID register bit instead like "sve_supported" does.On a related note, I think we have a latent bug, or at least a mis-feature:
sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0; ... /* Add feature bits that can't appear until after VCPU init. */ if (sve_supported) { t = ahcf->isar.id_aa64pfr0; t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1); ahcf->isar.id_aa64pfr0 = t; }Should it in fact be
if (!sve_supported) { t = ahcf->isar.id_aa64pfr0; t = FIELD_DP64(t, ID_AA64PFR0, SVE, 0); ahcf->isar.id_aa64pfr0 = t; }
Quoted 4 lines
?
Forcing the value to 1 here is going to be wrong the moment we have an SVE2 enabled cpu.
Indeed. I think KVM should add a KVM_CAP_ARM_SVE2 cap. Then, we keep the code similar to the way it is now, but set ID_AA64PFR0 appropriately based on which CAPs are present. I think we probably need that CAP anyway in order to ensure a guest that is using SVE2 cannot be migrated to a host that only has SVE.
Quoted 3 lines
Similarly, SPE has more than one "enabled" value for PMSVer.
I'll take a look at the KVM series for SPE next week to see if the UAPI will allow us to determine what values are possible.
Thanks for the heads up about this.
drew
Quoted 54 lines · Haibo Xu
This series add support for SPE(Statistical Profiling Extension)[1] in KVM guest. It's based on Andrew Murray's kernel KVM patches V2[2], and has been tested to ensure that guest can use SPE with valid data. E.g.
In host:
$ ./qemu-system-aarch64 \ -cpu host -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \In guest:
$ perf record -e arm_spe/ts_enable=1,pa_enable=1,pct_enable=1/ \ dd if=/dev/zero of=/dev/null count=1000 $ perf report --dump-raw-trace > spe_buf.txtThe spe_buf.txt should contain similar data as below:
. ... ARM SPE data: size 135944 bytes
. 00000000: b0 f4 d3 29 10 00 80 ff a0 PC 0xff80001029d3f4 el1 ns=1 . 00000009: 99 0b 00 LAT 11 ISSUE . 0000000c: 98 0d 00 LAT 13 TOT . 0000000f: 52 16 00 EV RETIRED L1D-ACCESS TLB-ACCESS . 00000012: 49 00 LD . 00000014: b2 d0 40 d8 70 00 00 ff 00 VA 0xff000070d840d0 . 0000001d: 9a 01 00 LAT 1 XLAT . 00000020: 00 00 00 PAD . 00000023: 71 a5 1f b3 20 14 00 00 00 TS 86447955877 . 0000002c: b0 7c f9 29 10 00 80 ff a0 PC 0xff80001029f97c el1 ns=1 . 00000035: 99 02 00 LAT 2 ISSUE . 00000038: 98 03 00 LAT 3 TOT . 0000003b: 52 02 00 EV RETIRED . 0000003e: 48 00 INSN-OTHER . 00000040: 00 00 00 PAD . 00000043: 71 ef 1f b3 20 14 00 00 00 TS 86447955951 . 0000004c: b0 f0 e9 29 10 00 80 ff a0 PC 0xff80001029e9f0 el1 ns=1 . 00000055: 99 02 00 LAT 2 ISSUE . 00000058: 98 03 00 LAT 3 TOT . 0000005b: 52 02 00 EV RETIREDIf you want to disable the vSPE support, you can use the 'spe=off' cpu property:
./qemu-system-aarch64 \ -cpu host,spe=off -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \
Quoted 11 lines
Note:
(1) Since the kernel patches are still under review, some of the macros in the header files may be changed after merging. We may need to update them accordingly.
(2) These patches only add vSPE support in KVM mode, for TCG mode, I'm not sure whether we need to support it.
(3) Just followed the 'pmu' property, we only allow this feature to be removed from CPUs which enable it by default. But since the SPE is an optional feature extension for Armv8.2, I think a better way may be to disable it by default, and only enable it when the host cpu do have the feature.
* When not using KVM, if TCG supports SPE emulation, then it should be enabled by default with '-cpu max'.
* When using KVM, if KVM supports the feature, then it should be enabled by default with '-cpu max' or '-cpu host' (which are currently the only ways to use KVM on AArch64)
* When using KVM, if KVM does not support the feature (either the CPU doesn't support it, or the version of KVM in use doesn't know what to do with it), then the feature should obviously be disabled for the VM by default, since there's no way to enable it.
Quoted 14 lines
[1]https://community.arm.com/developer/ip-products/processors/b/processors-ip-blog/
posts/statistical-profiling-extension-for-armv8-a
[2]https://www.spinics.net/lists/arm-kernel/msg776228.htmlHaibo Xu (7):
update Linux headers with new vSPE macros target/arm/kvm: spe: Add helper to detect SPE when using KVM target/arm/cpu: spe: Add an option to turn on/off vSPE support target/arm/kvm: spe: Unify device attr operatioin helper target/arm/kvm: spe: Add device init andset_irqoperations hw/arm/virt: spe: Add SPE fdt binding for virt machine target/arm/cpu: spe: Enable spe to work with host cpu
Quoted 11 lines
hw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 ++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + linux-headers/asm-arm64/kvm.h | 4 +++ linux-headers/linux/kvm.h | 2 ++ target/arm/cpu.c | 34 +++++++++++++++++++++++++ target/arm/cpu.h | 5 ++++ target/arm/kvm.c | 11 ++++++++ target/arm/kvm64.c | 48 ++++++++++++++++++++++++++++++++--- target/arm/kvm_arm.h | 18 +++++++++++++
This series should also be updating these files:
docs/system/arm/cpu-features.rst
target/arm/monitor.c
tests/qtest/arm-cpu-features.c
Thanks,
drew
Quoted 6 lines
11 files changed, 166 insertions(+), 3 deletions(-)Signature · 1 line
2.17.1
Hi Haibo,
Quoted 54 lines · Haibo Xu
This series add support for SPE(Statistical Profiling Extension)[1] in KVM guest. It's based on Andrew Murray's kernel KVM patches V2[2], and has been tested to ensure that guest can use SPE with valid data. E.g.
In host:
$ ./qemu-system-aarch64 \ -cpu host -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \In guest:
$ perf record -e arm_spe/ts_enable=1,pa_enable=1,pct_enable=1/ \ dd if=/dev/zero of=/dev/null count=1000 $ perf report --dump-raw-trace > spe_buf.txtThe spe_buf.txt should contain similar data as below:
. ... ARM SPE data: size 135944 bytes
. 00000000: b0 f4 d3 29 10 00 80 ff a0 PC 0xff80001029d3f4 el1 ns=1 . 00000009: 99 0b 00 LAT 11 ISSUE . 0000000c: 98 0d 00 LAT 13 TOT . 0000000f: 52 16 00 EV RETIRED L1D-ACCESS TLB-ACCESS . 00000012: 49 00 LD . 00000014: b2 d0 40 d8 70 00 00 ff 00 VA 0xff000070d840d0 . 0000001d: 9a 01 00 LAT 1 XLAT . 00000020: 00 00 00 PAD . 00000023: 71 a5 1f b3 20 14 00 00 00 TS 86447955877 . 0000002c: b0 7c f9 29 10 00 80 ff a0 PC 0xff80001029f97c el1 ns=1 . 00000035: 99 02 00 LAT 2 ISSUE . 00000038: 98 03 00 LAT 3 TOT . 0000003b: 52 02 00 EV RETIRED . 0000003e: 48 00 INSN-OTHER . 00000040: 00 00 00 PAD . 00000043: 71 ef 1f b3 20 14 00 00 00 TS 86447955951 . 0000004c: b0 f0 e9 29 10 00 80 ff a0 PC 0xff80001029e9f0 el1 ns=1 . 00000055: 99 02 00 LAT 2 ISSUE . 00000058: 98 03 00 LAT 3 TOT . 0000005b: 52 02 00 EV RETIREDIf you want to disable the vSPE support, you can use the 'spe=off' cpu property:
./qemu-system-aarch64 \ -cpu host,spe=off -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \
Quoted 4 lines
Note:
(1) Since the kernel patches are still under review, some of the macros in the header files may be changed after merging. We may need to update them accordingly.
to be more explicit one needs to replace on the kernel 5.5-rc2 based series
-#define KVM_CAP_ARM_SPE_V1 179
+#define KVM_CAP_ARM_SPE_V1 184
I got misleaded ;-)
+ Andrew in CC as he contributed the kernel part.
For information, I have been working on a kvm unit test series for testing SPE. I will send an RFC, most probably this week. At the moment I still face some weirdness such as some unexpected Service state in the syndrome register. Anyway I will share the existing code so that we can discuss the issues.
Are there any plans to respin the kernel series
Thanks
Eric
Quoted 34 lines
(2) These patches only add vSPE support in KVM mode, for TCG mode, I'm not sure whether we need to support it.
(3) Just followed the 'pmu' property, we only allow this feature to be removed from CPUs which enable it by default. But since the SPE is an optional feature extension for Armv8.2, I think a better way may be to disable it by default, and only enable it when the host cpu do have the feature.[1]https://community.arm.com/developer/ip-products/processors/b/processors-ip-blog/
posts/statistical-profiling-extension-for-armv8-a
[2]https://www.spinics.net/lists/arm-kernel/msg776228.htmlHaibo Xu (7):
update Linux headers with new vSPE macros target/arm/kvm: spe: Add helper to detect SPE when using KVM target/arm/cpu: spe: Add an option to turn on/off vSPE support target/arm/kvm: spe: Unify device attr operatioin helper target/arm/kvm: spe: Add device init andset_irqoperations hw/arm/virt: spe: Add SPE fdt binding for virt machine target/arm/cpu: spe: Enable spe to work with host cpuhw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 ++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + linux-headers/asm-arm64/kvm.h | 4 +++ linux-headers/linux/kvm.h | 2 ++ target/arm/cpu.c | 34 +++++++++++++++++++++++++ target/arm/cpu.h | 5 ++++ target/arm/kvm.c | 11 ++++++++ target/arm/kvm64.c | 48 ++++++++++++++++++++++++++++++++--- target/arm/kvm_arm.h | 18 +++++++++++++ 11 files changed, 166 insertions(+), 3 deletions(-)
Quoted 77 lines · Auger Eric
Hi Haibo,
Quoted 54 lines · Haibo Xu
This series add support for SPE(Statistical Profiling Extension)[1] in KVM guest. It's based on Andrew Murray's kernel KVM patches V2[2], and has been tested to ensure that guest can use SPE with valid data. E.g.
In host:
$ ./qemu-system-aarch64 \ -cpu host -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \In guest:
$ perf record -e arm_spe/ts_enable=1,pa_enable=1,pct_enable=1/ \ dd if=/dev/zero of=/dev/null count=1000 $ perf report --dump-raw-trace > spe_buf.txtThe spe_buf.txt should contain similar data as below:
. ... ARM SPE data: size 135944 bytes
. 00000000: b0 f4 d3 29 10 00 80 ff a0 PC 0xff80001029d3f4 el1 ns=1 . 00000009: 99 0b 00 LAT 11 ISSUE . 0000000c: 98 0d 00 LAT 13 TOT . 0000000f: 52 16 00 EV RETIRED L1D-ACCESS TLB-ACCESS . 00000012: 49 00 LD . 00000014: b2 d0 40 d8 70 00 00 ff 00 VA 0xff000070d840d0 . 0000001d: 9a 01 00 LAT 1 XLAT . 00000020: 00 00 00 PAD . 00000023: 71 a5 1f b3 20 14 00 00 00 TS 86447955877 . 0000002c: b0 7c f9 29 10 00 80 ff a0 PC 0xff80001029f97c el1 ns=1 . 00000035: 99 02 00 LAT 2 ISSUE . 00000038: 98 03 00 LAT 3 TOT . 0000003b: 52 02 00 EV RETIRED . 0000003e: 48 00 INSN-OTHER . 00000040: 00 00 00 PAD . 00000043: 71 ef 1f b3 20 14 00 00 00 TS 86447955951 . 0000004c: b0 f0 e9 29 10 00 80 ff a0 PC 0xff80001029e9f0 el1 ns=1 . 00000055: 99 02 00 LAT 2 ISSUE . 00000058: 98 03 00 LAT 3 TOT . 0000005b: 52 02 00 EV RETIREDIf you want to disable the vSPE support, you can use the 'spe=off' cpu property:
./qemu-system-aarch64 \ -cpu host,spe=off -M virt,accel=kvm,gic-version=3 -nographic -m 2048M \ -kernel ./Image-new \ -initrd /boot/initrd.img-5.6.0-rc2+ \ -append "root=/dev/vda rw console=ttyAMA0" -nodefaults -serial stdio\ -drive if=none,file=./xenial.rootfs.ext4,id=hd0,format=raw \ -device virtio-blk-device,drive=hd0 \Quoted 4 lines
Note:
(1) Since the kernel patches are still under review, some of the macros in the header files may be changed after merging. We may need to update them accordingly.to be more explicit one needs to replace on the kernel 5.5-rc2 based series
(quoted diff) +1
-1-#define KVM_CAP_ARM_SPE_V1 179 +#define KVM_CAP_ARM_SPE_V1 184I got misleaded ;-)
+ Andrew in CC as he contributed the kernel part.
For information, I have been working on a kvm unit test series for testing SPE. I will send an RFC, most probably this week. At the moment I still face some weirdness such as some unexpected Service state in the syndrome register. Anyway I will share the existing code so that we can discuss the issues.
Quoted 6 lines
Are there any plans to respin the kernel series
Thanks
Eric
Hi Eric,
Thanks for elaborating on the above macro definition!
The next version of the kernel series are supposed to be sent out in mid-September,
and it should not change so much except for some macro definitions.
Regards,
Haibo
Quoted 35 lines
Quoted 34 lines
(2) These patches only add vSPE support in KVM mode, for TCG mode, I'm not sure whether we need to support it.
(3) Just followed the 'pmu' property, we only allow this feature to be removed from CPUs which enable it by default. But since the SPE is an optional feature extension for Armv8.2, I think a better way may be to disable it by default, and only enable it when the host cpu do have the feature.[1]https://community.arm.com/developer/ip-products/processors/b/processors-ip-blog/
posts/statistical-profiling-extension-for-armv8-a
[2]https://www.spinics.net/lists/arm-kernel/msg776228.htmlHaibo Xu (7):
update Linux headers with new vSPE macros target/arm/kvm: spe: Add helper to detect SPE when using KVM target/arm/cpu: spe: Add an option to turn on/off vSPE support target/arm/kvm: spe: Unify device attr operatioin helper target/arm/kvm: spe: Add device init andset_irqoperations hw/arm/virt: spe: Add SPE fdt binding for virt machine target/arm/cpu: spe: Enable spe to work with host cpuhw/arm/virt-acpi-build.c | 3 +++ hw/arm/virt.c | 42 ++++++++++++++++++++++++++++++ include/hw/acpi/acpi-defs.h | 1 + include/hw/arm/virt.h | 1 + linux-headers/asm-arm64/kvm.h | 4 +++ linux-headers/linux/kvm.h | 2 ++ target/arm/cpu.c | 34 +++++++++++++++++++++++++ target/arm/cpu.h | 5 ++++ target/arm/kvm.c | 11 ++++++++ target/arm/kvm64.c | 48 ++++++++++++++++++++++++++++++++--- target/arm/kvm_arm.h | 18 +++++++++++++ 11 files changed, 166 insertions(+), 3 deletions(-)