Commit 88e4cd89 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-pmu-6.6-fixes' of https://github.com/kvm-x86/linux into HEAD 

KVM x86/pmu fixes for 6.6:

 - Truncate writes to PMU counters to the counter's width to avoid spurious
   overflows when emulating counter events in software.

 - Set the LVTPC entry mask bit when handling a PMI (to match Intel-defined
   architectural behavior).

 - Treat KVM_REQ_PMI as a wake event instead of queueing host IRQ work to
   kick the guest out of emulated halt.
parents 24422df3 73554b29

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ struct kvm_pmu { 
	u64 raw_event_mask;

	struct kvm_pmc gp_counters[KVM_INTEL_PMC_MAX_GENERIC];

	struct kvm_pmc fixed_counters[KVM_PMC_MAX_FIXED];

	struct irq_work irq_work;



	/*

	 * Overlay the bitmap with a 64-bit atomic so that all bits can be

arch/x86/kvm/lapic.c

+6 −2
Original line number Diff line number Diff line
@@ -2759,13 +2759,17 @@ int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type) 
{

	u32 reg = kvm_lapic_get_reg(apic, lvt_type);

	int vector, mode, trig_mode;

	int r;



	if (kvm_apic_hw_enabled(apic) && !(reg & APIC_LVT_MASKED)) {

		vector = reg & APIC_VECTOR_MASK;

		mode = reg & APIC_MODE_MASK;

		trig_mode = reg & APIC_LVT_LEVEL_TRIGGER;

		return __apic_accept_irq(apic, mode, vector, 1, trig_mode,

					NULL);



		r = __apic_accept_irq(apic, mode, vector, 1, trig_mode, NULL);

		if (r && lvt_type == APIC_LVTPC)

			kvm_lapic_set_reg(apic, APIC_LVTPC, reg | APIC_LVT_MASKED);

		return r;

	}

	return 0;

}

arch/x86/kvm/pmu.c

+1 −26
Original line number Diff line number Diff line
@@ -93,14 +93,6 @@ void kvm_pmu_ops_update(const struct kvm_pmu_ops *pmu_ops) 
#undef __KVM_X86_PMU_OP

}



static void kvm_pmi_trigger_fn(struct irq_work *irq_work)

{

	struct kvm_pmu *pmu = container_of(irq_work, struct kvm_pmu, irq_work);

	struct kvm_vcpu *vcpu = pmu_to_vcpu(pmu);



	kvm_pmu_deliver_pmi(vcpu);

}



static inline void __kvm_perf_overflow(struct kvm_pmc *pmc, bool in_pmi)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);
@@ -124,20 +116,7 @@ static inline void __kvm_perf_overflow(struct kvm_pmc *pmc, bool in_pmi) 
		__set_bit(pmc->idx, (unsigned long *)&pmu->global_status);

	}



	if (!pmc->intr || skip_pmi)

		return;



	/*

	 * Inject PMI. If vcpu was in a guest mode during NMI PMI

	 * can be ejected on a guest mode re-entry. Otherwise we can't

	 * be sure that vcpu wasn't executing hlt instruction at the

	 * time of vmexit and is not going to re-enter guest mode until

	 * woken up. So we should wake it, but this is impossible from

	 * NMI context. Do it from irq work instead.

	 */

	if (in_pmi && !kvm_handling_nmi_from_guest(pmc->vcpu))

		irq_work_queue(&pmc_to_pmu(pmc)->irq_work);

	else

	if (pmc->intr && !skip_pmi)

		kvm_make_request(KVM_REQ_PMI, pmc->vcpu);

}
@@ -675,9 +654,6 @@ void kvm_pmu_refresh(struct kvm_vcpu *vcpu) 


void kvm_pmu_reset(struct kvm_vcpu *vcpu)

{

	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);



	irq_work_sync(&pmu->irq_work);

	static_call(kvm_x86_pmu_reset)(vcpu);

}
@@ -687,7 +663,6 @@ void kvm_pmu_init(struct kvm_vcpu *vcpu) 


	memset(pmu, 0, sizeof(*pmu));

	static_call(kvm_x86_pmu_init)(vcpu);

	init_irq_work(&pmu->irq_work, kvm_pmi_trigger_fn);

	pmu->event_count = 0;

	pmu->need_cleanup = false;

	kvm_pmu_refresh(vcpu);

arch/x86/kvm/pmu.h

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ static inline u64 pmc_read_counter(struct kvm_pmc *pmc) 
	return counter & pmc_bitmask(pmc);

}



static inline void pmc_write_counter(struct kvm_pmc *pmc, u64 val)

{

	pmc->counter += val - pmc_read_counter(pmc);

	pmc->counter &= pmc_bitmask(pmc);

}



static inline void pmc_release_perf_event(struct kvm_pmc *pmc)

{

	if (pmc->perf_event) {

arch/x86/kvm/svm/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	/* MSR_PERFCTRn */

	pmc = get_gp_pmc_amd(pmu, msr, PMU_TYPE_COUNTER);

	if (pmc) {

		pmc->counter += data - pmc_read_counter(pmc);

		pmc_write_counter(pmc, data);

		pmc_update_sample_period(pmc);

		return 0;

	}