From: Sean Christopherson Date: Thu, 28 Nov 2024 01:34:13 +0000 (-0800) Subject: KVM: x86: Drop unnecessary check that cpuid_entry2_find() returns right leaf X-Git-Tag: v6.14-rc1~94^2~4^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfd15745260929565bc53e16fed54f9e3276c7e1;p=thirdparty%2Fkernel%2Flinux.git KVM: x86: Drop unnecessary check that cpuid_entry2_find() returns right leaf Drop an unnecessary check that kvm_find_cpuid_entry_index(), i.e. cpuid_entry2_find(), returns the correct leaf when getting CPUID.0x7.0x0 to update X86_FEATURE_OSPKE. cpuid_entry2_find() never returns an entry for the wrong function. And not that it matters, but cpuid_entry2_find() will always return a precise match for CPUID.0x7.0x0 since the index is significant. No functional change intended. Reviewed-by: Maxim Levitsky Reviewed-by: Binbin Wu Reviewed-by: Xiaoyao Li Link: https://lore.kernel.org/r/20241128013424.4096668-47-seanjc@google.com Signed-off-by: Sean Christopherson --- diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 688c7c36c73bb..ced3c08a99c2e 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -312,7 +312,7 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) } best = kvm_find_cpuid_entry_index(vcpu, 7, 0); - if (best && boot_cpu_has(X86_FEATURE_PKU) && best->function == 0x7) + if (best && boot_cpu_has(X86_FEATURE_PKU)) cpuid_entry_change(best, X86_FEATURE_OSPKE, kvm_is_cr4_bit_set(vcpu, X86_CR4_PKE));