Commit d5cde2e0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM PMU change for 6.7:

 - Handle NMI/SMI requests after PMU/PMI requests so that a PMI=>NMI doesn't
   require redoing the entire run loop due to the NMI not being detected until
   the final kvm_vcpu_exit_request() check before entering the guest.
parents e122d7a1 fad505b2

arch/x86/kvm/x86.c

+4 −4
Original line number Diff line number Diff line
@@ -10698,16 +10698,16 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
		}

		if (kvm_check_request(KVM_REQ_STEAL_UPDATE, vcpu))

			record_steal_time(vcpu);

		if (kvm_check_request(KVM_REQ_PMU, vcpu))

			kvm_pmu_handle_event(vcpu);

		if (kvm_check_request(KVM_REQ_PMI, vcpu))

			kvm_pmu_deliver_pmi(vcpu);

#ifdef CONFIG_KVM_SMM

		if (kvm_check_request(KVM_REQ_SMI, vcpu))

			process_smi(vcpu);

#endif

		if (kvm_check_request(KVM_REQ_NMI, vcpu))

			process_nmi(vcpu);

		if (kvm_check_request(KVM_REQ_PMU, vcpu))

			kvm_pmu_handle_event(vcpu);

		if (kvm_check_request(KVM_REQ_PMI, vcpu))

			kvm_pmu_deliver_pmi(vcpu);

		if (kvm_check_request(KVM_REQ_IOAPIC_EOI_EXIT, vcpu)) {

			BUG_ON(vcpu->arch.pending_ioapic_eoi > 255);

			if (test_bit(vcpu->arch.pending_ioapic_eoi,