[PATCH 2/5] KVM: LAPIC: guarantee the timer is in tsc-deadline mode

From	Wanpeng Li <kernellwp@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/5] KVM: LAPIC: guarantee the timer is in tsc-deadline mode
Date	2016-10-17 09:50 +0200
Message-ID	<staQh-wi-3@gated-at.bofh.it> (permalink)
References	<staQh-wi-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Wanpeng Li <wanpeng.li@hotmail.com>

Check apic_lvtt_tscdeadline() mode directly instead of apic_lvtt_oneshot()
and apic_lvtt_period() to guarantee the timer is in tsc-deadline mode when
rdmsr MSR_IA32_TSCDEADLINE.

Suggsted-by: Radim Krčmář <rkrcmar@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
---
 arch/x86/kvm/lapic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index dad743e..dce6c0b 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1711,8 +1711,8 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)
 {
 	struct kvm_lapic *apic = vcpu->arch.apic;
 
-	if (!lapic_in_kernel(vcpu) || apic_lvtt_oneshot(apic) ||
-			apic_lvtt_period(apic))
+	if (!lapic_in_kernel(vcpu) ||
+		!apic_lvtt_tscdeadline(apic))
 		return 0;
 
 	return apic->lapic_timer.tscdeadline;
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2/5] KVM: LAPIC: guarantee the timer is in tsc-deadline mode Wanpeng Li <kernellwp@gmail.com> - 2016-10-17 09:50 +0200

csiph-web