Commit b7b27aa0 authored by KarimAllah Ahmed's avatar KarimAllah Ahmed Committed by Thomas Gleixner
Browse files

KVM/x86: Update the reverse_cpuid list to include CPUID_7_EDX 



[dwmw2: Stop using KF() for bits in it, too]
Signed-off-by: default avatarKarimAllah Ahmed <karahmed@amazon.de>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarJim 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
parent a96223f1

arch/x86/kvm/cpuid.c

+3 −5
Original line number Diff line number Diff line
@@ -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 kvm_cpuid_entry2 *entry, u32 function, 


	/* 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 kvm_cpuid_entry2 *entry, u32 function, 
			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;

arch/x86/kvm/cpuid.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static const struct cpuid_reg reverse_cpuid[] = { 
	[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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE