Commit bcf600ca authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Remove the unnecessary loop on CPUID 0x7 sub-leafs

Explicitly handle CPUID 0x7 sub-leaf 1.  The kernel is currently aware
of exactly one feature in CPUID 0x7.1,  which means there is room for
another 127 features before CPUID 0x7.2 will see the light of day, i.e.
the looping is likely to be dead code for years to come.
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 09f628a0
...@@ -536,11 +536,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) ...@@ -536,11 +536,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
if (boot_cpu_has(X86_FEATURE_AMD_SSBD)) if (boot_cpu_has(X86_FEATURE_AMD_SSBD))
cpuid_entry_set(entry, X86_FEATURE_SPEC_CTRL_SSBD); cpuid_entry_set(entry, X86_FEATURE_SPEC_CTRL_SSBD);
for (i = 1, max_idx = entry->eax; i <= max_idx; i++) { /* KVM only supports 0x7.0 and 0x7.1, capped above via min(). */
if (WARN_ON_ONCE(i > 1)) if (entry->eax == 1) {
break; entry = do_host_cpuid(array, function, 1);
entry = do_host_cpuid(array, function, i);
if (!entry) if (!entry)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment