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

Commit 3e007509 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Simplify vcpu_enter_guest() mmu reload logic slightly 



No need to reload the mmu in between two different vcpu->requests checks.

kvm_mmu_reload() may trigger KVM_REQ_TRIPLE_FAULT, but that will be caught
during atomic guest entry later.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 529df65e

arch/x86/kvm/x86.c

+5 −7
Original line number Diff line number Diff line
@@ -4616,15 +4616,9 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
	bool req_int_win = !irqchip_in_kernel(vcpu->kvm) &&

		vcpu->run->request_interrupt_window;



	if (vcpu->requests)

	if (vcpu->requests) {

		if (kvm_check_request(KVM_REQ_MMU_RELOAD, vcpu))

			kvm_mmu_unload(vcpu);



	r = kvm_mmu_reload(vcpu);

	if (unlikely(r))

		goto out;



	if (vcpu->requests) {

		if (kvm_check_request(KVM_REQ_MIGRATE_TIMER, vcpu))

			__kvm_migrate_timers(vcpu);

		if (kvm_check_request(KVM_REQ_KVMCLOCK_UPDATE, vcpu))
@@ -4649,6 +4643,10 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
		}

	}



	r = kvm_mmu_reload(vcpu);

	if (unlikely(r))

		goto out;



	preempt_disable();



	kvm_x86_ops->prepare_guest_switch(vcpu);