On Wed, Jun 01, 2011 at 09:07:51PM +0800, Yang, Wei Y wrote: > > This patch masks CPUID leaf 7 ebx against host capability word9. > > Signed-off-by: Yang, Wei <wei.y.yang@xxxxxxxxx> > Signed-off-by: Shan, Haitao <haitao.shan@xxxxxxxxx> > Signed-off-by: Li, Xin <xin.li@xxxxxxxxx> > > --- > arch/x86/kvm/x86.c | 21 ++++++++++++++++++++- > 1 files changed, 20 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 91bfc40..d27202d 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -2353,6 +2353,10 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) | > F(PMM) | F(PMM_EN); > > + /* cpuid 7.0.ebx */ > + const u32 kvm_supported_word9_x86_features = > + F(SMEP); > + > /* all calls to cpuid_count() should be made on the same cpu */ > get_cpu(); > do_cpuid_1_ent(entry, function, index); > @@ -2387,7 +2391,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > } > break; > } > - /* function 4 and 0xb have additional index. */ > + /* function 4 has additional index. */ > case 4: { > int i, cache_type; > > @@ -2404,6 +2408,21 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > } > break; > } > + case 7: { > + entry->flags |= KVM_CPUID_FLAG_SIGNIFCANT_INDEX; > + /* Mask ebx against host capbability word 9 */ > + if (index == 0) { > + entry->ebx &= kvm_supported_word9_x86_features; > + cpuid_mask(&entry->edx, 9); ebx? > + } > + else > + entry->ebx = 0; indentation is wrong. > + entry->eax = 0; > + entry->ecx = 0; > + entry->edx = 0; > + break; > + } > + /* function 0xb has additional index. */ > case 0xb: { > int i, level_type; -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html