KVM: x86: Sort CPUID_8000_0021_EAX leaf bits properly

Commit 49c140d5af127ef4faf19f06a89a0714edf0316f upstream.

WRMSR_XX_BASE_NS is bit 1 so put it there, add some new bits as
comments only.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20250324160617.15379-1-bp@kernel.org
[sean: skip the FSRS/FSRC placeholders to avoid confusion]
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 571c906ffcbfe2c10b7ef40531ead81f11bedf9f..23534bffffefe4d7a5855bbb25588580e7870b21 100644 (file)
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -1164,6 +1164,7 @@ void kvm_set_cpu_caps(void)
 
        kvm_cpu_cap_init(CPUID_8000_0021_EAX,
                F(NO_NESTED_DATA_BP),
+               F(WRMSR_XX_BASE_NS),
                /*
                 * Synthesize "LFENCE is serializing" into the AMD-defined entry
                 * in KVM's supported CPUID, i.e. if the feature is reported as
@@ -1177,10 +1178,12 @@ void kvm_set_cpu_caps(void)
                SYNTHESIZED_F(LFENCE_RDTSC),
                /* SmmPgCfgLock */
                F(NULL_SEL_CLR_BASE),
+               /* UpperAddressIgnore */
                F(AUTOIBRS),
                EMULATED_F(NO_SMM_CTL_MSR),
                /* PrefetchCtlMsr */
-               F(WRMSR_XX_BASE_NS),
+               /* GpOnUserCpuid */
+               /* EPSF */
                SYNTHESIZED_F(SBPB),
                SYNTHESIZED_F(IBPB_BRTYPE),
                SYNTHESIZED_F(SRSO_NO),