On 31/07/20 05:12, Wanpeng Li wrote:

From: Wanpeng Li wanpengli@tencent.com

Prevent setting the tscdeadline timer if the lapic is hw disabled.

Fixes: bce87cce88 (KVM: x86: consolidate different ways to test for in-kernel LAPIC) Cc: stable@vger.kernel.org Signed-off-by: Wanpeng Li wanpengli@tencent.com

---

v1 -> v2:

• add Fixes tag and cc stable

arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 5bf72fc..4ce2ddd 100644 --- 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;

Testcase please.

Paolo