Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418e5ca8 authored by Andrew Murray's avatar Andrew Murray Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Rename kvm_pmu_{enable/disable}_counter functions 



The kvm_pmu_{enable/disable}_counter functions can enable/disable
multiple counters at once as they operate on a bitmask. Let's
make this clearer by renaming the function.

Suggested-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarAndrew Murray <andrew.murray@arm.com>
Reviewed-by: default avatarJulien Thierry <julien.thierry@arm.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 11b41626

arch/arm64/kvm/sys_regs.c

+2 −2
Original line number Diff line number Diff line
@@ -865,12 +865,12 @@ static bool access_pmcnten(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 
		if (r->Op2 & 0x1) {

			/* accessing PMCNTENSET_EL0 */

			__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) |= val;

			kvm_pmu_enable_counter(vcpu, val);

			kvm_pmu_enable_counter_mask(vcpu, val);

			kvm_vcpu_pmu_restore_guest(vcpu);

		} else {

			/* accessing PMCNTENCLR_EL0 */

			__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) &= ~val;

			kvm_pmu_disable_counter(vcpu, val);

			kvm_pmu_disable_counter_mask(vcpu, val);

		}

	} else {

		p->regval = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;

include/kvm/arm_pmu.h

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val); 
u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu);

void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu);

void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu);

void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val);

void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val);

void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val);

void kvm_pmu_enable_counter_mask(struct kvm_vcpu *vcpu, u64 val);

void kvm_pmu_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu);

bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu);
@@ -72,8 +72,8 @@ static inline u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu) 
}

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

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

static inline void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val) {}

static inline void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val) {}

static inline void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}

static inline void kvm_pmu_enable_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}

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

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

static inline bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu)

virt/kvm/arm/pmu.c

+6 −6
Original line number Diff line number Diff line
@@ -124,13 +124,13 @@ u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu) 
}



/**

 * kvm_pmu_enable_counter - enable selected PMU counter

 * kvm_pmu_enable_counter_mask - enable selected PMU counters

 * @vcpu: The vcpu pointer

 * @val: the value guest writes to PMCNTENSET register

 *

 * Call perf_event_enable to start counting the perf event

 */

void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val)

void kvm_pmu_enable_counter_mask(struct kvm_vcpu *vcpu, u64 val)

{

	int i;

	struct kvm_pmu *pmu = &vcpu->arch.pmu;
@@ -153,13 +153,13 @@ void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val) 
}



/**

 * kvm_pmu_disable_counter - disable selected PMU counter

 * kvm_pmu_disable_counter_mask - disable selected PMU counters

 * @vcpu: The vcpu pointer

 * @val: the value guest writes to PMCNTENCLR register

 *

 * Call perf_event_disable to stop counting the perf event

 */

void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val)

void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val)

{

	int i;

	struct kvm_pmu *pmu = &vcpu->arch.pmu;
@@ -336,10 +336,10 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) 


	mask = kvm_pmu_valid_counter_mask(vcpu);

	if (val & ARMV8_PMU_PMCR_E) {

		kvm_pmu_enable_counter(vcpu,

		kvm_pmu_enable_counter_mask(vcpu,

		       __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask);

	} else {

		kvm_pmu_disable_counter(vcpu, mask);

		kvm_pmu_disable_counter_mask(vcpu, mask);

	}



	if (val & ARMV8_PMU_PMCR_C)