Commit 808e7381 authored by Shannon Zhao's avatar Shannon Zhao Committed by Marc Zyngier
Browse files

arm64: KVM: Add a new feature bit for PMUv3 



To support guest PMUv3, use one bit of the VCPU INIT feature array.
Initialize the PMU when initialzing the vcpu with that bit and PMU
overflow interrupt set.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Acked-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 5f0a714a

Documentation/virtual/kvm/api.txt

+2 −0
Original line number Diff line number Diff line
@@ -2577,6 +2577,8 @@ Possible features: 
	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).

	- KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU.

	  Depends on KVM_CAP_ARM_PSCI_0_2.

	- KVM_ARM_VCPU_PMU_V3: Emulate PMUv3 for the CPU.

	  Depends on KVM_CAP_ARM_PMU_V3.





4.83 KVM_ARM_PREFERRED_TARGET

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


#define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS



#define KVM_VCPU_MAX_FEATURES 3

#define KVM_VCPU_MAX_FEATURES 4



int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

arch/arm64/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -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 /* Support guest PMUv3 */



struct kvm_vcpu_init {

	__u32 target;

arch/arm64/kvm/reset.c

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ int kvm_arch_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_GUEST_DEBUG_HW_WPS:

		r = get_num_wrps();

		break;

	case KVM_CAP_ARM_PMU_V3:

		r = kvm_arm_support_pmu_v3();

		break;

	case KVM_CAP_SET_GUEST_DEBUG:

		r = 1;

		break;

include/kvm/arm_pmu.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val); 
void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val);

void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data,

				    u64 select_idx);

bool kvm_arm_support_pmu_v3(void);

#else

struct kvm_pmu {

};
@@ -80,6 +81,7 @@ static inline void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) {} 
static inline void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) {}

static inline void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu,

						  u64 data, u64 select_idx) {}

static inline bool kvm_arm_support_pmu_v3(void) { return false; }

#endif



#endif