On 21/03/2016 11:05, Huaitong Han wrote: > This patch disables CPUID:PKU without ept, because pkeys is not yet > implemented for shadow paging. > > Signed-off-by: Huaitong Han <huaitong.han@xxxxxxxxx> > Reviewed-by: Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx> > --- > arch/x86/kvm/cpuid.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 7dc7a5a..5028c1e 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -447,6 +447,12 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > entry->ebx |= F(TSC_ADJUST); > entry->ecx &= kvm_supported_word11_x86_features; > cpuid_mask(&entry->ecx, CPUID_7_ECX); > + if (!tdp_enabled) > + /* > + * PKU is not yet implemented for shadow > + * paging. > + */ > + entry->ecx &= ~F(PKU); > } else { > entry->ebx = 0; > entry->ecx = 0; > I'll squash this into the previous patch. Paolo -- 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