Commit 23e7a794 authored by Jason Wang's avatar Jason Wang Committed by Avi Kivity
Browse files

KVM: pit: Do not check pending pit timer in vcpu thread 



Pit interrupt injection was done by workqueue, so no need to check
pending pit timer in vcpu thread which could lead unnecessary
unblocking of vcpu.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 989044ee

arch/x86/kvm/i8254.c

+0 −9
Original line number Diff line number Diff line
@@ -232,15 +232,6 @@ static void pit_latch_status(struct kvm *kvm, int channel) 
	}

}



int pit_has_pending_timer(struct kvm_vcpu *vcpu)

{

	struct kvm_pit *pit = vcpu->kvm->arch.vpit;



	if (pit && kvm_vcpu_is_bsp(vcpu) && pit->pit_state.irq_ack)

		return atomic_read(&pit->pit_state.pit_timer.pending);

	return 0;

}



static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)

{

	struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state,

arch/x86/kvm/irq.c

+1 −6
Original line number Diff line number Diff line
@@ -33,12 +33,7 @@ 
 */

int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	int ret;



	ret = pit_has_pending_timer(vcpu);

	ret |= apic_has_pending_timer(vcpu);



	return ret;

	return apic_has_pending_timer(vcpu);

}

EXPORT_SYMBOL(kvm_cpu_has_pending_timer);