Commit 887f500c authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Check for nested intercepts on NMI injection 



This patch implements the NMI intercept checking for nested
svm.

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

arch/x86/kvm/svm.c

+20 −3
Original line number Diff line number Diff line
@@ -1486,6 +1486,21 @@ static inline bool nested_svm_intr(struct vcpu_svm *svm) 
	return true;

}



/* This function returns true if it is save to enable the nmi window */

static inline bool nested_svm_nmi(struct vcpu_svm *svm)

{

	if (!is_nested(svm))

		return true;



	if (!(svm->nested.intercept & (1ULL << INTERCEPT_NMI)))

		return true;



	svm->vmcb->control.exit_code = SVM_EXIT_NMI;

	svm->nested.exit_required = true;



	return false;

}



static void *nested_svm_map(struct vcpu_svm *svm, u64 gpa, struct page **_page)

{

	struct page *page;
@@ -2687,10 +2702,12 @@ 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)

{