KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled

Wanpeng Li · bonzini · commit d2286ba7d574 · 2020-07-31T03:20:15.000-04:00
Prevent setting the tscdeadline timer if the lapic is hw disabled. Fixes: bce87cc (KVM: x86: consolidate different ways to test for in-kernel LAPIC) Cc: <stable@vger.kernel.org> Signed-off-by: Wanpeng Li <wanpengli@tencent.com> Message-Id: <1596165141-28874-1-git-send-email-wanpengli@tencent.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
@@ -2195,7 +2195,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)
 {
 	struct kvm_lapic *apic = vcpu->arch.apic;
 
-	if (!lapic_in_kernel(vcpu) || apic_lvtt_oneshot(apic) ||
+	if (!kvm_apic_present(vcpu) || apic_lvtt_oneshot(apic) ||
 			apic_lvtt_period(apic))
 		return;
 

Original file line number	Diff line number	Diff line change
`@@ -2195,7 +2195,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)`
`2195`	`2195`	`{`
`2196`	`2196`	`struct kvm_lapic *apic = vcpu->arch.apic;`
`2197`	`2197`
`2198`		`- if (!lapic_in_kernel(vcpu) \|\| apic_lvtt_oneshot(apic) \|\|`
	`2198`	`+ if (!kvm_apic_present(vcpu) \|\| apic_lvtt_oneshot(apic) \|\|`
`2199`	`2199`	`apic_lvtt_period(apic))`
`2200`	`2200`	`return;`
`2201`	`2201`