| From foo@baz Mon Feb 5 10:12:24 PST 2018 |
| Subject: KVM/x86: Update the reverse_cpuid list to include CPUID_7_EDX |
| From: KarimAllah Ahmed karahmed@amazon.de |
| Date: Thu Feb 1 22:59:42 2018 +0100 |
| |
| From: KarimAllah Ahmed karahmed@amazon.de |
| |
| commit b7b27aa011a1df42728d1768fc181d9ce69e6911 |
| |
| [dwmw2: Stop using KF() for bits in it, too] |
| Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de> |
| Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> |
| Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Reviewed-by: Jim Mattson <jmattson@google.com> |
| Cc: kvm@vger.kernel.org |
| Cc: Radim Krčmář <rkrcmar@redhat.com> |
| Link: https://lkml.kernel.org/r/1517522386-18410-2-git-send-email-karahmed@amazon.de |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| --- |
| arch/x86/kvm/cpuid.c | 8 +++----- |
| arch/x86/kvm/cpuid.h | 1 + |
| 2 files changed, 4 insertions(+), 5 deletions(-) |
| |
| --- a/arch/x86/kvm/cpuid.c |
| +++ b/arch/x86/kvm/cpuid.c |
| @@ -67,9 +67,7 @@ u64 kvm_supported_xcr0(void) |
| |
| #define F(x) bit(X86_FEATURE_##x) |
| |
| -/* These are scattered features in cpufeatures.h. */ |
| -#define KVM_CPUID_BIT_AVX512_4VNNIW 2 |
| -#define KVM_CPUID_BIT_AVX512_4FMAPS 3 |
| +/* For scattered features from cpufeatures.h; we currently expose none */ |
| #define KF(x) bit(KVM_CPUID_BIT_##x) |
| |
| int kvm_update_cpuid(struct kvm_vcpu *vcpu) |
| @@ -392,7 +390,7 @@ static inline int __do_cpuid_ent(struct |
| |
| /* cpuid 7.0.edx*/ |
| const u32 kvm_cpuid_7_0_edx_x86_features = |
| - KF(AVX512_4VNNIW) | KF(AVX512_4FMAPS); |
| + F(AVX512_4VNNIW) | F(AVX512_4FMAPS); |
| |
| /* all calls to cpuid_count() should be made on the same cpu */ |
| get_cpu(); |
| @@ -477,7 +475,7 @@ static inline int __do_cpuid_ent(struct |
| if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE)) |
| entry->ecx &= ~F(PKU); |
| entry->edx &= kvm_cpuid_7_0_edx_x86_features; |
| - entry->edx &= get_scattered_cpuid_leaf(7, 0, CPUID_EDX); |
| + cpuid_mask(&entry->edx, CPUID_7_EDX); |
| } else { |
| entry->ebx = 0; |
| entry->ecx = 0; |
| --- a/arch/x86/kvm/cpuid.h |
| +++ b/arch/x86/kvm/cpuid.h |
| @@ -54,6 +54,7 @@ static const struct cpuid_reg reverse_cp |
| [CPUID_8000_000A_EDX] = {0x8000000a, 0, CPUID_EDX}, |
| [CPUID_7_ECX] = { 7, 0, CPUID_ECX}, |
| [CPUID_8000_0007_EBX] = {0x80000007, 0, CPUID_EBX}, |
| + [CPUID_7_EDX] = { 7, 0, CPUID_EDX}, |
| }; |
| |
| static __always_inline struct cpuid_reg x86_feature_cpuid(unsigned x86_feature) |