Commit f8b78fa3 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: move slots_lock acquision down to vapic_exit 



There is no need to grab slots_lock if the vapic_page will not
be touched.

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

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2787,8 +2787,10 @@ static void vapic_exit(struct kvm_vcpu *vcpu) 
	if (!apic || !apic->vapic_addr)

		return;



	down_read(&vcpu->kvm->slots_lock);

	kvm_release_page_dirty(apic->vapic_page);

	mark_page_dirty(vcpu->kvm, apic->vapic_addr >> PAGE_SHIFT);

	up_read(&vcpu->kvm->slots_lock);

}



static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -2944,9 +2946,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


	post_kvm_run_save(vcpu, kvm_run);



	down_read(&vcpu->kvm->slots_lock);

	vapic_exit(vcpu);

	up_read(&vcpu->kvm->slots_lock);



	return r;

}