| Message ID | 1417681468-7165-2-git-send-email-wanpeng.li@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/12/2014 09:24, Wanpeng Li wrote: > The section of CPUID(EAX=0xd, ECX=1) in the spec which commit > f5c2290cd01e (KVM: cpuid: mask more bits in leaf 0xd and subleaves) > mentioned is older than SDM. > > EBX: Bits 31-00: The size in bytes of the XSAVE area containing all > states enabled by XCR0|IA32_XSS. > > The the value of EBX should represent the size of XCR0 related XSAVE > area since IA32_XSS is not used currently. > > Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com> > --- > arch/x86/kvm/cpuid.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 646e6e8..70f0fa1 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -477,7 +477,10 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > do_cpuid_1_ent(&entry[i], function, idx); > if (idx == 1) { > entry[i].eax &= kvm_supported_word10_x86_features; > - entry[i].ebx = 0; > + if (entry[i].eax & F(XSAVES)) > + entry[i].ebx = xstate_required_size(supported, true); > + else > + entry[i].ebx = xstate_required_size(supported, false); On machines without XSAVES, this value is zero though. Paolo > } else { > if (entry[i].eax == 0 || !(supported & mask)) > continue; > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/12/2014 09:24, Wanpeng Li wrote: > The section of CPUID(EAX=0xd, ECX=1) in the spec which commit > f5c2290cd01e (KVM: cpuid: mask more bits in leaf 0xd and subleaves) > mentioned is older than SDM. > > EBX: Bits 31-00: The size in bytes of the XSAVE area containing all > states enabled by XCR0|IA32_XSS. > > The the value of EBX should represent the size of XCR0 related XSAVE > area since IA32_XSS is not used currently. > > Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com> > --- > arch/x86/kvm/cpuid.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 646e6e8..70f0fa1 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -477,7 +477,10 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > do_cpuid_1_ent(&entry[i], function, idx); > if (idx == 1) { > entry[i].eax &= kvm_supported_word10_x86_features; > - entry[i].ebx = 0; > + if (entry[i].eax & F(XSAVES)) Also, either you have F(XSAVES)|F(XSAVEC) both here and in patch 3, or you have F(XSAVES). Making it inconsistent is definitely wrong. Paolo > + entry[i].ebx = xstate_required_size(supported, true); > + else > + entry[i].ebx = xstate_required_size(supported, false); > } else { > if (entry[i].eax == 0 || !(supported & mask)) > continue; > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 646e6e8..70f0fa1 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -477,7 +477,10 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, do_cpuid_1_ent(&entry[i], function, idx); if (idx == 1) { entry[i].eax &= kvm_supported_word10_x86_features; - entry[i].ebx = 0; + if (entry[i].eax & F(XSAVES)) + entry[i].ebx = xstate_required_size(supported, true); + else + entry[i].ebx = xstate_required_size(supported, false); } else { if (entry[i].eax == 0 || !(supported & mask)) continue;
The section of CPUID(EAX=0xd, ECX=1) in the spec which commit f5c2290cd01e (KVM: cpuid: mask more bits in leaf 0xd and subleaves) mentioned is older than SDM. EBX: Bits 31-00: The size in bytes of the XSAVE area containing all states enabled by XCR0|IA32_XSS. The the value of EBX should represent the size of XCR0 related XSAVE area since IA32_XSS is not used currently. Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com> --- arch/x86/kvm/cpuid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)