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

arm64: KVM: Add a new vcpu device control group for PMUv3 



To configure the virtual PMUv3 overflow interrupt number, we use the
vcpu kvm_device ioctl, encapsulating the KVM_ARM_VCPU_PMU_V3_IRQ
attribute within the KVM_ARM_VCPU_PMU_V3_CTRL group.

After configuring the PMUv3, call the vcpu ioctl with attribute
KVM_ARM_VCPU_PMU_V3_INIT to initialize the PMUv3.

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>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent f577f6c2

Documentation/virtual/kvm/devices/vcpu.txt

+25 −0
Original line number Diff line number Diff line
@@ -6,3 +6,28 @@ KVM_GET_DEVICE_ATTR, and KVM_HAS_DEVICE_ATTR. The interface uses the same struct 
kvm_device_attr as other devices, but targets VCPU-wide settings and controls.



The groups and attributes per virtual cpu, if any, are architecture specific.



1. GROUP: KVM_ARM_VCPU_PMU_V3_CTRL

Architectures: ARM64



1.1. ATTRIBUTE: KVM_ARM_VCPU_PMU_V3_IRQ

Parameters: in kvm_device_attr.addr the address for PMU overflow interrupt is a

            pointer to an int

Returns: -EBUSY: The PMU overflow interrupt is already set

         -ENXIO: The overflow interrupt not set when attempting to get it

         -ENODEV: PMUv3 not supported

         -EINVAL: Invalid PMU overflow interrupt number supplied



A value describing the PMUv3 (Performance Monitor Unit v3) overflow interrupt

number for this vcpu. This interrupt could be a PPI or SPI, but the interrupt

type must be same for each vcpu. As a PPI, the interrupt number is the same for

all vcpus, while as an SPI it must be a separate number per vcpu.



1.2 ATTRIBUTE: KVM_ARM_VCPU_PMU_V3_INIT

Parameters: no additional parameter in kvm_device_attr.addr

Returns: -ENODEV: PMUv3 not supported

         -ENXIO: PMUv3 not properly configured as required prior to calling this

                 attribute

         -EBUSY: PMUv3 already initialized



Request the initialization of the PMUv3.

arch/arm/include/asm/kvm_host.h

+15 −0
Original line number Diff line number Diff line
@@ -287,5 +287,20 @@ static inline void kvm_arm_init_debug(void) {} 
static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) {}

static inline int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

					     struct kvm_device_attr *attr)

{

	return -ENXIO;

}

static inline int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,

					     struct kvm_device_attr *attr)

{

	return -ENXIO;

}

static inline int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,

					     struct kvm_device_attr *attr)

{

	return -ENXIO;

}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/kvm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ static int kvm_arm_vcpu_set_attr(struct kvm_vcpu *vcpu, 


	switch (attr->group) {

	default:

		ret = kvm_arm_vcpu_arch_set_attr(vcpu, attr);

		break;

	}
@@ -848,6 +849,7 @@ static int kvm_arm_vcpu_get_attr(struct kvm_vcpu *vcpu, 


	switch (attr->group) {

	default:

		ret = kvm_arm_vcpu_arch_get_attr(vcpu, attr);

		break;

	}
@@ -861,6 +863,7 @@ static int kvm_arm_vcpu_has_attr(struct kvm_vcpu *vcpu, 


	switch (attr->group) {

	default:

		ret = kvm_arm_vcpu_arch_has_attr(vcpu, attr);

		break;

	}

arch/arm64/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -361,6 +361,12 @@ void kvm_arm_init_debug(void); 
void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);

void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);

void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);

int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);

int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);

int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);



/* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */

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

+5 −0
Original line number Diff line number Diff line
@@ -205,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE