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

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

KVM: x86: introduce cancel_hv_tscdeadline 



Introduce cancel_hv_tscdeadline() to encapsulate preemption
timer cancel stuff.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9175d2e9

arch/x86/kvm/lapic.c

+10 −8
Original line number Diff line number Diff line
@@ -1349,14 +1349,19 @@ bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_lapic_hv_timer_in_use);



static void cancel_hv_tscdeadline(struct kvm_lapic *apic)

{

	kvm_x86_ops->cancel_hv_timer(apic->vcpu);

	apic->lapic_timer.hv_timer_in_use = false;

}



void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)

{

	struct kvm_lapic *apic = vcpu->arch.apic;



	WARN_ON(!apic->lapic_timer.hv_timer_in_use);

	WARN_ON(swait_active(&vcpu->wq));

	kvm_x86_ops->cancel_hv_timer(vcpu);

	apic->lapic_timer.hv_timer_in_use = false;

	cancel_hv_tscdeadline(apic);

	apic_timer_expired(apic);

}

EXPORT_SYMBOL_GPL(kvm_lapic_expired_hv_timer);
@@ -1376,10 +1381,8 @@ void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu) 
			hrtimer_cancel(&apic->lapic_timer.timer);



			/* In case the sw timer triggered in the window */

			if (atomic_read(&apic->lapic_timer.pending)) {

				apic->lapic_timer.hv_timer_in_use = false;

				kvm_x86_ops->cancel_hv_timer(apic->vcpu);

			}

			if (atomic_read(&apic->lapic_timer.pending))

				cancel_hv_tscdeadline(apic);

		}

		trace_kvm_hv_timer_state(vcpu->vcpu_id,

				apic->lapic_timer.hv_timer_in_use);
@@ -1395,8 +1398,7 @@ void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu) 
	if (!apic->lapic_timer.hv_timer_in_use)

		return;



	kvm_x86_ops->cancel_hv_timer(vcpu);

	apic->lapic_timer.hv_timer_in_use = false;

	cancel_hv_tscdeadline(apic);



	if (atomic_read(&apic->lapic_timer.pending))

		return;