[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/3] target-arm: kvm64: set guest PMUv3 feature
From: |
Andrew Jones |
Subject: |
Re: [Qemu-devel] [PATCH 1/3] target-arm: kvm64: set guest PMUv3 feature bit if supported |
Date: |
Fri, 22 Apr 2016 15:41:28 +0200 |
User-agent: |
Mutt/1.5.23.1 (2014-03-12) |
On Fri, Mar 25, 2016 at 05:46:19PM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <address@hidden>
>
> Check if kvm supports guest PMUv3. If so, set the corresponding feature
> bit for vcpu.
>
> Signed-off-by: Shannon Zhao <address@hidden>
> ---
> linux-headers/asm-arm64/kvm.h | 6 ++++++
> linux-headers/linux/kvm.h | 2 ++
The above two files should be updated with their own patch and not
manually. Update with scripts/update-linux-headers.sh
> target-arm/cpu-qom.h | 2 ++
> target-arm/kvm64.c | 5 +++++
> 4 files changed, 15 insertions(+)
>
> diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
> index a2fd4d9..3097f2f 100644
> --- a/linux-headers/asm-arm64/kvm.h
> +++ b/linux-headers/asm-arm64/kvm.h
> @@ -94,6 +94,7 @@ struct kvm_regs {
> #define KVM_ARM_VCPU_POWER_OFF 0 /* CPU is started in OFF
> state */
> #define KVM_ARM_VCPU_EL1_32BIT 1 /* CPU running a 32bit VM */
> #define KVM_ARM_VCPU_PSCI_0_2 2 /* CPU uses PSCI v0.2 */
> +#define KVM_ARM_VCPU_PMU_V3 3
>
> struct kvm_vcpu_init {
> __u32 target;
> @@ -204,6 +205,11 @@ struct kvm_arch_memory_slot {
> #define KVM_DEV_ARM_VGIC_GRP_CTRL 4
> #define KVM_DEV_ARM_VGIC_CTRL_INIT 0
>
> +/* Device Control API on vcpu fd */
> +#define KVM_ARM_VCPU_PMU_V3_CTRL 0
> +#define KVM_ARM_VCPU_PMU_V3_IRQ 0
> +#define KVM_ARM_VCPU_PMU_V3_INIT 1
> +
> /* KVM_IRQ_LINE irq field index values */
> #define KVM_ARM_IRQ_TYPE_SHIFT 24
> #define KVM_ARM_IRQ_TYPE_MASK 0xff
> diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
> index 4a56b9e..104210a 100644
> --- a/linux-headers/linux/kvm.h
> +++ b/linux-headers/linux/kvm.h
> @@ -856,6 +856,8 @@ struct kvm_ppc_smmu_info {
> #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
> #define KVM_CAP_HYPERV_SYNIC 123
> #define KVM_CAP_S390_RI 124
> +#define KVM_CAP_ARM_PMU_V3 125
> +#define KVM_CAP_VCPU_ATTRIBUTES 126
These defines are wrong, but will be fixed with update-linux-headers
>
> #ifdef KVM_CAP_IRQ_ROUTING
>
> diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
> index 1061c08..93aa6a4 100644
> --- a/target-arm/cpu-qom.h
> +++ b/target-arm/cpu-qom.h
> @@ -105,6 +105,8 @@ typedef struct ARMCPU {
> bool powered_off;
> /* CPU has security extension */
> bool has_el3;
> + /* CPU has PMU (Performance Monitor Unit) */
> + bool has_pmu;
>
> /* CPU has memory protection unit */
> bool has_mpu;
> diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
> index e8527bf..b364789 100644
> --- a/target-arm/kvm64.c
> +++ b/target-arm/kvm64.c
> @@ -461,6 +461,11 @@ int kvm_arch_init_vcpu(CPUState *cs)
> if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
> cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT;
> }
> + if (kvm_irqchip_in_kernel() &&
> + kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PMU_V3)) {
> + cpu->has_pmu = true;
> + cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PMU_V3;
> + }
>
> /* Do KVM_ARM_VCPU_INIT ioctl */
> ret = kvm_arm_vcpu_init(cs);
> --
> 2.0.4
>
Otherwise looks good.
drew
- Re: [Qemu-devel] [PATCH 1/3] target-arm: kvm64: set guest PMUv3 feature bit if supported,
Andrew Jones <=