lkml.org 
[lkml]   [2011]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] KVM: x86: Prevent exposing TSC deadline timer feature in the absence of in-kernel APIC
On 12/21/2011 01:28 PM, Jan Kiszka wrote:
> >
> > timer_mode_mask can just be slaved to the bit (as received by
> > KVM_SET_CPUID); that's exactly kvm_update_cpuid()'s role.
>
> Like

Ugh, the facebook generation invades lkml.

> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index 230f713..89b02bf 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,12 @@ 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 (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);
> }
>
>
> + the KVM_CAP thing?
>

+1

--
error compiling committee.c: too many arguments to function



\
 
 \ /
  Last update: 2011-12-21 12:47    [W:0.560 / U:0.348 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site