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

Commit a48d06f9 authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: LAPIC: Don't need to wakeup vCPU twice afer timer fire 



kvm_set_pending_timer() will take care to wake up the sleeping vCPU which
has pending timer, don't need to check this in apic_timer_expired() again.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 266e85a5

arch/x86/kvm/lapic.c

+0 −8
Original line number Diff line number Diff line
@@ -1548,7 +1548,6 @@ static void kvm_apic_inject_pending_timer_irqs(struct kvm_lapic *apic) 
static void apic_timer_expired(struct kvm_lapic *apic)

{

	struct kvm_vcpu *vcpu = apic->vcpu;

	struct swait_queue_head *q = &vcpu->wq;

	struct kvm_timer *ktimer = &apic->lapic_timer;



	if (atomic_read(&apic->lapic_timer.pending))
@@ -1566,13 +1565,6 @@ static void apic_timer_expired(struct kvm_lapic *apic) 


	atomic_inc(&apic->lapic_timer.pending);

	kvm_set_pending_timer(vcpu);



	/*

	 * For x86, the atomic_inc() is serialized, thus

	 * using swait_active() is safe.

	 */

	if (swait_active(q))

		swake_up_one(q);

}



static void start_sw_tscdeadline(struct kvm_lapic *apic)