Commit ff90afa7 authored Nov 11, 2019 by Liran Alon Committed by Paolo Bonzini Nov 15, 2019

KVM: x86: Evaluate latched_init in KVM_SET_VCPU_EVENTS when vCPU not in SMM



Commit 4b9852f4 ("KVM: x86: Fix INIT signal handling in various CPU states")
fixed KVM to also latch pending LAPIC INIT event when vCPU is in VMX
operation.

However, current API of KVM_SET_VCPU_EVENTS defines this field as
part of SMM state and only set pending LAPIC INIT event if vCPU is
specified to be in SMM mode (events->smi.smm is set).

Change KVM_SET_VCPU_EVENTS handler to set pending LAPIC INIT event
by latched_init field regardless of if vCPU is in SMM mode or not.

Fixes: 4b9852f4 ("KVM: x86: Fix INIT signal handling in various CPU states")
Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 74c504a6

arch/x86/kvm/x86.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -3830,6 +3830,8 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
		vcpu->arch.hflags \|= HF_SMM_INSIDE_NMI_MASK;
		else
		vcpu->arch.hflags &= ~HF_SMM_INSIDE_NMI_MASK;
		}

		if (lapic_in_kernel(vcpu)) {
		if (events->smi.latched_init)
		set_bit(KVM_APIC_INIT, &vcpu->arch.apic->pending_events);
		@@ -3837,7 +3839,6 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
		clear_bit(KVM_APIC_INIT, &vcpu->arch.apic->pending_events);
		}
		}
		}

		kvm_make_request(KVM_REQ_EVENT, vcpu);

Admin message