From: "Xin Li (Intel)" <[email protected]>

Advertise support for FRED to userspace after changes required to enable
FRED in a KVM guest are in place.

Signed-off-by: Xin Li (Intel) <[email protected]>
Signed-off-by: Sohil Mehta <[email protected]>
Reviewed-by: Chao Gao <[email protected]>
---
v10:
 - kvm_cpu_cap_clear(X86_FEATURE_FRED) in svm_set_cpu_caps() (Chao).
---
 arch/x86/kvm/cpuid.c   | 1 +
 arch/x86/kvm/svm/svm.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index ddb022cb203a..5682bacdfd32 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -1034,6 +1034,7 @@ void kvm_initialize_cpu_caps(void)
                F(FSRS),
                F(FSRC),
                F(WRMSRNS),
+               X86_64_F(FRED),
                X86_64_F(LKGS),
                F(AMX_FP16),
                F(AVX_IFMA),
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index f254a5ff570d..dd19c7b4e904 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -5518,6 +5518,9 @@ static __init void svm_set_cpu_caps(void)
 
        kvm_cpu_cap_clear(X86_FEATURE_IBT);
 
+       /* SVM FRED virtualization not implemented yet */
+       kvm_cpu_cap_clear(X86_FEATURE_FRED);
+
        /* CPUID 0x80000001 and 0x8000000A (SVM features) */
        if (nested) {
                kvm_cpu_cap_set(X86_FEATURE_SVM);
-- 
2.43.0


Reply via email to