Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

KVM: SVM: complete interrupts after handling nested exits 



The interrupt completion code must run after nested exits are handled
because not injected interrupts or exceptions may be handled by the l1
guest first.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Acked-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0460a979

arch/x86/kvm/svm.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ static int nested = 0; 
module_param(nested, int, S_IRUGO);

module_param(nested, int, S_IRUGO);





static void svm_flush_tlb(struct kvm_vcpu *vcpu);

static void svm_flush_tlb(struct kvm_vcpu *vcpu);

static void svm_complete_interrupts(struct vcpu_svm *svm);





static int nested_svm_exit_handled(struct vcpu_svm *svm, bool kvm_override);

static int nested_svm_exit_handled(struct vcpu_svm *svm, bool kvm_override);

static int nested_svm_vmexit(struct vcpu_svm *svm);

static int nested_svm_vmexit(struct vcpu_svm *svm);
@@ -2324,6 +2325,8 @@ static int handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
		}

		}

	}

	}





	svm_complete_interrupts(svm);



	if (npt_enabled) {

	if (npt_enabled) {

		int mmu_reload = 0;

		int mmu_reload = 0;

		if ((vcpu->arch.cr0 ^ svm->vmcb->save.cr0) & X86_CR0_PG) {

		if ((vcpu->arch.cr0 ^ svm->vmcb->save.cr0) & X86_CR0_PG) {
@@ -2690,8 +2693,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		vcpu->arch.regs_avail &= ~(1 << VCPU_EXREG_PDPTR);

		vcpu->arch.regs_avail &= ~(1 << VCPU_EXREG_PDPTR);

		vcpu->arch.regs_dirty &= ~(1 << VCPU_EXREG_PDPTR);

		vcpu->arch.regs_dirty &= ~(1 << VCPU_EXREG_PDPTR);

	}

	}



	svm_complete_interrupts(svm);

}

}





#undef R

#undef R