From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426Ab1LUK0A (ORCPT ); Wed, 21 Dec 2011 05:26:00 -0500 Received: from goliath.siemens.de ([192.35.17.28]:20336 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752848Ab1LUKZz (ORCPT ); Wed, 21 Dec 2011 05:25:55 -0500 Message-ID: <4EF1B423.8050707@siemens.com> Date: Wed, 21 Dec 2011 11:25:39 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Linus Torvalds , Alexey Zaytsev , "Liu, Jinsong" , Avi Kivity CC: Kernel development list , Marcelo Tosatti , "Garrett D'Amore" , kvm Subject: [PATCH v2] KVM: x86: Prevent exposing TSC deadline timer feature in the absence of in-kernel APIC References: <4EF1146D.208@siemens.com> <4EF1B081.3010109@siemens.com> In-Reply-To: <4EF1B081.3010109@siemens.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We must not report the TSC deadline timer feature on our own when user space provides the APIC as we have no clue about its features. Signed-off-by: Jan Kiszka --- Changes in v2: - reorganized code to make the flow clearer arch/x86/kvm/cpuid.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 230f713..b7cdd3b 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -27,7 +27,6 @@ void kvm_update_cpuid(struct kvm_vcpu *vcpu) { struct kvm_cpuid_entry2 *best; struct kvm_lapic *apic = vcpu->arch.apic; - u32 timer_mode_mask; best = kvm_find_cpuid_entry(vcpu, 1, 0); if (!best) @@ -40,15 +39,14 @@ void kvm_update_cpuid(struct kvm_vcpu *vcpu) best->ecx |= bit(X86_FEATURE_OSXSAVE); } - if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && - best->function == 0x1) { - best->ecx |= bit(X86_FEATURE_TSC_DEADLINE_TIMER); - timer_mode_mask = 3 << 17; - } else - timer_mode_mask = 1 << 17; - - if (apic) - apic->lapic_timer.timer_mode_mask = timer_mode_mask; + if (apic) { + if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + best->function == 0x1) { + best->ecx |= bit(X86_FEATURE_TSC_DEADLINE_TIMER); + apic->lapic_timer.timer_mode_mask = 3 << 17; + } else + apic->lapic_timer.timer_mode_mask = 1 << 17; + } kvm_pmu_cpuid_update(vcpu); } -- 1.7.3.4