Commit 924584cc authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Fix nested nmi handling 



The patch introducing nested nmi handling had a bug. The
check does not belong to enable_nmi_window but must be in
nmi_allowed. This patch fixes this.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 8d3b9323

arch/x86/kvm/svm.c

+9 −7
Original line number Diff line number Diff line
@@ -2771,8 +2771,12 @@ static int svm_nmi_allowed(struct kvm_vcpu *vcpu) 
{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vmcb *vmcb = svm->vmcb;

	return !(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) &&

	int ret;

	ret = !(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) &&

	      !(svm->vcpu.arch.hflags & HF_NMI_MASK);

	ret = ret && gif_set(svm) && nested_svm_nmi(svm);



	return ret;

}



static bool svm_get_nmi_mask(struct kvm_vcpu *vcpu)
@@ -2841,12 +2845,10 @@ static void enable_nmi_window(struct kvm_vcpu *vcpu) 
	 * Something prevents NMI from been injected. Single step over possible

	 * problem (IRET or exception injection or interrupt shadow)

	 */

	if (gif_set(svm) && nested_svm_nmi(svm)) {

	svm->nmi_singlestep = true;

	svm->vmcb->save.rflags |= (X86_EFLAGS_TF | X86_EFLAGS_RF);

	update_db_intercept(vcpu);

}

}



static int svm_set_tss_addr(struct kvm *kvm, unsigned int addr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE