Commit e9737468 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86/cpuid: Clear XFD for component i if the base feature is missing 



According to Intel extended feature disable (XFD) spec, the sub-function i
(i > 1) of CPUID function 0DH enumerates "details for state component i.
ECX[2] enumerates support for XFD support for this state component."

If KVM does not report F(XFD) feature (e.g. due to CONFIG_X86_64),
then the corresponding XFD support for any state component i
should also be removed. Translate this dependency into KVM terms.

Fixes: 690a757d ("kvm: x86: Add CPUID support for Intel AMX")
Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Message-Id: <20220117074531.76925-1-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6ff94f27

arch/x86/kvm/cpuid.c

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
				--array->nent;

				continue;

			}



			if (!kvm_cpu_cap_has(X86_FEATURE_XFD))

				entry->ecx &= ~BIT_ULL(2);

			entry->edx = 0;

		}

		break;