Commit 63f21f32 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86/pmu: Move pmc_speculative_in_use() to arch/x86/kvm/pmu.h 



It allows this inline function to be reused by more callers in
more files, such as pmu_intel.c.

Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Message-Id: <20220411101946.20262-14-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d1055173

arch/x86/kvm/pmu.c

+0 −11
Original line number Diff line number Diff line
@@ -503,17 +503,6 @@ void kvm_pmu_init(struct kvm_vcpu *vcpu) 
	kvm_pmu_refresh(vcpu);

}



static inline bool pmc_speculative_in_use(struct kvm_pmc *pmc)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);



	if (pmc_is_fixed(pmc))

		return fixed_ctrl_field(pmu->fixed_ctr_ctrl,

			pmc->idx - INTEL_PMC_IDX_FIXED) & 0x3;



	return pmc->eventsel & ARCH_PERFMON_EVENTSEL_ENABLE;

}



/* Release perf_events for vPMCs that have been unused for a full time slice.  */

void kvm_pmu_cleanup(struct kvm_vcpu *vcpu)

{

arch/x86/kvm/pmu.h

+11 −0
Original line number Diff line number Diff line
@@ -152,6 +152,17 @@ static inline void pmc_update_sample_period(struct kvm_pmc *pmc) 
			  get_sample_period(pmc, pmc->counter));

}



static inline bool pmc_speculative_in_use(struct kvm_pmc *pmc)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);



	if (pmc_is_fixed(pmc))

		return fixed_ctrl_field(pmu->fixed_ctr_ctrl,

					pmc->idx - INTEL_PMC_IDX_FIXED) & 0x3;



	return pmc->eventsel & ARCH_PERFMON_EVENTSEL_ENABLE;

}



void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel);

void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int fixed_idx);

void reprogram_counter(struct kvm_pmu *pmu, int pmc_idx);